Fix hanging metronomeOnly mode VMPC#104

izzyreal · Jan 23, 2024 · ce34dc9 · ce34dc9
1 parent a4585d5
commit ce34dc9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/main/sequencer/FrameSeq.cpp b/src/main/sequencer/FrameSeq.cpp
@@ -49,7 +49,7 @@ FrameSeq::FrameSeq(mpc::Mpc& mpc)
 {
 }
 
-void FrameSeq::start()
+void FrameSeq::start(const bool metronomeOnlyToUse)
 {
     if (sequencerIsRunning.load())
     {
@@ -68,6 +68,8 @@ void FrameSeq::start()
 
     sequencerPlayTickCounter = sequencer->getPlayStartTick();
 
+    metronomeOnly = metronomeOnlyToUse;
+
     sequencerIsRunning.store(true);
 }
 
@@ -78,8 +80,7 @@ void FrameSeq::startMetronome()
         return;
     }
 
-    metronome = true;
-    start();
+    start(true);
 }
 
 unsigned short FrameSeq::getEventFrameOffset() const
@@ -390,7 +391,7 @@ void FrameSeq::processNoteRepeat()
 
 void FrameSeq::updateTimeDisplay()
 {
-    if (!sequencer->isCountingIn() && !metronome)
+    if (!sequencer->isCountingIn() && !metronomeOnly)
     {
         sequencer->notifyTimeDisplayRealtime();
         sequencer->notifyObservers(std::string("timesignature"));
@@ -534,7 +535,7 @@ void FrameSeq::work(int nFrames)
         triggerClickIfNeeded();
         displayPunchRects();
 
-        if (metronome)
+        if (metronomeOnly)
         {
             sequencerPlayTickCounter++;
             continue;

diff --git a/src/main/sequencer/FrameSeq.hpp b/src/main/sequencer/FrameSeq.hpp
@@ -47,7 +47,7 @@ namespace mpc::sequencer {
         Clock internalClock;
         std::shared_ptr<MidiClockOutput> midiClockOutput;
         std::shared_ptr<Sequencer> sequencer;
-        bool metronome = false;
+        bool metronomeOnly = false;
         std::shared_ptr<mpc::lcdgui::screens::SyncScreen> syncScreen;
 
         // Offset of current tick within current buffer
@@ -102,7 +102,7 @@ namespace mpc::sequencer {
 
         void setSampleRate(unsigned int sampleRate);
 
-        void start();
+        void start(bool metronomeOnly = false);
 
         void startMetronome();