add handleGenericControlers

fundamental · May 7, 2022 · 0df324f · 0df324f
1 parent 42e91c8
commit 0df324f
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 11 deletions.
diff --git a/include/rtosc/automations.h b/include/rtosc/automations.h
@@ -2,12 +2,15 @@
 #include <rtosc/rtosc.h>
 #include <cassert>
 namespace rtosc {
-    
+
 #define C_dataentryhi 0x06
 #define C_dataentrylo 0x26
 #define C_nrpnhi 99
 #define C_nrpnlo 98
-
+
+#define CONTROLER_TYPE_LFO 1
+#define CONTROLER_TYPE_ENV 2
+
 struct AutomationMapping
 {
     //0 - linear
@@ -62,10 +65,13 @@ struct AutomationSlot
 
     //-1 or a valid MIDI CC + MIDI Channel
     int   midi_cc;
-    
+
     //-1 or a valid NRPN ID Channel
     int   midi_nrpn;
 
+    //-1 or a valid generic controller type
+    int   internal;
+
     //Current state supplied by MIDI value or host
     float current_state;
 
@@ -74,7 +80,7 @@ struct AutomationSlot
 
     //Collection of automations
     Automation *automations;
-    
+
 };
 
 class AutomationMgr
@@ -105,7 +111,7 @@ class AutomationMgr
         void clearSlot(int slot_id);
         void clearSlotSub(int slot_id, int sub);
 
-		void setSlotSubPath(int slot_id, int sub, const char *msg);
+        void setSlotSubPath(int slot_id, int sub, const char *msg);
         void setSlotSubGain(int slot_id, int sub, float f);
         float getSlotSubGain(int slot_id, int sub);
         void setSlotSubOffset(int slot_id, int sub, float f);
@@ -117,7 +123,8 @@ class AutomationMgr
         const char * getName(int slot_id);
 
         bool handleMidi(int channel, int cc, int val);
-
+        void handleGenericControlers(int type, float val);
+
         void setparameternumber(unsigned int type, int value); //used for RPN and NRPN's
         int getnrpn(int *parhi, int *parlo, int *valhi, int *vallo);
 
@@ -142,7 +149,7 @@ class AutomationMgr
 
         int damaged;
     private:
-    
+
         /** RPN and NPRPN */
         struct { //nrpn
             int parhi, parlo;

diff --git a/src/cpp/automations.cpp b/src/cpp/automations.cpp
@@ -336,14 +336,23 @@ const char *AutomationMgr::getName(int slot_id)
         return "";
     return slots[slot_id].name;
 }
+void AutomationMgr::handleGenericControlers(int type, float val)
+{
+    for(int i=0; i<nslots; ++i) {
+        if (slots[i].internal == type) {
+            if (val==getSlot(i)) return;
+            setSlot(i, val);
+        }
+    }
+}
 bool AutomationMgr::handleMidi(int channel, int type, int val)
 {
     bool is_nrpn = false;
     int par_id = 0;
     int value;
     if((type == C_dataentryhi) || (type == C_dataentrylo)
        || (type == C_nrpnhi) || (type == C_nrpnlo)) { //Process RPN and NRPN by the Master (ignore the chan)
-        
+
         setparameternumber(type, val);
 
         int parhi = -1, parlo = -1, valhi = -1, vallo = -1;
@@ -362,10 +371,10 @@ bool AutomationMgr::handleMidi(int channel, int type, int val)
         if(bound_nrpn)
             return 1;
         }
-        
+
     }
     else {
-        
+
         par_id = channel*128 + type;
 
         bool bound_cc = false;
@@ -378,7 +387,7 @@ bool AutomationMgr::handleMidi(int channel, int type, int val)
 
         if(bound_cc)
             return 1;
-        
+
     }
 
     //No bound CC, now to see if there's something to learn