Play from step

Author: 203Null

Applications/Sequencer/ControlBar.cpp

@@ -191,19 +191,33 @@ bool SequencerControlBar::HandleStepPlayKey(KeyInfo *keyInfo)
   }
   else if (keyInfo->state == RELEASED && keyInfo->Hold() == false)
   {
-      // bool trackPlaying = sequencer->sequence.Playing(sequencer->track);
-      // if (trackPlaying)
-      // {
-      //   sequencer->sequence.StopAfter(sequencer->track);
-      // }
-      // else
-      // {
-      //   sequencer->sequence.Play(sequencer->track);
-      //   if (sequencer->currentView == Sequencer::ViewMode::StepDetail)
-      //   {
-      //     sequencer->SetView(Sequencer::ViewMode::Sequencer);
-      //   }
-      // }
+      if (sequencer->sequence.Playing(sequencer->track))
+      {
+        sequencer->sequence.StopAfter(sequencer->track);
+      }
+      else if(sequencer->sequence.Playing())
+      {
+        // Launch track in next possible bar
+        sequencer->sequence.Play(sequencer->track);
+        uint8_t pattern = std::get<0>(*sequencer->stepSelected.begin());
+        SequencePosition* pos = sequencer->sequence.GetPosition(sequencer->track);
+        if(pattern != pos->pattern)
+        {
+          sequencer->stepSelected.clear();
+          sequencer->ClearActiveNotes();
+        }
+      }
+      else
+      {
+        if(sequencer->stepSelected.size() == 1)
+        {
+          SequencePosition* pos = sequencer->sequence.GetPosition(sequencer->track);
+          uint8_t currentPattern = pos->pattern;
+          uint8_t pattern = std::get<0>(*sequencer->stepSelected.begin());
+          uint8_t step = std::get<1>(*sequencer->stepSelected.begin());
+          sequencer->sequence.PlayFrom(sequencer->track, pos->clip, pattern, step);
+        }
+      }
   }
   return true;
 }

Applications/Sequencer/Sequence.cpp

@@ -247,6 +247,72 @@ void Sequence::PlayClipForAllTracks(uint8_t clip)
     }
 }
 
+void Sequence::PlayFrom(uint8_t track, uint8_t clip, uint8_t pattern, uint8_t step)
+{
+    // Validate clip exists
+    if (!ClipExists(track, clip)) return;
+
+    // Validate pattern exists
+    if (pattern >= GetPatternCount(track, clip)) return;
+
+    // Get the pattern to validate step
+    SequencePattern* targetPattern = GetPattern(track, clip, pattern);
+    if (!targetPattern) return;
+
+    // Validate step is within pattern bounds
+    if (step >= targetPattern->steps) return;
+
+    // Initialize timing if not already playing
+    if (!playing) {
+        playing = true;
+        clocksTillStart = record ? 24 * 4 + 1 : 1;
+        currentPulse = UINT16_MAX;
+        pulseSinceStart = 0;
+        currentRecordLayer = 0;
+
+        for (uint8_t i = 0; i < trackPlayback.size(); i++) {
+            // Reset positions and prepare for playback
+            trackPlayback[i].position.pattern = 0;
+            trackPlayback[i].position.step = 0;
+            trackPlayback[i].position.pulse = UINT16_MAX; // so first advance lands on 0
+
+            // Clear playback state
+            trackPlayback[i].nextClip = 255;
+            trackPlayback[i].playing = false;
+            trackPlayback[i].canResume = false;  // Clear resume state when starting fresh playback
+            trackPlayback[i].noteOffMap.clear();
+            trackPlayback[i].noteOffQueue.clear();
+        }
+    }
+
+    // Set the track position directly to our target location
+    trackPlayback[track].position.clip = clip;
+    trackPlayback[track].position.pattern = pattern;
+    trackPlayback[track].position.step = step;
+    trackPlayback[track].position.pulse = UINT16_MAX;  // Will advance to 0 on first tick
+
+    // Start playback for this track
+    trackPlayback[track].playing = true;
+    trackPlayback[track].nextClip = 255;  // No queued clip change
+
+    // Calculate steps elapsed from clip start to our starting position
+    uint16_t stepSinceStart = 0;
+
+    // Sum up all steps in patterns before our target pattern
+    for (uint8_t p = 0; p < pattern; p++) {
+        SequencePattern* pat = GetPattern(track, clip, p);
+        if (pat) {
+            stepSinceStart += pat->steps;
+        }
+    }
+
+    // Add steps within the target pattern up to our starting step
+    stepSinceStart += step;
+
+    // Set currentStep to sync with bar boundaries
+    currentStep = stepSinceStart % barLength;
+}
+
 void Sequence::Resume()
 {
     if(CanResume() == false)

Applications/Sequencer/Sequence.h

@@ -26,7 +26,7 @@ class Sequence
     bool clockOutput = false;
 
     // Clip switching timing
-    uint16_t barLength = 16; // Length of each bay in steps
+    uint16_t barLength = 16; // Length of each bar in steps
 
     // Internal sequencer timing (96 PPQN)
     uint32_t lastPulseTime = 0;             // Last time the sequencer tick was processed (microseconds)
@@ -78,6 +78,7 @@ class Sequence
     void Play(uint8_t track);
     void PlayClip(uint8_t track, uint8_t clip);
     void PlayClipForAllTracks(uint8_t clip);
+    void PlayFrom(uint8_t track, uint8_t clip, uint8_t pattern, uint8_t step);
     void Resume();
     bool CanResume();
     bool Playing();