1 files changed, 23 insertions, 5 deletions
diff --git a/src/audio/tracker.cc b/src/audio/tracker.cc
index 9ae772e..93a1c49 100644
--- a/src/audio/tracker.cc
+++ b/src/audio/tracker.cc
@@ -172,7 +172,8 @@ static int get_free_pattern_slot() {
 }
 
 // Helper to trigger a single note event (OPTIMIZED with caching)
-static void trigger_note_event(const TrackerEvent& event) {
+// start_offset_samples: How many samples into the future to trigger (for sample-accurate timing)
+static void trigger_note_event(const TrackerEvent& event, int start_offset_samples) {
 #if defined(DEBUG_LOG_TRACKER)
   // VALIDATION: Check sample_id bounds
   if (event.sample_id >= g_tracker_samples_count) {
@@ -207,8 +208,8 @@ static void trigger_note_event(const TrackerEvent& event) {
     return;
   }
 
-  // Trigger voice directly with cached spectrogram
-  synth_trigger_voice(cached_synth_id, event.volume, event.pan);
+  // Trigger voice with sample-accurate offset
+  synth_trigger_voice(cached_synth_id, event.volume, event.pan, start_offset_samples);
 }
 
 void tracker_update(float music_time_sec) {
@@ -238,6 +239,10 @@ void tracker_update(float music_time_sec) {
   }
 
   // Step 2: Update all active patterns and trigger individual events
+  // Get current audio playback position for sample-accurate timing
+  const float current_playback_time = audio_get_playback_time();
+  const float SAMPLE_RATE = 32000.0f; // Audio sample rate
+
   for (int i = 0; i < MAX_SPECTROGRAMS; ++i) {
     if (!g_active_patterns[i].active)
       continue;
@@ -256,8 +261,21 @@ void tracker_update(float music_time_sec) {
       if (event.unit_time > elapsed_units)
         break; // This event hasn't reached its time yet
 
-      // Trigger this event as an individual voice
-      trigger_note_event(event);
+      // Calculate exact trigger time for this event
+      const float event_trigger_time = active.start_music_time +
+                                       (event.unit_time * unit_duration_sec);
+
+      // Calculate sample-accurate offset from current playback position
+      const float time_delta = event_trigger_time - current_playback_time;
+      int sample_offset = (int)(time_delta * SAMPLE_RATE);
+
+      // Clamp to 0 if negative (event is late, play immediately)
+      if (sample_offset < 0) {
+        sample_offset = 0;
+      }
+
+      // Trigger this event as an individual voice with sample-accurate timing
+      trigger_note_event(event, sample_offset);
 
       active.next_event_idx++;
     }