misc

Author: koppi

src/gui.cpp

@@ -10,8 +10,6 @@
 #include <SDL2/SDL.h>
 #include <SDL_ttf.h>
 #include <SDL_opengl.h>
-// #include <GL/gl.h>
-// #include <OpenGL/gl.h>
 
 // Global pointers to app state for GUI access
 static int *g_chord_prog_enabled = NULL;
@@ -199,8 +197,8 @@ void gui_draw(Synth *synth, SDL_Window *window, SDL_GLContext gl_context,
 
     // Oscillators
     if (ImGui::CollapsingHeader("Oscillators", ImGuiTreeNodeFlags_DefaultOpen)) {
-        ImGui::Columns(3, "osc_columns", true);
-        for (int i = 0; i < 6; ++i) {
+        ImGui::Columns(2, "osc_columns", true);
+        for (int i = 0; i < 4; ++i) {
             ImGui::PushID(i);
             char title[32];
             sprintf(title, "OSC %d", i + 1);
@@ -240,7 +238,7 @@ void gui_draw(Synth *synth, SDL_Window *window, SDL_GLContext gl_context,
         }
 
         // Individual oscillator randomization buttons
-        ImGui::Columns(6, "random_buttons", true);
+        ImGui::Columns(4, "random_buttons", true);
 
         if (ImGui::Button("Randomize OSC 1")) {
             synth_randomize_oscillator(synth, 0);
@@ -256,14 +254,6 @@ void gui_draw(Synth *synth, SDL_Window *window, SDL_GLContext gl_context,
         ImGui::NextColumn();
         if (ImGui::Button("Randomize OSC 4")) {
             synth_randomize_oscillator(synth, 3);
-        }
-        ImGui::NextColumn();
-        if (ImGui::Button("Randomize OSC 5")) {
-            synth_randomize_oscillator(synth, 4);
-        }
-        ImGui::NextColumn();
-        if (ImGui::Button("Randomize OSC 6")) {
-            synth_randomize_oscillator(synth, 5);
         }
 		ImGui::Columns(1, "", false);
     }

src/midi.c

@@ -30,8 +30,7 @@ const CCMapping cc_map[] = {
     {15, "osc3.waveform", 0.0f, 4.0f},      // CC 15: (Undefined/Unused) → OSC 3 Waveform Select
     {16, "osc4.pitch", -24.0f, 24.0f},       // CC 16: General Purpose Controller 1 → OSC 4 Pitch Bend
     {17, "osc4.detune", -1.0f, 1.0f},        // CC 17: General Purpose Controller 2 → OSC 4 Detune
-    {18, "osc5.gain", 0.0f, 1.0f},           // CC 18: General Purpose Controller 3 → OSC 5 Gain
-    {19, "osc6.gain", 0.0f, 1.0f},           // CC 19: General Purpose Controller 4 → OSC 6 Gain
+    
 
     // OSCILLATOR PARAMETER BLOCK (CC 20-31)
     {20, "mixer.master", 0.0f, 2.0f},           // CC 20: (Undefined) → Master Volume
@@ -47,8 +46,7 @@ const CCMapping cc_map[] = {
     {30, "fx.delay.mix", 0.0f, 1.0f},            // CC 30: (Undefined) → Delay Mix
 
     // STANDARD MIDI CONTROLLERS (CC 32-63)
-    {33, "osc6.waveform", 0.0f, 4.0f},        // CC 33: LSB of Bank Select → OSC 6 Waveform
-    {34, "osc5.waveform", 0.0f, 4.0f},        // CC 34: LSB of Bank Select → OSC 5 Waveform
+    {34, "osc4.waveform", 0.0f, 4.0f},        // CC 34: LSB of Bank Select → OSC 4 Waveform
     {35, "osc4.waveform", 0.0f, 4.0f},        // CC 35: LSB of Bank Select → OSC 4 Waveform
     {36, "osc3.waveform", 0.0f, 4.0f},        // CC 36: LSB of Bank Select → OSC 3 Waveform
     {37, "osc2.waveform", 0.0f, 4.0f},        // CC 37: LSB of Bank Select → OSC 2 Waveform
@@ -61,8 +59,7 @@ const CCMapping cc_map[] = {
     {44, "fx.filter_drive", 1.0f, 10.0f},          // CC 44: LSB of Bank Select → Filter Drive
     {45, "fx.filter_resonance", 0.1f, 10.0f},        // CC 45: LSB of Bank Select → Filter Resonance
     {46, "fx.filter_mix", 0.0f, 1.0f},             // CC 46: LSB of Bank Select → Filter Mix
-    {47, "osc6.unison_voices", 1.0f, 8.0f},        // CC 47: LSB of Bank Select → OSC 6 Unison Voices
-    {48, "osc5.unison_voices", 1.0f, 8.0f},        // CC 48: LSB of Bank Select → OSC 5 Unison Voices
+    {48, "osc4.unison_voices", 1.0f, 8.0f},        // CC 48: LSB of Bank Select → OSC 4 Unison Voices
     {49, "osc4.unison_voices", 1.0f, 8.0f},        // CC 49: LSB of Bank Select → OSC 4 Unison Voices
     {50, "osc3.unison_voices", 1.0f, 8.0f},        // CC 50: LSB of Bank Select → OSC 3 Unison Voices
     {51, "osc2.unison_voices", 1.0f, 8.0f},        // CC 51: LSB of Bank Select → OSC 2 Unison Voices

src/mixer.c

@@ -82,8 +82,6 @@ void mixer_init(Mixer *mixer) {
   mixer->osc_gain[1] = 0.0f;  // OSC 2 - muted
   mixer->osc_gain[2] = 0.0f;  // OSC 3 - muted
   mixer->osc_gain[3] = 0.0f;  // OSC 4 - muted
-  mixer->osc_gain[4] = 0.0f;  // OSC 5 - muted
-  mixer->osc_gain[5] = 0.0f;  // OSC 6 - muted
 
   mixer->master = 0.25f;  // Reduced from 1.0f to 0.25f
   mixer->master_pan = 0.0f; // Center pan by default

src/synth.c

@@ -192,7 +192,7 @@ int synth_init(Synth *synth, int samplerate, int buffer_size, int voices) {
   // synth_play_startup_melody(synth); // Start the melody at startup
 
   char param_name[16];
-  for (int i = 0; i < 6; ++i) { // Loop for all 6 oscillators
+  for (int i = 0; i < 4; ++i) { // Loop for all 4 oscillators
     osc_init(&synth->osc[i], samplerate);
 
     // Default parameters for main oscillators (0-3)
@@ -218,14 +218,7 @@ int synth_init(Synth *synth, int samplerate, int buffer_size, int voices) {
   }
 
   // Specific default parameters for Bass (osc[4])
-  synth_set_param(synth, "osc5.waveform", 1.0f); // Saw wave for bass
-  synth_set_param(synth, "osc5.pitch", -12.0f); // One octave down
-  synth_set_param(synth, "osc5.gain", 0.7f);
-
-  // Specific default parameters for Percussion (osc[5])
-  synth_set_param(synth, "osc6.waveform", 4.0f); // Noise for percussion
-  synth_set_param(synth, "osc6.gain", 0.5f);
-  // For percussion, we might want a very short envelope, but that's handled by voice/envelope, not directly by osc params.
+  
 
   synth_set_param(synth, "osc1.waveform", 0.0f);
   synth_set_param(synth, "osc2.waveform", 0.0f);
@@ -331,7 +324,7 @@ void synth_handle_cc(Synth *synth, int cc, int value) {
 void synth_set_param(Synth *synth, const char *param, float value) {
   if (strncmp(param, "osc", 3) == 0) {
     int i = param[3] - '1';
-    if (i >= 0 && i < 6) // Changed from i < 4 to i < 6
+    if (i >= 0 && i < 4)
       osc_set_param(&synth->osc[i], param + 5, value);
   } else if (strncmp(param, "fx.", 3) == 0) {
     fx_set_param(&synth->fx, param + 3, value);
@@ -446,7 +439,7 @@ char* synth_save_preset_json(const Synth *synth) {
 
     // Save Oscillator parameters
     cJSON *oscillators = cJSON_CreateArray();
-    for (int i = 0; i < 6; ++i) {
+    for (int i = 0; i < 4; ++i) {
         cJSON *osc = cJSON_CreateObject();
         cJSON_AddNumberToObject(osc, "waveform", synth->osc[i].waveform);
         cJSON_AddNumberToObject(osc, "pitch", synth->osc[i].pitch);
@@ -588,7 +581,7 @@ void synth_load_preset_json(Synth *synth, const char *json_string) {
     cJSON *oscillators = cJSON_GetObjectItemCaseSensitive(root, "oscillators");
     if (cJSON_IsArray(oscillators)) {
         int num_oscillators = cJSON_GetArraySize(oscillators);
-        for (int i = 0; i < num_oscillators && i < 6; ++i) { // Limit to 6 oscillators
+        for (int i = 0; i < num_oscillators && i < 4; ++i) { // Limit to 4 oscillators
             cJSON *osc = cJSON_GetArrayItem(oscillators, i);
             if (cJSON_IsObject(osc)) {
                 cJSON *waveform = cJSON_GetObjectItemCaseSensitive(osc, "waveform");
@@ -845,8 +838,8 @@ void synth_load_default_config(Synth *synth) {
 void synth_randomize_parameters(Synth *synth) {
     char param_name[32];
 
-    // Randomize all oscillators (0-5)
-    for (int i = 0; i < 6; i++) {
+    // Randomize all oscillators (0-3)
+    for (int i = 0; i < 4; i++) {
         // Randomize waveform (0-4: SINE, SAW, SQUARE, TRI, NOISE)
         float random_waveform = (float)(rand() % 5);
         snprintf(param_name, sizeof(param_name), "osc%d.waveform", i + 1);
@@ -885,7 +878,7 @@ void synth_randomize_parameters(Synth *synth) {
 }
 
 void synth_randomize_oscillator(Synth *synth, int osc_index) {
-    if (osc_index < 0 || osc_index >= 6) return;
+    if (osc_index < 0 || osc_index >= 4) return;
 
     char param_name[32];
 

src/synth.h

@@ -23,7 +23,7 @@ typedef struct {
 } ChordProgression;
 
 typedef struct Synth {
-  Oscillator osc[6]; // osc[0-3] for main, osc[4] for bass, osc[5] for percussion
+  Oscillator osc[4]; // osc[0-3] for main oscillators
   LFO lfos[3]; // lfos[0] for pitch, lfos[1] for volume, lfos[2] for filter
   Mixer mixer;
   FX fx;

src/voice.c

@@ -45,7 +45,7 @@ void voice_render(Voice *v, const Oscillator *osc, const LFO *lfo, const float *
     float filter_mod = lfo[2].enabled ? lfo_get_modulation_value((LFO*)&lfo[2]) : 0.0f;
 
     // Process each oscillator with gain and panning
-    for (int o = 0; o < 6; ++o) {
+    for (int o = 0; o < 4; ++o) {
       float modified_note = v->note;
 
       // Apply pitch LFO (only to main oscillators 0-3)
@@ -63,7 +63,7 @@ void voice_render(Voice *v, const Oscillator *osc, const LFO *lfo, const float *
       osc_output *= osc_gains[o];
 
       // Apply oscillator panning
-      float pan = (o < 6) ? osc[o].pan : 0.0f; // All oscillators support pan
+      float pan = (o < 4) ? osc[o].pan : 0.0f; // All oscillators support pan
       float left_gain = (pan <= 0.0f) ? 1.0f : 1.0f - pan;
       float right_gain = (pan >= 0.0f) ? 1.0f : 1.0f + pan;
 
@@ -76,8 +76,8 @@ void voice_render(Voice *v, const Oscillator *osc, const LFO *lfo, const float *
     right *= v->velocity * adsr_value;
 
     // Average across oscillators and add to stereo buffer
-    stereo[n * 2 + 0] += left * (1.0f / 6.0f); // Left channel
-    stereo[n * 2 + 1] += right * (1.0f / 6.0f); // Right channel
+    stereo[n * 2 + 0] += left * (1.0f / 4.0f); // Left channel
+    stereo[n * 2 + 1] += right * (1.0f / 4.0f); // Right channel
   }
 }
 

src/voice.h

@@ -8,7 +8,7 @@ typedef struct Voice {
   float note;
   float velocity;
   unsigned long long timestamp;
-  float phase_acc[6];
+  float phase_acc[4];
   AdsrEnvelope adsr;
 } Voice;