misc

Author: koppi

src/midi.c

@@ -26,7 +26,8 @@ const CCMapping cc_map[] = {
     {11, "osc1.pulse_width", 0.0f, 1.0f},    // CC 11: Expression → OSC 1 Pulse Width
     {12, "osc2.pitch", -24.0f, 24.0f},       // CC 12: Effect Control 1 → OSC 2 Pitch Bend
     {13, "osc2.detune", -1.0f, 1.0f},        // CC 13: Effect Control 2 → OSC 2 Detune
-    {14, "osc3.gain", 0.0f, 1.0f},           // CC 14: (Undefined/Unused) → OSC 3 Gain
+    {14, "osc2.gain", 0.0f, 1.0f},           // CC 14: (Undefined/Unused) → OSC 2 Gain
+    {15, "osc3.gain", 0.0f, 1.0f},           // CC 15: (Undefined/Unused) → OSC 3 Gain
     {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
@@ -46,9 +47,10 @@ const CCMapping cc_map[] = {
     {30, "fx.delay.mix", 0.0f, 1.0f},            // CC 30: (Undefined) → Delay Mix
 
     // STANDARD MIDI CONTROLLERS (CC 32-63)
+    {33, "osc4.gain", 0.0f, 1.0f},            // CC 33: (Undefined) → OSC 4 Gain
     {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
+    {35, "osc3.waveform", 0.0f, 4.0f},        // CC 35: LSB of Bank Select → OSC 3 Waveform
+    {36, "osc2.waveform", 0.0f, 4.0f},        // CC 36: LSB of Bank Select → OSC 2 Waveform
     {37, "osc2.waveform", 0.0f, 4.0f},        // CC 37: LSB of Bank Select → OSC 2 Waveform
     {38, "osc1.waveform", 0.0f, 4.0f},        // CC 38: LSB of Bank Select → OSC 1 Waveform
     {39, "mixer.comp.threshold", -24.0f, 0.0f},    // CC 39: LSB of Bank Select → Compressor Threshold

src/mixer.c

@@ -79,9 +79,9 @@ static void calculate_coefficients(BusCompressor *comp, float attack_ms, float r
 void mixer_init(Mixer *mixer) {
   // Set oscillator gains
   mixer->osc_gain[0] = 1.0f;  // OSC 1 - full volume
-  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[1] = 1.0f;  // OSC 2 - full volume
+  mixer->osc_gain[2] = 1.0f;  // OSC 3 - full volume
+  mixer->osc_gain[3] = 1.0f;  // OSC 4 - full volume
 
   mixer->master = 0.25f;  // Reduced from 1.0f to 0.25f
   mixer->master_pan = 0.0f; // Center pan by default

src/osc.c

@@ -40,23 +40,33 @@ void osc_set_param(Oscillator *osc, const char *param, float value) {
 
 float osc_process(Oscillator *osc, float note, float *phase_acc) {
   float output = 0.0f;
+  float unison_phase_acc = 0.0f; // Local phase accumulator for unison calculation
 
   // Process unison voices
   for (int voice = 0; voice < osc->unison_voices; ++voice) {
     // Calculate frequency with unison detuning
     float voice_detune = 0.0f;
     if (osc->unison_voices > 1 && osc->unison_detune > 0.0f) {
       // Spread voices symmetrically around center frequency
-      float spread = (float)(voice - (osc->unison_voices - 1) * 0.5f) / (osc->unison_voices - 1);
+      float spread = (float)(voice - (osc->unison_voices - 1) * 0.5f) / (float)(osc->unison_voices - 1);
       voice_detune = spread * osc->unison_detune;
     }
 
     float freq = 440.0f * powf(2.0f, (note + osc->pitch + osc->detune + voice_detune - 69.0f) / 12.0f);
-    *phase_acc += freq / osc->samplerate;
-    if (*phase_acc >= 1.0f)
-      *phase_acc -= 1.0f;
+    
+    // Update the main phase accumulator for the first voice, use local for others
+    if (voice == 0) {
+      *phase_acc += freq / osc->samplerate;
+      if (*phase_acc >= 1.0f)
+        *phase_acc -= 1.0f;
+      unison_phase_acc = *phase_acc;
+    } else {
+      unison_phase_acc += freq / osc->samplerate;
+      if (unison_phase_acc >= 1.0f)
+        unison_phase_acc -= 1.0f;
+    }
 
-    float p = *phase_acc + osc->phase;
+    float p = unison_phase_acc + osc->phase;
     if (p >= 1.0f)
       p -= 1.0f;
 

src/synth.c

@@ -275,7 +275,7 @@ void synth_audio_callback(void *userdata, Uint8 *stream, int len) {
     memset(vbuf, 0, sizeof(float) * frames * 2);
     voice_render(&synth->voices[v], synth->osc, synth->lfos, synth->mixer.osc_gain, vbuf, frames);
     for (int i = 0; i < frames * 2; ++i)
-      out[i] += vbuf[i] * synth->voices[v].velocity;
+      out[i] += vbuf[i];
   }
   free(vbuf);
 
@@ -324,8 +324,16 @@ 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 < 4)
-      osc_set_param(&synth->osc[i], param + 5, value);
+    if (i >= 0 && i < 4) {
+      // Handle gain parameter specially - route to mixer instead of oscillator
+      if (strncmp(param + 5, "gain", 4) == 0) {
+        // Set mixer gain for this oscillator
+        synth->mixer.osc_gain[i] = value;
+      } else {
+        // Set other oscillator parameters normally
+        osc_set_param(&synth->osc[i], param + 5, value);
+      }
+    }
   } else if (strncmp(param, "fx.", 3) == 0) {
     fx_set_param(&synth->fx, param + 3, value);
   } else if (strncmp(param, "mixer.", 6) == 0) {

src/voice.c

@@ -75,9 +75,9 @@ void voice_render(Voice *v, const Oscillator *osc, const LFO *lfo, const float *
     left *= v->velocity * adsr_value;
     right *= v->velocity * adsr_value;
 
-    // Average across oscillators and add to stereo buffer
-    stereo[n * 2 + 0] += left * (1.0f / 4.0f); // Left channel
-    stereo[n * 2 + 1] += right * (1.0f / 4.0f); // Right channel
+    // Add to stereo buffer (no averaging - oscillator gains handle mixing)
+    stereo[n * 2 + 0] += left; // Left channel
+    stereo[n * 2 + 1] += right; // Right channel
   }
 }