From 27e27f11ad1d06f42bc18419dcb8422ca7c186db Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sat, 28 Mar 2015 13:01:10 -0700 Subject: [PATCH 1/5] Shutdown a couple dialogs more correctly. This brings them back to none instead of shutdown. --- Core/Dialog/PSPGamedataInstallDialog.cpp | 2 +- Core/Dialog/PSPNetconfDialog.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Core/Dialog/PSPGamedataInstallDialog.cpp b/Core/Dialog/PSPGamedataInstallDialog.cpp index 10430367ec..1f716fe85d 100644 --- a/Core/Dialog/PSPGamedataInstallDialog.cpp +++ b/Core/Dialog/PSPGamedataInstallDialog.cpp @@ -132,7 +132,7 @@ int PSPGamedataInstallDialog::Shutdown(bool force) { if (status != SCE_UTILITY_STATUS_FINISHED && !force) return SCE_ERROR_UTILITY_INVALID_STATUS; - return PSPDialog::Shutdown(); + return PSPDialog::Shutdown(force); } std::string PSPGamedataInstallDialog::GetGameDataInstallFileName(SceUtilityGamedataInstallParam *param, std::string filename){ diff --git a/Core/Dialog/PSPNetconfDialog.cpp b/Core/Dialog/PSPNetconfDialog.cpp index b0b39efb25..7bf4b42011 100644 --- a/Core/Dialog/PSPNetconfDialog.cpp +++ b/Core/Dialog/PSPNetconfDialog.cpp @@ -114,7 +114,7 @@ int PSPNetconfDialog::Shutdown(bool force) { if (status != SCE_UTILITY_STATUS_FINISHED && !force) return SCE_ERROR_UTILITY_INVALID_STATUS; - return PSPDialog::Shutdown(); + return PSPDialog::Shutdown(force); } void PSPNetconfDialog::DoState(PointerWrap &p) { From c642f92bfbaba9ccf863951f424de9c1cc1ace70 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sat, 28 Mar 2015 13:01:30 -0700 Subject: [PATCH 2/5] Initialize a few display state values on init. --- Core/HLE/sceDisplay.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Core/HLE/sceDisplay.cpp b/Core/HLE/sceDisplay.cpp index 4563ab2232..e9217dd10e 100644 --- a/Core/HLE/sceDisplay.cpp +++ b/Core/HLE/sceDisplay.cpp @@ -187,6 +187,7 @@ void __DisplayInit() { framebuf.topaddr = 0x04000000; framebuf.pspFramebufFormat = GE_FORMAT_8888; framebuf.pspFramebufLinesize = 480; // ?? + memset(&latchedFramebuf, 0, sizeof(latchedFramebuf)); lastFlipCycles = 0; lastFlipsTooFrequent = 0; wasPaused = false; @@ -200,6 +201,7 @@ void __DisplayInit() { CoreTiming::ScheduleEvent(msToCycles(frameMs - vblankMs), enterVblankEvent, 0); isVblank = 0; + frameStartTicks = 0; vCount = 0; hCountBase = 0; curFrameTime = 0.0; From 0aaabcaac951576acc774ab44f48ef2cf843996a Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sat, 28 Mar 2015 13:01:49 -0700 Subject: [PATCH 3/5] Clear old registered action types on reset. --- Core/HLE/sceKernelThread.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Core/HLE/sceKernelThread.cpp b/Core/HLE/sceKernelThread.cpp index 5a5dd710e1..66b3581b5c 100644 --- a/Core/HLE/sceKernelThread.cpp +++ b/Core/HLE/sceKernelThread.cpp @@ -240,6 +240,7 @@ public: delete it->second; } calls_.clear(); + types_.clear(); idGen_ = 0; } From 03bd1b9b6935fd9986ccc21415d4a031801672b2 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sat, 28 Mar 2015 13:06:57 -0700 Subject: [PATCH 4/5] Initialize a few sas values earlier. This just makes things a little safer, none of these ought to be used without Start or similar. --- Core/HW/SasAudio.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Core/HW/SasAudio.h b/Core/HW/SasAudio.h index 2f9aa9771c..9e2216b5b5 100644 --- a/Core/HW/SasAudio.h +++ b/Core/HW/SasAudio.h @@ -91,7 +91,9 @@ enum VoiceType { // It compresses 28 16-bit samples into a block of 16 bytes. class VagDecoder { public: - VagDecoder() : data_(0), read_(0), end_(true) {} + VagDecoder() : data_(0), read_(0), end_(true) { + memset(samples, 0, sizeof(samples)); + } void Start(u32 dataPtr, u32 vagSize, bool loopEnabled); void GetSamples(s16 *outSamples, int numSamples); @@ -202,6 +204,8 @@ struct SasVoice { vagSize(0), pcmAddr(0), pcmSize(0), + pcmIndex(0), + pcmLoopPos(0), sampleRate(44100), sampleFrac(0), pitch(PSP_SAS_PITCH_BASE), From d575a711abde4d416265cb6bb64e534457bd1471 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sat, 28 Mar 2015 13:08:13 -0700 Subject: [PATCH 5/5] Update ffmpeg Mac build, fixes #7423. --- ffmpeg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ffmpeg b/ffmpeg index 04d6e3ef7c..7b0a230df5 160000 --- a/ffmpeg +++ b/ffmpeg @@ -1 +1 @@ -Subproject commit 04d6e3ef7c25b6e9badcc63f006b251736a2d437 +Subproject commit 7b0a230df520c232bf608e3b21aa1f2bea2f0098