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

- Fixed sound hanging when you pause emulator 

- Fixed emulator not pausing when click open in the menu
This commit is contained in:
normmatt234 2006-11-14 04:39:57 +00:00
parent f19bb9cfce
commit 7cf7fa62d9
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
desmume/src/windows/main.c
View File

@ -42,7 +42,12 @@
#include "../saves.h" #include "../saves.h"
#include "../cflash.h" #include "../cflash.h"
#include "ConfigKeys.h" #include "ConfigKeys.h"
#ifdef USE_SDL_AUDIO
#include "../sndsdl.h"
#else
#include "snddx.h" #include "snddx.h"
#endif
#ifdef RENDER3D #ifdef RENDER3D
#include "OGLRender.h" #include "OGLRender.h"
@ -79,7 +84,11 @@ DWORD ds_up,ds_down,ds_left,ds_right,ds_a,ds_b,ds_x,ds_y,ds_l,ds_r,ds_select,ds_
SoundInterface_struct *SNDCoreList[] = { SoundInterface_struct *SNDCoreList[] = {
&SNDDummy, &SNDDummy,
&SNDFile, &SNDFile,
#ifdef USE_SDL_AUDIO
&SNDSDL,
#else
&SNDDIRECTX, &SNDDIRECTX,
#endif
NULL NULL
}; };
@ -124,6 +133,7 @@ DWORD WINAPI run( LPVOID lpParameter)
{ {
while(execute) while(execute)
{ {
SPU_Pause(0);
cycles = NDS_exec((560190<<1)-cycles,FALSE); cycles = NDS_exec((560190<<1)-cycles,FALSE);
SPU_Emulate(); SPU_Emulate();
@ -193,9 +203,10 @@ DWORD WINAPI run( LPVOID lpParameter)
} }
CWindow_RefreshALL(); CWindow_RefreshALL();
Sleep(0); //Sleep(0);
//execute = FALSE; //execute = FALSE;
} }
SPU_Pause(1);
Sleep(500); Sleep(500);
} }
return 1; return 1;
@ -252,7 +263,7 @@ int WINAPI WinMain (HINSTANCE hThisInstance,
#endif #endif
NDS_Init(); NDS_Init();
if (SPU_ChangeSoundCore(SNDCORE_DIRECTX, 735 * 4) != 0) if (SPU_ChangeSoundCore(SNDCORE_SDL, 735 * 4) != 0)
{ {
MessageBox(hwnd,"Unable to initialize DirectSound","Error",MB_OK); MessageBox(hwnd,"Unable to initialize DirectSound","Error",MB_OK);
return messages.wParam; return messages.wParam;
@ -500,6 +511,8 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM
{ {
case IDM_OPEN: case IDM_OPEN:
{ {
execute = FALSE; //Stop emulation while opening new rom
OPENFILENAME ofn; OPENFILENAME ofn;
char filename[MAX_PATH] = ""; char filename[MAX_PATH] = "";
ZeroMemory(&ofn, sizeof(ofn)); ZeroMemory(&ofn, sizeof(ofn));
@ -513,6 +526,7 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM
if(!GetOpenFileName(&ofn)) if(!GetOpenFileName(&ofn))
{ {
execute = TRUE; //Restart emulation if no new rom chosen
return 0; return 0;
} }