1 files changed, 13 insertions, 10 deletions

diff --git a/src/audio/tracker.cc b/src/audio/tracker.cc
index 7ad5a67..9ae772e 100644
--- a/src/audio/tracker.cc
+++ b/src/audio/tracker.cc
@@ -212,19 +212,24 @@ static void trigger_note_event(const TrackerEvent& event) {
 }
 
 void tracker_update(float music_time_sec) {
+  // Unit-less timing: 1 unit = 4 beats (by convention)
+  const float BEATS_PER_UNIT = 4.0f;
+  const float unit_duration_sec = (BEATS_PER_UNIT / g_tracker_score.bpm) * 60.0f;
+
   // Step 1: Process new pattern triggers
   while (g_last_trigger_idx < g_tracker_score.num_triggers) {
     const TrackerPatternTrigger& trigger =
         g_tracker_score.triggers[g_last_trigger_idx];
 
-    if (trigger.time_sec > music_time_sec)
+    const float trigger_time_sec = trigger.unit_time * unit_duration_sec;
+    if (trigger_time_sec > music_time_sec)
       break;
 
     // Add this pattern to active patterns list
     const int slot = get_free_pattern_slot();
     if (slot != -1) {
       g_active_patterns[slot].pattern_id = trigger.pattern_id;
-      g_active_patterns[slot].start_music_time = trigger.time_sec;
+      g_active_patterns[slot].start_music_time = trigger_time_sec;
       g_active_patterns[slot].next_event_idx = 0;
       g_active_patterns[slot].active = true;
     }
@@ -233,8 +238,6 @@ void tracker_update(float music_time_sec) {
   }
 
   // Step 2: Update all active patterns and trigger individual events
-  const float beat_duration = 60.0f / g_tracker_score.bpm;
-
   for (int i = 0; i < MAX_SPECTROGRAMS; ++i) {
     if (!g_active_patterns[i].active)
       continue;
@@ -242,15 +245,15 @@ void tracker_update(float music_time_sec) {
     ActivePattern& active = g_active_patterns[i];
     const TrackerPattern& pattern = g_tracker_patterns[active.pattern_id];
 
-    // Calculate elapsed beats since pattern started
+    // Calculate elapsed unit-less time since pattern started
     const float elapsed_music_time = music_time_sec - active.start_music_time;
-    const float elapsed_beats = elapsed_music_time / beat_duration;
+    const float elapsed_units = elapsed_music_time / unit_duration_sec;
 
-    // Trigger all events that have passed their beat time
+    // Trigger all events that have passed their unit time
     while (active.next_event_idx < pattern.num_events) {
       const TrackerEvent& event = pattern.events[active.next_event_idx];
 
-      if (event.beat > elapsed_beats)
+      if (event.unit_time > elapsed_units)
         break; // This event hasn't reached its time yet
 
       // Trigger this event as an individual voice
@@ -259,8 +262,8 @@ void tracker_update(float music_time_sec) {
       active.next_event_idx++;
     }
 
-    // If all events have been triggered, mark pattern as complete
-    if (active.next_event_idx >= pattern.num_events) {
+    // Pattern remains active until full duration elapses
+    if (elapsed_units >= pattern.unit_length) {
       active.active = false;
     }
   }