misc

Author: koppi

src/arpeggiator.h

@@ -4,12 +4,40 @@
 struct Synth; // Forward declaration
 
 typedef enum {
+  ARP_OFF,
+  ARP_CHORD,
   ARP_UP,
   ARP_DOWN,
-  ARP_ORDER,
+  ARP_UP_DOWN,
+  ARP_PENDULUM,
+  ARP_CONVERGE,
+  ARP_DIVERGE,
+  ARP_LEAPFROG,
+  ARP_THUMB_UP,
+  ARP_THUMB_DOWN,
+  ARP_PINKY_UP,
+  ARP_PINKY_DOWN,
+  ARP_REPEAT,
   ARP_RANDOM,
+  ARP_RANDOM_WALK,
+  ARP_SHUFFLE,
+  ARP_ORDER, // Legacy mode for backward compatibility
 } ArpMode;
 
+typedef enum {
+  RATE_QUARTER = 0,  // 1/4 notes
+  RATE_EIGHTH = 1,   // 1/8 notes (default)
+  RATE_SIXTEENTH = 2, // 1/16 notes
+  RATE_THIRTYSECOND = 3, // 1/32 notes
+} ArpRate;
+
+typedef enum {
+  CHORD_MAJOR = 0,
+  CHORD_MINOR = 1,
+  CHORD_SUS = 2,
+  CHORD_DIM = 3,
+} ChordType;
+
 #define ARP_PATTERN_LEN 16
 
 // Structure to track active arpeggiated notes
@@ -25,6 +53,7 @@ typedef struct {
   int pattern[ARP_PATTERN_LEN];
   int step;
   float tempo;
+  ArpRate rate;
   float step_phase;
   int held_count;
   int held_notes[16];
@@ -33,12 +62,24 @@ typedef struct {
   int hold; // Hold flag to sustain notes after key release
   int octave; // Octave control for keyboard input (0-4 = octaves 1-5)
   int octaves; // Number of octaves to spread chords across (1-6)
+  
+  // Chord generation parameters
+  ChordType chord_type;
+  int add_6; // Add 6th extension
+  int add_m7; // Add minor 7th extension  
+  int add_M7; // Add major 7th extension
+  int add_9; // Add 9th extension
+  int voicing; // Voicing/inversion level (0-16)
+  
   ActiveArpeggiatedNote active_arpeggiated_notes[16]; // Max 16 notes in a polyphonic step
 } Arpeggiator;
 
 void arpeggiator_init(Arpeggiator *arp);
 void arpeggiator_set_param(Arpeggiator *arp, const char *param, float value, struct Synth *synth);
 const char *arpeggiator_mode_str(const Arpeggiator *arp);
+const char *arpeggiator_rate_str(const Arpeggiator *arp);
+const char *arpeggiator_chord_str(const Arpeggiator *arp);
+int arpeggiator_generate_chord(const Arpeggiator *arp, int root_note, int *chord_notes, int max_notes);
 void arpeggiator_note_on(Arpeggiator *arp, int note);
 void arpeggiator_note_off(Arpeggiator *arp, int note);
 void arpeggiator_clear_notes(Arpeggiator *arp);

src/gui.cpp

@@ -562,17 +562,45 @@ void gui_draw(Synth *synth, SDL_Window *window, SDL_GLContext gl_context) {
     // Arpeggiator
     if (ImGui::CollapsingHeader("Arpeggiator", ImGuiTreeNodeFlags_DefaultOpen)) {
         ImGui::Checkbox("Enabled##arp", (bool*)&synth->arp.enabled);
-        const char* arp_modes[] = { "UP", "DOWN", "ORDER", "RANDOM" };
+        const char* arp_modes[] = { 
+            "OFF", "CHORD", "UP", "DOWN", "UP/DOWN", "PENDULUM", 
+            "CONVERGE", "DIVERGE", "LEAPFROG", "THUMB-UP", "THUMB-DOWN", 
+            "PINKY-UP", "PINKY-DOWN", "REPEAT", "RANDOM", "RANDOM WALK", "SHUFFLE", "ORDER" 
+        };
         int current_arp_mode = (int)synth->arp.mode;
-        if (ImGui::Combo("Mode", &current_arp_mode, "UP\0DOWN\0ORDER\0RANDOM\0\0", 4)) {
+        if (ImGui::Combo("Mode", &current_arp_mode, arp_modes, 18)) {
             synth->arp.mode = (ArpMode)current_arp_mode;
         }
         ImGui::SliderFloat("Tempo", &synth->arp.tempo, 30.0f, 240.0f, "%.2f", 0);
+        const char* arp_rates[] = { "1/4", "1/8", "1/16", "1/32" };
+        int current_arp_rate = (int)synth->arp.rate;
+        if (ImGui::Combo("Rate", &current_arp_rate, arp_rates, 4)) {
+            synth->arp.rate = (ArpRate)current_arp_rate;
+        }
         ImGui::SliderInt("Octave", &synth->arp.octave, 0, 4, "%d");
         ImGui::SliderInt("Octaves", &synth->arp.octaves, 1, 6, "%d");
         ImGui::Checkbox("Polyphonic", (bool*)&synth->arp.polyphonic);
         ImGui::Checkbox("Hold", (bool*)&synth->arp.hold);
 
+        ImGui::Separator();
+        ImGui::Text("Chord Generation:");
+        
+        // Chord Type
+        const char* chord_types[] = {"MAJOR", "MINOR", "SUS", "DIM"};
+        int current_chord_type = (int)synth->arp.chord_type;
+        if (ImGui::Combo("Chord Type", &current_chord_type, chord_types, 4)) {
+            synth->arp.chord_type = (ChordType)current_chord_type;
+        }
+        
+        // Chord Extensions
+        ImGui::Checkbox("Add 6th", (bool*)&synth->arp.add_6);
+        ImGui::Checkbox("Add m7", (bool*)&synth->arp.add_m7);
+        ImGui::Checkbox("Add Maj7", (bool*)&synth->arp.add_M7);
+        ImGui::Checkbox("Add 9th", (bool*)&synth->arp.add_9);
+        
+        // Voicing
+        ImGui::SliderInt("Voicing", &synth->arp.voicing, 0, 16, "%d");
+        
         ImGui::Separator();
         ImGui::Text("Presets:");
         ImGui::Columns(4, "arp_presets", true);
@@ -618,6 +646,7 @@ void gui_draw(Synth *synth, SDL_Window *window, SDL_GLContext gl_context) {
         if (ImGui::Button("Trance Gate")) {
             synth->arp.mode = ARP_UP;
             synth->arp.tempo = 140.0f;
+            synth->arp.rate = RATE_SIXTEENTH;
             synth->arp.octaves = 4;
             synth->arp.polyphonic = 1;
             synth->arp.hold = 1;
@@ -642,14 +671,14 @@ void gui_draw(Synth *synth, SDL_Window *window, SDL_GLContext gl_context) {
         }
         ImGui::SameLine(); ImGui::Text("Progressive");
 
-        if (ImGui::Button("Ambient Pad")) {
-            synth->arp.mode = ARP_UP;
+        if (ImGui::Button("Sustained Chord")) {
+            synth->arp.mode = ARP_CHORD;
             synth->arp.tempo = 60.0f;
-            synth->arp.octaves = 3;
+            synth->arp.octaves = 1;
             synth->arp.polyphonic = 1;
             synth->arp.hold = 1;
         }
-        ImGui::SameLine(); ImGui::Text("Slow & wide");
+        ImGui::SameLine(); ImGui::Text("Chordal");
 
         ImGui::NextColumn();
 
@@ -674,6 +703,7 @@ void gui_draw(Synth *synth, SDL_Window *window, SDL_GLContext gl_context) {
         if (ImGui::Button("DnB Roll")) {
             synth->arp.mode = ARP_RANDOM;
             synth->arp.tempo = 174.0f;
+            synth->arp.rate = RATE_THIRTYSECOND;
             synth->arp.octaves = 2;
             synth->arp.polyphonic = 1;
             synth->arp.hold = 0;
@@ -718,14 +748,14 @@ void gui_draw(Synth *synth, SDL_Window *window, SDL_GLContext gl_context) {
         }
         ImGui::SameLine(); ImGui::Text("Harsh");
 
-        if (ImGui::Button("Jazz Walker")) {
-            synth->arp.mode = ARP_ORDER;
-            synth->arp.tempo = 140.0f;
+        if (ImGui::Button("Pendulum")) {
+            synth->arp.mode = ARP_PENDULUM;
+            synth->arp.tempo = 120.0f;
             synth->arp.octaves = 2;
-            synth->arp.polyphonic = 1;
+            synth->arp.polyphonic = 0;
             synth->arp.hold = 0;
         }
-        ImGui::SameLine(); ImGui::Text("Walking");
+        ImGui::SameLine(); ImGui::Text("Bouncing");
 
         ImGui::Columns(1, "", false);
     }