more cleanup

src/frontend/qt_sdl/EmuThread.cpp

@@ -63,9 +63,8 @@ EmuThread::EmuThread(EmuInstance* inst, QObject* parent) : QThread(parent)
 {
     emuInstance = inst;
 
-    EmuStatus = emuStatus_Exit;
+    emuStatus = emuStatus_Paused;
-    EmuRunning = emuStatus_Paused;
+    emuPauseStack = emuPauseStackRunning;
-    EmuPauseStack = EmuPauseStackRunning;
     emuActive = false;
 }
 
@@ -152,7 +151,7 @@ void EmuThread::run()
 
     char melontitle[100];
 
-    while (EmuRunning != emuStatus_Exit)
+    while (emuStatus != emuStatus_Exit)
     {
         emuInstance->inputProcess();
 
@@ -167,10 +166,9 @@ void EmuThread::run()
         if (emuInstance->hotkeyPressed(HK_SwapScreens)) emit swapScreensToggle();
         if (emuInstance->hotkeyPressed(HK_SwapScreenEmphasis)) emit screenEmphasisToggle();
 
-        if (EmuRunning == emuStatus_Running || EmuRunning == emuStatus_FrameStep)
+        if (emuStatus == emuStatus_Running || emuStatus == emuStatus_FrameStep)
         {
-            EmuStatus = emuStatus_Running;
+            if (emuStatus == emuStatus_FrameStep) emuStatus = emuStatus_Paused;
-            if (EmuRunning == emuStatus_FrameStep) EmuRunning = emuStatus_Paused;
 
             if (emuInstance->hotkeyPressed(HK_SolarSensorDecrease))
             {
@@ -329,8 +327,6 @@ void EmuThread::run()
             MelonCap::Update();
 #endif // MELONCAP
 
-            if (EmuRunning == emuStatus_Exit) break;
-
             winUpdateCount++;
             if (winUpdateCount >= winUpdateFreq && !useOpenGL)
             {
@@ -428,8 +424,6 @@ void EmuThread::run()
 
             emit windowUpdate();
 
-            EmuStatus = EmuRunning;
-
             int inst = emuInstance->instanceID;
             if (inst == 0)
                 sprintf(melontitle, "melonDS " MELONDS_VERSION);
@@ -457,8 +451,6 @@ void EmuThread::run()
         Platform::CloseFile(file);
     }
 
-    EmuStatus = emuStatus_Exit;
-
     NDS::Current = nullptr;
 }
 
@@ -489,9 +481,16 @@ void EmuThread::handleMessages()
         Message msg = msgQueue.dequeue();
         switch (msg.type)
         {
+        case msg_Exit:
+            emuStatus = emuStatus_Exit;
+            emuPauseStack = emuPauseStackRunning;
+
+            emuInstance->audioDisable();
+            break;
+
         case msg_EmuRun:
-            EmuRunning = emuStatus_Running;
+            emuStatus = emuStatus_Running;
-            EmuPauseStack = EmuPauseStackRunning;
+            emuPauseStack = emuPauseStackRunning;
             emuActive = true;
 
             emuInstance->audioEnable();
@@ -499,13 +498,13 @@ void EmuThread::handleMessages()
             break;
 
         case msg_EmuPause:
-            EmuPauseStack++;
+            emuPauseStack++;
-            if (EmuPauseStack > EmuPauseStackPauseThreshold) break;
+            if (emuPauseStack > emuPauseStackPauseThreshold) break;
 
-            PrevEmuStatus = EmuRunning;
+            prevEmuStatus = emuStatus;
-            EmuRunning = emuStatus_Paused;
+            emuStatus = emuStatus_Paused;
 
-            if (PrevEmuStatus != emuStatus_Paused)
+            if (prevEmuStatus != emuStatus_Paused)
             {
                 emuInstance->audioDisable();
                 emit windowEmuPause(true);
@@ -514,14 +513,14 @@ void EmuThread::handleMessages()
             break;
 
         case msg_EmuUnpause:
-            if (EmuPauseStack < EmuPauseStackPauseThreshold) break;
+            if (emuPauseStack < emuPauseStackPauseThreshold) break;
 
-            EmuPauseStack--;
+            emuPauseStack--;
-            if (EmuPauseStack >= EmuPauseStackPauseThreshold) break;
+            if (emuPauseStack >= emuPauseStackPauseThreshold) break;
 
-            EmuRunning = PrevEmuStatus;
+            emuStatus = prevEmuStatus;
 
-            if (EmuRunning != emuStatus_Paused)
+            if (emuStatus != emuStatus_Paused)
             {
                 emuInstance->audioEnable();
                 emit windowEmuPause(false);
@@ -531,7 +530,7 @@ void EmuThread::handleMessages()
 
         case msg_EmuStop:
             if (msg.stopExternal) emuInstance->nds->Stop();
-            EmuRunning = emuStatus_Paused;
+            emuStatus = emuStatus_Paused;
             emuActive = false;
 
             emuInstance->audioDisable();
@@ -591,7 +590,7 @@ void EmuThread::emuUnpause()
 
 void EmuThread::emuTogglePause()
 {
-    if (EmuRunning == emuStatus_Paused)
+    if (emuStatus == emuStatus_Paused)
         emuUnpause();
     else
         emuPause();
@@ -605,21 +604,19 @@ void EmuThread::emuStop(bool external)
 
 void EmuThread::emuExit()
 {
-    EmuRunning = emuStatus_Exit;
+    sendMessage(msg_Exit);
-    EmuPauseStack = EmuPauseStackRunning;
+    waitAllMessages();
-
-    emuInstance->audioDisable();
 }
 
 void EmuThread::emuFrameStep()
 {
-    //if (EmuPauseStack < EmuPauseStackPauseThreshold) emit windowEmuPause();
+    //if (emuPauseStack < emuPauseStackPauseThreshold) emit windowEmuPause();
-    EmuRunning = emuStatus_FrameStep;
+    emuStatus = emuStatus_FrameStep;
 }
 
 bool EmuThread::emuIsRunning()
 {
-    return EmuRunning == emuStatus_Running;
+    return emuStatus == emuStatus_Running;
 }
 
 bool EmuThread::emuIsActive()

src/frontend/qt_sdl/EmuThread.h

@@ -57,6 +57,8 @@ public:
 
     enum MessageType
     {
+        msg_Exit,
+
         msg_EmuRun,
         msg_EmuPause,
         msg_EmuUnpause,
@@ -139,15 +141,14 @@ private:
         emuStatus_Paused,
         emuStatus_FrameStep,
     };
-    std::atomic<EmuStatusKind> EmuStatus;
 
-    EmuStatusKind PrevEmuStatus;
+    EmuStatusKind prevEmuStatus;
-    EmuStatusKind EmuRunning;
+    EmuStatusKind emuStatus;
     bool emuActive;
 
-    constexpr static int EmuPauseStackRunning = 0;
+    constexpr static int emuPauseStackRunning = 0;
-    constexpr static int EmuPauseStackPauseThreshold = 1;
+    constexpr static int emuPauseStackPauseThreshold = 1;
-    int EmuPauseStack;
+    int emuPauseStack;
 
     QMutex msgMutex;
     QSemaphore msgSemaphore;