ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Stop the audio mixing when stepping in the debugger. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1960 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
hrydgard 2009-01-20 18:42:01 +00:00
parent e7e19bbfe8
commit 1dcd036b9e
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/Core/Src/Core.cpp
View File

@ -330,6 +330,7 @@ THREAD_RETURN EmuThread(void *pArg)
dspInit.pDebuggerBreak = Callback_DebuggerBreak; dspInit.pDebuggerBreak = Callback_DebuggerBreak;
dspInit.pGenerateDSPInterrupt = Callback_DSPInterrupt; dspInit.pGenerateDSPInterrupt = Callback_DSPInterrupt;
dspInit.pGetAudioStreaming = AudioInterface::Callback_GetStreaming; dspInit.pGetAudioStreaming = AudioInterface::Callback_GetStreaming;
dspInit.pEmulatorState = (int *)&PowerPC::state;
Plugins.GetDSP()->Initialize((void *)&dspInit); Plugins.GetDSP()->Initialize((void *)&dspInit);
// Load and Init PadPlugin // Load and Init PadPlugin

3
Source/PluginSpecs/pluginspecs_dsp.h
View File

@ -19,7 +19,7 @@ typedef unsigned int (*TAudioGetStreaming)(short* _pDestBuffer, unsigned int
typedef struct typedef struct
{ {
void* hWnd; void *hWnd;
TARAM_Read_U8 pARAM_Read_U8; TARAM_Read_U8 pARAM_Read_U8;
TGetMemoryPointer pGetMemoryPointer; TGetMemoryPointer pGetMemoryPointer;
TGetARAMPointer pGetARAMPointer; TGetARAMPointer pGetARAMPointer;
@ -28,6 +28,7 @@ typedef struct
TDebuggerBreak pDebuggerBreak; TDebuggerBreak pDebuggerBreak;
TGenerateDSPInt pGenerateDSPInterrupt; TGenerateDSPInt pGenerateDSPInterrupt;
TAudioGetStreaming pGetAudioStreaming; TAudioGetStreaming pGetAudioStreaming;
int *pEmulatorState;
} DSPInitialize; } DSPInitialize;

5
Source/Plugins/Plugin_DSP_HLE/Src/PCHW/Mixer.cpp
View File

@ -58,6 +58,11 @@ void Mixer(short *buffer, int numSamples, int bits, int rate, int channels)
// silence // silence
memset(buffer, 0, numSamples * 2 * sizeof(short)); memset(buffer, 0, numSamples * 2 * sizeof(short));
if (g_dspInitialize.pEmulatorState) {
if (*g_dspInitialize.pEmulatorState != 0)
return;
}
// first get the DTK Music // first get the DTK Music
if (g_Config.m_EnableDTKMusic) if (g_Config.m_EnableDTKMusic)
{ {