Merge pull request #15 from gonski/feature/sendOutputs2Wek

added sendOutputOscToWekinator()

Author: pelinski

handlerOSC/getMidi.pde

@@ -30,8 +30,9 @@ void controllerChange(int channel, int number, int value) {
   for (int i=0; i<knobCCs.length; i++) {
     if (knobCCs[i] == number) {
       knobVal[i]=map(value, 0, 127, 0, 1);
-      println("Knob " + i + " " + knobVal[i]);
+      //println("Knob " + i + " " + knobVal[i]);
     }
   }
   sendOscMidi2Reaper();
+  sendOutputOscToWekinator();
 }

handlerOSC/menu.pde

@@ -1,5 +1,5 @@
 void drawMidiMenu() {
-// from https://github.com/msfeldstein/MidiToOSCBridge/blob/master/MidiOSC.pde
+  // from https://github.com/msfeldstein/MidiToOSCBridge/blob/master/MidiOSC.pde
 
   int menuWidth = 100;
 
@@ -115,11 +115,14 @@ void drawTrainingBtns() {
 void controlEvent(ControlEvent theEvent) {
   // If the event is called FX*, then send OSC to Reaper
   // Could be done also for knobs if we create Knob controllers for them
-  try{
-    if (theEvent.getName().startsWith("FX")){
+  try {
+    if (theEvent.getName().startsWith("FX")) {
       //maybe add: if(TrainingToggle==true)
       sendOscMidi2Reaper();
+      sendOutputOscToWekinator();
     }
-  // throws some exceptions at the beginning but then works fine, the catch block is to avoid these exceptions
-  } catch(NullPointerException e){} 
+    // throws some exceptions at the beginning but then works fine, the catch block is to avoid these exceptions
+  }
+  catch(NullPointerException e) {
+  }
 }

handlerOSC/sendOSC.pde

@@ -56,6 +56,20 @@ void sendTrainingOscToWekinator() {
   }
 }
 
+void sendOutputOscToWekinator() {
+  OscMessage msg = new OscMessage("/wekinator/control/outputs");
+  
+   for (int i=0; i<FXBtns.length; i++) {
+    msg.add((float)FXBtns[i].getValue());
+  }
+  
+  for (int i=0; i<knobCCs.length; i++) {
+    msg.add((float)knobVal[i]);
+  }
+  println(msg);
+  osc.send(msg, wekAddr); // total 5 FX  + 20 dist + 2 xy origin = 27
+}
+
 
 
 void sendOscWek2Reaper(OscMessage msgWek) {