summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorskidau <skidau@gmail.com>2014-10-31 12:12:24 +1100
committerskidau <skidau@gmail.com>2014-11-05 17:42:42 +1100
commit5c862adfa71b246612612edb2cf1439515538c8a (patch)
tree2d3474b3d68b8a182e2b5b7fedf25ab5539e880e /Source/Core
parent2140ac15e45ef3f555d426fc3ee65e7d76251933 (diff)
Disabled the DSP thread if netplay or a movie has been started
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/Core/HW/DSPLLE/DSPLLE.cpp16
1 files changed, 10 insertions, 6 deletions
diff --git a/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp b/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp
index b1180a1b47..2d245348a9 100644
--- a/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp
+++ b/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp
@@ -17,6 +17,8 @@
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/Host.h"
+#include "Core/Movie.h"
+#include "Core/NetPlayProto.h"
#include "Core/DSP/DSPCaptureLogger.h"
#include "Core/DSP/DSPCore.h"
#include "Core/DSP/DSPDisassembler.h"
@@ -31,7 +33,6 @@
#include "Core/HW/DSPLLE/DSPLLEGlobals.h"
#include "Core/HW/DSPLLE/DSPSymbols.h"
-
DSPLLE::DSPLLE()
{
m_bIsRunning = false;
@@ -314,12 +315,15 @@ void DSPLLE::DSP_Update(int cycles)
soundStream->Update();
}
*/
- if (requestDisableThread)
+ if (m_bDSPThread)
{
- DSP_StopSoundStream();
- m_bDSPThread = false;
- requestDisableThread = false;
- SConfig::GetInstance().m_LocalCoreStartupParameter.bDSPThread = false;
+ if (requestDisableThread || NetPlay::IsNetPlayRunning() || Movie::IsMovieActive())
+ {
+ DSP_StopSoundStream();
+ m_bDSPThread = false;
+ requestDisableThread = false;
+ SConfig::GetInstance().m_LocalCoreStartupParameter.bDSPThread = false;
+ }
}
// If we're not on a thread, run cycles here.