The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-26 03:51:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

solve deadlock

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2788 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2009-03-29 20:18:55 +00:00
parent b6dd1d3f0a
commit e2a9f8c3bb
2 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Source/Plugins/Plugin_DSP_LLE-testing/Src/gdsp_interpreter.cpp
View File

@ -360,11 +360,11 @@ void gdsp_stop()
#include "disassemble.h" #include "disassemble.h"
#include "WaveFile.h" //#include "WaveFile.h"
#include "Mixer.h" #include "Mixer.h"
uint16 r30 = 0, r31 = 0; uint16 r30 = 0, r31 = 0;
extern WaveFileWriter g_wave_writer; //extern WaveFileWriter g_wave_writer;
extern uint16 dsp_swap16(uint16 x); extern uint16 dsp_swap16(uint16 x);
void Hacks() void Hacks()
@ -417,7 +417,7 @@ void Hacks()
} }
} */ } */
/* if (g_dsp.pc == 0x468) if (g_dsp.pc == 0x468)
{ {
int numSamples = g_dsp.r[25] / 2; int numSamples = g_dsp.r[25] / 2;
uint16 bufferAddr = g_dsp.r[27]; uint16 bufferAddr = g_dsp.r[27];
@ -429,15 +429,15 @@ void Hacks()
{ {
samples[i] = dsp_dmem_read(bufferAddr+i); samples[i] = dsp_dmem_read(bufferAddr+i);
} }
PushSamples(samples, numSamples / 2, 32000); //sample_rate); soundStream->GetMixer()->PushSamples(samples, numSamples / 2, 32000); //sample_rate);
g_wave_writer.AddStereoSamples(samples, numSamples/2); // 2 channels // g_wave_writer.AddStereoSamples(samples, numSamples/2); // 2 channels
if (g_wave_writer.GetAudioSize() > 1024*1024*2) // if (g_wave_writer.GetAudioSize() > 1024*1024*2)
{ // {
//PanicAlert("%x", bufferAddr); //PanicAlert("%x", bufferAddr);
g_wave_writer.Stop(); // g_wave_writer.Stop();
exit(1); // exit(1);
// }
} }
}*/
} }

8
Source/Plugins/Plugin_DSP_LLE-testing/Src/main.cpp
View File

@ -336,19 +336,15 @@ void DSP_Update(int cycles)
{ {
#ifdef _WIN32 #ifdef _WIN32
if (g_Dialog.CanDoStep()) if (g_Dialog.CanDoStep())
#endif
gdsp_runx(100); // cycles gdsp_runx(100); // cycles
#endif
soundStream->Update();
} }
void DSP_SendAIBuffer(unsigned int address, int sample_rate) void DSP_SendAIBuffer(unsigned int address, int sample_rate)
{ {
// TODO: This is not yet fully threadsafe.
if (!soundStream) {
return;
}
if (soundStream->GetMixer()) if (soundStream->GetMixer())
{ {
short samples[16] = {0}; // interleaved stereo short samples[16] = {0}; // interleaved stereo