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

more linux cleanup for lle 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@541 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2008-09-16 16:40:40 +00:00
parent 233c28ee22
commit d36844799b
1 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Source/Plugins/Plugin_DSP_LLE/Src/main.cpp
View File

@ -131,7 +131,16 @@ void* dsp_thread(void* lpParameter)
#ifdef _WIN32 #ifdef _WIN32
DWORD WINAPI dsp_thread_debug(LPVOID lpParameter) DWORD WINAPI dsp_thread_debug(LPVOID lpParameter)
#else
void* dsp_thread_debug(void* lpParameter)
#endif
{ {
if (g_hDSPThread)
{
return NULL;
}
#ifdef _WIN32
while (1) while (1)
{ {
if (g_Dialog.CanDoStep()) if (g_Dialog.CanDoStep())
@ -143,8 +152,9 @@ DWORD WINAPI dsp_thread_debug(LPVOID lpParameter)
Sleep(100); Sleep(100);
} }
} }
#endif
} }
#endif
void DSP_DebugBreak() void DSP_DebugBreak()
@ -178,14 +188,14 @@ void DSP_Initialize(DSPInitialize _dspInitialize)
g_dsp.irq_request = dspi_req_dsp_irq; g_dsp.irq_request = dspi_req_dsp_irq;
gdsp_reset(); gdsp_reset();
if (!gdsp_load_rom("data\\dsp_rom.bin")) if (!gdsp_load_rom((char *)"data\\dsp_rom.bin"))
{ {
bCanWork = false; bCanWork = false;
PanicAlert("No DSP ROM"); PanicAlert("No DSP ROM");
ErrorLog("Cannot load DSP ROM\n"); ErrorLog("Cannot load DSP ROM\n");
} }
if (!gdsp_load_coef("data\\dsp_coef.bin")) if (!gdsp_load_coef((char *)"data\\dsp_coef.bin"))
{ {
bCanWork = false; bCanWork = false;
PanicAlert("No DSP COEF"); PanicAlert("No DSP COEF");
@ -206,11 +216,15 @@ void DSP_Initialize(DSPInitialize _dspInitialize)
g_hDSPThread = CreateThread(NULL, 0, dsp_thread_debug, 0, 0, NULL); g_hDSPThread = CreateThread(NULL, 0, dsp_thread_debug, 0, 0, NULL);
#else #else
g_hDSPThread = CreateThread(NULL, 0, dsp_thread, 0, 0, NULL); g_hDSPThread = CreateThread(NULL, 0, dsp_thread, 0, 0, NULL);
#endif #endif // DEBUG
#else
#if _DEBUG
pthread_create(&g_hDSPThread, NULL, dsp_thread_debug, (void *)NULL);
#else #else
pthread_create(&g_hDSPThread, NULL, dsp_thread, (void *)NULL); pthread_create(&g_hDSPThread, NULL, dsp_thread, (void *)NULL);
#endif #endif // DEBUG
#endif // WIN32
#ifdef _WIN32 #ifdef _WIN32
InitializeCriticalSection(&g_CriticalSection); InitializeCriticalSection(&g_CriticalSection);
DSound::DSound_StartSound((HWND)g_dspInitialize.hWnd, 48000, Mixer); DSound::DSound_StartSound((HWND)g_dspInitialize.hWnd, 48000, Mixer);
@ -222,14 +236,15 @@ void DSP_Initialize(DSPInitialize _dspInitialize)
void DSP_Shutdown(void) void DSP_Shutdown(void)
{ {
#ifdef _WIN32
if (g_hDSPThread != NULL) if (g_hDSPThread != NULL)
{ {
#ifdef _WIN32 TerminateThread(g_hDSPThread, 0);
TerminateThread(g_hDSPThread, 0); }
#else #else
pthread_cancel(g_hDSPThread); pthread_cancel(g_hDSPThread);
#endif #endif
}
} }
u16 DSP_WriteControlRegister(u16 _uFlag) u16 DSP_WriteControlRegister(u16 _uFlag)