piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-21 05:09:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

FPS counter is back

Browse Source
This commit is contained in:
Arisotura
2020-04-27 23:58:29 +02:00
parent a8aa834c16
commit 0913576ef5
2 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/frontend/qt_sdl/main.cpp
View File

@ -60,6 +60,9 @@ EmuThread::EmuThread(QObject* parent) : QThread(parent)
{
EmuStatus = 0;
EmuRunning = 2;
RunningSomething = false;
connect(this, SIGNAL(windowTitleChange(QString)), mainWindow, SLOT(onTitleUpdate(QString)));
}
void EmuThread::run()
@ -102,8 +105,6 @@ void EmuThread::run()
u32 nsamples = 0;
char melontitle[100];
SDL_mutex* titlemutex = SDL_CreateMutex();
void* titledata[2] = {melontitle, titlemutex};
while (EmuRunning != 0)
{
@ -207,6 +208,7 @@ void EmuThread::run()
uiAreaQueueRedrawAll(MainDrawArea);*/
mainWindow->update();
bool fastforward = false;
/*bool fastforward = HotkeyDown(HK_FastForward);
if (Config::AudioSync && !fastforward)
@ -218,7 +220,7 @@ void EmuThread::run()
if (ret == SDL_MUTEX_TIMEDOUT) break;
}
SDL_UnlockMutex(AudioSyncLock);
}
}*/
float framerate = (1000.0f * nlines) / (60.0f * 263.0f);
@ -265,11 +267,9 @@ void EmuThread::run()
if (framerate < 1) fpstarget = 999;
else fpstarget = 1000.0f/framerate;
SDL_LockMutex(titlemutex);
sprintf(melontitle, "[%d/%.0f] melonDS " MELONDS_VERSION, fps, fpstarget);
SDL_UnlockMutex(titlemutex);
uiQueueMain(UpdateWindowTitle, titledata);
}*/
changeWindowTitle(melontitle);
}
}
else
{
@ -297,14 +297,15 @@ void EmuThread::run()
EmuStatus = EmuRunning;
sprintf(melontitle, "melonDS " MELONDS_VERSION);
changeWindowTitle(melontitle);
SDL_Delay(100);
}
}
EmuStatus = 0;
SDL_DestroyMutex(titlemutex);
//if (Screen_UseGL) uiGLMakeContextCurrent(GLContext);
NDS::DeInit();
@ -321,6 +322,11 @@ void EmuThread::run()
//if (Screen_UseGL) uiGLMakeContextCurrent(NULL);
}
void EmuThread::changeWindowTitle(char* title)
{
emit windowTitleChange(QString(title));
}
void EmuThread::emuRun()
{
EmuRunning = 1;
@ -460,6 +466,12 @@ void MainWindow::onOpenFile()
}
void MainWindow::onTitleUpdate(QString title)
{
setWindowTitle(title);
}
int main(int argc, char** argv)
{
srand(time(NULL));
@ -623,8 +635,6 @@ int main(int argc, char** argv)
}
#endif
RunningSomething = false;
mainWindow = new MainWindow();
mainWindow->show();