GUI: better

src/engine/engine.cpp

@@ -2166,6 +2166,13 @@ int DivEngine::getRow() {
   return prevRow;
 }
 
+void DivEngine::getPlayPos(int& order, int& row) {
+  playPosLock.lock();
+  order=prevOrder;
+  row=prevRow;
+  playPosLock.unlock();
+}
+
 int DivEngine::getElapsedBars() {
   return elapsedBars;
 }

src/engine/engine.h

@@ -446,7 +446,7 @@ class DivEngine {
   // bitfield
   unsigned char walked[8192];
   bool isMuted[DIV_MAX_CHANS];
-  std::mutex isBusy, saveLock;
+  std::mutex isBusy, saveLock, playPosLock;
   String configPath;
   String configFile;
   String lastError;
@@ -848,6 +848,9 @@ class DivEngine {
     // get current row
     int getRow();
 
+    // synchronous get order/row
+    void getPlayPos(int& order, int& row);
+
     // get beat/bar
     int getElapsedBars();
     int getElapsedBeats();

src/engine/playback.cpp

@@ -1164,8 +1164,10 @@ void DivEngine::nextRow() {
   }
 
   if (!stepPlay) {
+    playPosLock.lock();
     prevOrder=curOrder;
     prevRow=curRow;
+    playPosLock.unlock();
   }
 
   for (int i=0; i<chans; i++) {
@@ -1403,8 +1405,10 @@ bool DivEngine::nextTick(bool noAccum, bool inhibitLowLat) {
             endOfSong=false;
             if (stepPlay==2) {
               stepPlay=1;
+              playPosLock.lock();
               prevOrder=curOrder;
               prevRow=curRow;
+              playPosLock.unlock();
             }
             nextRow();
             break;

src/gui/gui.cpp

@@ -3922,6 +3922,17 @@ bool FurnaceGUI::loop() {
     curWindow=GUI_WINDOW_NOTHING;
     editOptsVisible=false;
 
+    int nextPlayOrder=0;
+    int nextOldRow=0;
+    e->getPlayPos(nextPlayOrder,nextOldRow);
+    playOrder=nextPlayOrder;
+    if (followPattern) {
+      curOrder=playOrder;
+    }
+    if (e->isPlaying()) {
+      oldRow=nextOldRow;
+    }
+
     if (!mobileUI) {
       ImGui::BeginMainMenuBar();
       if (ImGui::BeginMenu(settings.capitalMenuBar?"File":"file")) {
@@ -4459,16 +4470,6 @@ bool FurnaceGUI::loop() {
 
     MEASURE(calcChanOsc,calcChanOsc());
 
-    e->synchronized([this]() {
-      playOrder=e->getOrder();
-      if (followPattern) {
-        curOrder=playOrder;
-      }
-      if (e->isPlaying()) {
-        oldRow=e->getRow();
-      }
-    });
-
     if (mobileUI) {
       globalWinFlags=ImGuiWindowFlags_NoTitleBar|ImGuiWindowFlags_NoMove|ImGuiWindowFlags_NoResize|ImGuiWindowFlags_NoBringToFrontOnFocus;
       //globalWinFlags=ImGuiWindowFlags_NoTitleBar;