diff options
Diffstat (limited to 'src/audio')
| -rw-r--r-- | src/audio/synth.cc | 17 | ||||
| -rw-r--r-- | src/audio/synth.h | 3 | ||||
| -rw-r--r-- | src/audio/tracker.cc | 28 |
3 files changed, 41 insertions, 7 deletions
diff --git a/src/audio/synth.cc b/src/audio/synth.cc index 2072bb4..d66c502 100644 --- a/src/audio/synth.cc +++ b/src/audio/synth.cc @@ -30,6 +30,8 @@ struct Voice { int buffer_pos; float fractional_pos; // Fractional sample position for tempo scaling + int start_sample_offset; // Samples to wait before producing audio output + const volatile float* active_spectral_data; }; @@ -152,7 +154,8 @@ void synth_commit_update(int spectrogram_id) { new_active_ptr, __ATOMIC_RELEASE); } -void synth_trigger_voice(int spectrogram_id, float volume, float pan) { +void synth_trigger_voice(int spectrogram_id, float volume, float pan, + int start_offset_samples) { if (spectrogram_id < 0 || spectrogram_id >= MAX_SPECTROGRAMS || !g_synth_data.spectrogram_registered[spectrogram_id]) { #if defined(DEBUG_LOG_SYNTH) @@ -174,6 +177,11 @@ void synth_trigger_voice(int spectrogram_id, float volume, float pan) { pan, spectrogram_id); pan = (pan < -1.0f) ? -1.0f : 1.0f; } + if (start_offset_samples < 0) { + DEBUG_SYNTH("[SYNTH WARNING] Negative start_offset=%d, clamping to 0\n", + start_offset_samples); + start_offset_samples = 0; + } #endif for (int i = 0; i < MAX_VOICES; ++i) { @@ -193,6 +201,7 @@ void synth_trigger_voice(int spectrogram_id, float volume, float pan) { v.buffer_pos = DCT_SIZE; // Force IDCT on first render v.fractional_pos = 0.0f; // Initialize fractional position for tempo scaling + v.start_sample_offset = start_offset_samples; // NEW: Sample-accurate timing v.active_spectral_data = g_synth_data.active_spectrogram_data[spectrogram_id]; @@ -223,6 +232,12 @@ void synth_render(float* output_buffer, int num_frames) { if (!v.active) continue; + // NEW: Skip this sample if we haven't reached the trigger offset yet + if (v.start_sample_offset > 0) { + v.start_sample_offset--; + continue; // Don't produce audio until offset elapsed + } + if (v.buffer_pos >= DCT_SIZE) { if (v.current_spectral_frame >= v.total_spectral_frames) { v.active = false; diff --git a/src/audio/synth.h b/src/audio/synth.h index ba96167..b2625b3 100644 --- a/src/audio/synth.h +++ b/src/audio/synth.h @@ -38,7 +38,8 @@ void synth_unregister_spectrogram(int spectrogram_id); float* synth_begin_update(int spectrogram_id); void synth_commit_update(int spectrogram_id); -void synth_trigger_voice(int spectrogram_id, float volume, float pan); +void synth_trigger_voice(int spectrogram_id, float volume, float pan, + int start_offset_samples = 0); void synth_render(float* output_buffer, int num_frames); void synth_set_tempo_scale( float tempo_scale); // Set playback speed (1.0 = normal) 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++; } |