issue #6 (westlicht#373) Song Mode sync

mebitek · Jan 3, 2024 · 228e7d1 · 228e7d1
1 parent db89588
commit 228e7d1
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 15 deletions.
diff --git a/src/apps/sequencer/engine/Engine.cpp b/src/apps/sequencer/engine/Engine.cpp
@@ -240,17 +240,7 @@ void Engine::togglePlay(bool shift) {
 void Engine::clockStart() {
     _clock.masterStart();
 
-
-    int syncSong = _model.settings().userSettings().get<SyncSong>(SettingSyncSong)->getValue();
-
-    if (syncSong==1) {
-        int slotCount = _project.song().slotCount();
-
-        if (slotCount>0 && !_project.playState().songState().playing()) {
-            int _selectedSlot = slotCount > 0 ? clamp(1, 0, slotCount - 1) : -1;
-            _project.playState().playSong(_selectedSlot, PlayState::ExecuteType::Immediate);
-        }
-    }
+    startSong();
 
 }
 
@@ -264,6 +254,28 @@ void Engine::clockContinue() {
 
 void Engine::clockReset() {
     _clock.masterReset();
+    stopSong();
+}
+
+bool Engine::clockRunning() const {
+    return _state.running();
+}
+
+
+void Engine::startSong() {
+    int syncSong = _model.settings().userSettings().get<SyncSong>(SettingSyncSong)->getValue();
+
+    if (syncSong==1) {
+        int slotCount = _project.song().slotCount();
+
+        if (slotCount>0 && !_project.playState().songState().playing()) {
+            int _selectedSlot = slotCount > 0 ? clamp(1, 0, slotCount - 1) : -1;
+            _project.playState().playSong(_selectedSlot, PlayState::ExecuteType::Immediate);
+        }
+    }
+}
+
+void Engine::stopSong() {
     int syncSong = _model.settings().userSettings().get<SyncSong>(SettingSyncSong)->getValue();
 
     if (syncSong==1) {
@@ -273,10 +285,6 @@ void Engine::clockReset() {
     }
 }
 
-bool Engine::clockRunning() const {
-    return _state.running();
-}
-
 void Engine::toggleRecording() {
     _state.setRecording(!_state.recording());
 }
@@ -800,6 +808,7 @@ void Engine::initClock() {
         // start clock on first clock pulse if reset is not hold and clock is not running
         if (clockSetup.clockInputMode() == ClockSetup::ClockInputMode::Reset && !_clock.isRunning() && !_dio.resetInput.get()) {
             _clock.slaveStart(ClockSourceExternal);
+            startSong();
         }
         if (value) {
             _clock.slaveTick(ClockSourceExternal);
@@ -813,23 +822,29 @@ void Engine::initClock() {
         case ClockSetup::ClockInputMode::Reset:
             if (value) {
                 _clock.slaveReset(ClockSourceExternal);
+                stopSong();
             } else {
                 _clock.slaveStart(ClockSourceExternal);
+                startSong();
             }
             break;
         case ClockSetup::ClockInputMode::Run:
             if (value) {
                 _clock.slaveContinue(ClockSourceExternal);
+                startSong();
             } else {
                 _clock.slaveStop(ClockSourceExternal);
+                stopSong();
             }
             break;
         case ClockSetup::ClockInputMode::StartStop:
             if (value) {
                 _clock.slaveStart(ClockSourceExternal);
+                startSong();
             } else {
                 _clock.slaveStop(ClockSourceExternal);
                 _clock.slaveReset(ClockSourceExternal);
+                stopSong()
             }
             break;
         case ClockSetup::ClockInputMode::Last:

diff --git a/src/apps/sequencer/engine/Engine.h b/src/apps/sequencer/engine/Engine.h
@@ -82,6 +82,10 @@ class Engine : private Clock::Listener {
     void clockReset();
     bool clockRunning() const;
 
+    // song control
+    void startSong();
+    void stopSong();
+
     // recording
     void toggleRecording();
     void setRecording(bool recording);