diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/audio/synth.h | 5 | ||||
| -rw-r--r-- | src/audio/tracker.cc | 51 | ||||
| -rw-r--r-- | src/main.cc | 3 |
3 files changed, 38 insertions, 21 deletions
diff --git a/src/audio/synth.h b/src/audio/synth.h index a0720f2..a8f15a9 100644 --- a/src/audio/synth.h +++ b/src/audio/synth.h @@ -7,8 +7,11 @@ #include "dct.h" #include <cstdint> +// Based on tracker score analysis (see generated/music_data.cc) +// Max simultaneous patterns: 5, recommended: 10 each +// Using 16 for comfortable headroom #define MAX_VOICES 16 -#define MAX_SPECTROGRAMS 8 +#define MAX_SPECTROGRAMS 16 struct Spectrogram { const float* spectral_data_a; // Front buffer diff --git a/src/audio/tracker.cc b/src/audio/tracker.cc index 5d99a45..470123a 100644 --- a/src/audio/tracker.cc +++ b/src/audio/tracker.cc @@ -15,9 +15,11 @@ struct ManagedSpectrogram { // Simple pool for dynamic spectrograms static ManagedSpectrogram g_spec_pool[MAX_SPECTROGRAMS]; +static int g_next_pool_slot = 0; // Round-robin allocation void tracker_init() { g_last_trigger_idx = 0; + g_next_pool_slot = 0; for (int i = 0; i < MAX_SPECTROGRAMS; ++i) { g_spec_pool[i].synth_id = -1; g_spec_pool[i].data = nullptr; @@ -26,11 +28,17 @@ void tracker_init() { } static int get_free_pool_slot() { + // Try to find an inactive slot first (unused slots) for (int i = 0; i < MAX_SPECTROGRAMS; ++i) { if (!g_spec_pool[i].active) return i; } - return -1; + + // If all slots are active, reuse the oldest one (round-robin) + // This automatically handles cleanup of old patterns + const int slot = g_next_pool_slot; + g_next_pool_slot = (g_next_pool_slot + 1) % MAX_SPECTROGRAMS; + return slot; } void tracker_update(float time_sec) { @@ -50,7 +58,7 @@ void tracker_update(float time_sec) { for (uint32_t i = 0; i < pattern.num_events; ++i) { const TrackerEvent& event = pattern.events[i]; - + std::vector<float> note_data; int note_frames = 0; @@ -77,27 +85,32 @@ void tracker_update(float time_sec) { } if (dest_num_frames > 0) { - int slot = get_free_pool_slot(); - if (slot != -1) { - if (g_spec_pool[slot].synth_id != -1) { - synth_unregister_spectrogram(g_spec_pool[slot].synth_id); - delete[] g_spec_pool[slot].data; - } + const int slot = get_free_pool_slot(); - g_spec_pool[slot].data = new float[pattern_data.size()]; - memcpy(g_spec_pool[slot].data, pattern_data.data(), - pattern_data.size() * sizeof(float)); + // Clean up old data in this slot if reusing + if (g_spec_pool[slot].synth_id != -1) { + synth_unregister_spectrogram(g_spec_pool[slot].synth_id); + g_spec_pool[slot].synth_id = -1; + } + if (g_spec_pool[slot].data != nullptr) { + delete[] g_spec_pool[slot].data; + g_spec_pool[slot].data = nullptr; + } - Spectrogram spec; - spec.spectral_data_a = g_spec_pool[slot].data; - spec.spectral_data_b = g_spec_pool[slot].data; - spec.num_frames = dest_num_frames; + // Allocate and register new pattern + g_spec_pool[slot].data = new float[pattern_data.size()]; + memcpy(g_spec_pool[slot].data, pattern_data.data(), + pattern_data.size() * sizeof(float)); - g_spec_pool[slot].synth_id = synth_register_spectrogram(&spec); - g_spec_pool[slot].active = true; + Spectrogram spec; + spec.spectral_data_a = g_spec_pool[slot].data; + spec.spectral_data_b = g_spec_pool[slot].data; + spec.num_frames = dest_num_frames; - synth_trigger_voice(g_spec_pool[slot].synth_id, 1.0f, 0.0f); - } + g_spec_pool[slot].synth_id = synth_register_spectrogram(&spec); + g_spec_pool[slot].active = true; + + synth_trigger_voice(g_spec_pool[slot].synth_id, 1.0f, 0.0f); } g_last_trigger_idx++; diff --git a/src/main.cc b/src/main.cc index 7114460..76e366a 100644 --- a/src/main.cc +++ b/src/main.cc @@ -102,6 +102,7 @@ int main(int argc, char** argv) { const int step = beat_count % 16; +/* // Bass pattern if (step % 4 == 0) { float* back_buffer = synth_begin_update(bass_id); @@ -112,7 +113,7 @@ int main(int argc, char** argv) { } synth_trigger_voice(bass_id, 0.9f, 1.2f); } - +*/ ++beat_count; } tracker_update((float)t); |