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

Merge commit '3984491ccec4630091bbb178c7c0b22aa4e5e937' into melonDSi

This commit is contained in:
Arisotura 2020-05-30 03:04:50 +02:00
parent b44570eba1 3984491cce
commit f5eeca67b4
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/libui_sdl/main.cpp
View File

@ -886,7 +886,10 @@ bool JoyButtonHeld(int btnid, int njoybuttons, Uint8* joybuttons, Uint32 hat)
void UpdateWindowTitle(void* data) void UpdateWindowTitle(void* data)
{ {
if (EmuStatus == 0) return; if (EmuStatus == 0) return;
uiWindowSetTitle(MainWindow, (const char*)data); void** dataarray = (void**)data;
SDL_LockMutex((SDL_mutex*)dataarray[1]);
uiWindowSetTitle(MainWindow, (const char*)dataarray[0]);
SDL_UnlockMutex((SDL_mutex*)dataarray[1]);
} }
void UpdateFPSLimit(void* data) void UpdateFPSLimit(void* data)
@ -932,7 +935,10 @@ int EmuThreadFunc(void* burp)
u64 perffreq = SDL_GetPerformanceFrequency(); u64 perffreq = SDL_GetPerformanceFrequency();
float samplesleft = 0; float samplesleft = 0;
u32 nsamples = 0; u32 nsamples = 0;
char melontitle[100]; char melontitle[100];
SDL_mutex* titlemutex = SDL_CreateMutex();
void* titledata[2] = {melontitle, titlemutex};
while (EmuRunning != 0) while (EmuRunning != 0)
{ {
@ -1056,6 +1062,11 @@ int EmuThreadFunc(void* burp)
starttick = lasttick; starttick = lasttick;
} }
} }
else
{
if (delay < 1) SDL_Delay(1);
lasttick = SDL_GetTicks();
}
} }
nframes++; nframes++;
@ -1074,8 +1085,10 @@ int EmuThreadFunc(void* burp)
if (framerate < 1) fpstarget = 999; if (framerate < 1) fpstarget = 999;
else fpstarget = 1000.0f/framerate; else fpstarget = 1000.0f/framerate;
SDL_LockMutex(titlemutex);
sprintf(melontitle, "[%d/%.0f] melonDS " MELONDS_VERSION, fps, fpstarget); sprintf(melontitle, "[%d/%.0f] melonDS " MELONDS_VERSION, fps, fpstarget);
uiQueueMain(UpdateWindowTitle, melontitle); SDL_UnlockMutex(titlemutex);
uiQueueMain(UpdateWindowTitle, titledata);
} }
} }
else else
@ -1109,6 +1122,8 @@ int EmuThreadFunc(void* burp)
EmuStatus = 0; EmuStatus = 0;
SDL_DestroyMutex(titlemutex);
if (Screen_UseGL) uiGLMakeContextCurrent(GLContext); if (Screen_UseGL) uiGLMakeContextCurrent(GLContext);
NDS::DeInit(); NDS::DeInit();