Virtual port switch

fred-dev · Sep 28, 2023 · b8b73cb · b8b73cb
1 parent 47c0c21
commit b8b73cb
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 26 deletions.
diff --git a/...j/project.xcworkspace/xcuserdata/fredrodrigues.xcuserdatad/UserInterfaceState.xcuserstate b/...j/project.xcworkspace/xcuserdata/fredrodrigues.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/bin/data/MIDI_OSC_SETTINGS.json b/bin/data/MIDI_OSC_SETTINGS.json
@@ -9,8 +9,7 @@
         "Euphonix MIDI Euphonix Port 1",
         "Euphonix MIDI Euphonix Port 2",
         "Euphonix MIDI Euphonix Port 3",
-        "Euphonix MIDI Euphonix Port 4",
-        "OSC_MIDI_OSC_OUT"
+        "Euphonix MIDI Euphonix Port 4"
     ],
     "midiOutChannel": 1,
     "midiOutDevice": 9,
@@ -19,9 +18,9 @@
         "Euphonix MIDI Euphonix Port 1",
         "Euphonix MIDI Euphonix Port 2",
         "Euphonix MIDI Euphonix Port 3",
-        "Euphonix MIDI Euphonix Port 4",
-        "OSC_MIDI_OSC_IN"
+        "Euphonix MIDI Euphonix Port 4"
     ],
     "outGoingPortOsc": 1234,
-    "outgoingIpOSC": "127.0.0.1"
+    "outgoingIpOSC": "127.0.0.1",
+    "useVirtualPort": false
 }
diff --git a/src/ofApp.cpp b/src/ofApp.cpp
@@ -19,6 +19,16 @@ void ofApp::setup(){
         ofSetLogLevel(OF_LOG_VERBOSE);
         ofLogVerbose() << "Log level set to OF_LOG_VERBOSE" << endl;
     }
+#ifdef TARGET_OSX
+    if (!jsonSettings["useVirtualPort"].is_null()) {
+        useVirtualPort = jsonSettings["useVirtualPort"];
+        ofLogVerbose()<<"useVirtualPort set to "<<useVirtualPort<<endl;
+    } else {
+        useVirtualPort = true;
+    }
+#else
+    useVirtualPort = false;
+#endif
     //set the incomingPortOsc from the jsonSettings
     if (!jsonSettings["incomingPortOsc"].is_null()) {
         incomingPortOsc = jsonSettings["incomingPortOsc"];
@@ -100,29 +110,30 @@ void ofApp::setup(){
 
     //if we are on OSX we need to set the midi port to virtual
 #ifdef TARGET_OSX
-    midiOut.openVirtualPort("OSC_MIDI_OSC_OUT");
-    midiIn.openVirtualPort("OSC_MIDI_OSC_IN");
-    ofLogVerbose() << "Midi In Device set to OSC_MIDI_OSC_IN"  << endl;
-    ofLogVerbose() << "Midi Out Device set to OSC_MIDI_OSC_OUT" << endl;
-
-
-    //if we are on windows we need to set the midi port to the selected port
-#else
-
-    if (midiOutDeviceByString) {
-        midiIn.openPort(midiInDeviceName);
-    } else {
-        midiIn.openPort(midiInDeviceNum);
+    if(useVirtualPort){
+        midiOut.openVirtualPort("OSC_MIDI_OSC_OUT");
+        midiIn.openVirtualPort("OSC_MIDI_OSC_IN");
+        ofLogVerbose() << "Midi In Device set to OSC_MIDI_OSC_IN - Virtual port"  << endl;
+        ofLogVerbose() << "Midi Out Device set to OSC_MIDI_OSC_OUT - Virtual port" << endl;
     }
-    ofLogVerbose() << "Midi In Device initialised and set to port: " << midiIn.getPort() << " With name: "<<  midiIn.getName() << endl;
-    if (midiOutDeviceByString) {
-        midiOut.openPort(midiOutDeviceName);
-    } else {
-        midiOut.openPort(midiOutDeviceNum);
+    //if we are on windows we need to set the midi port to the selected port
+#endif
+    if(!useVirtualPort){
+        if (midiOutDeviceByString) {
+            midiIn.openPort(midiInDeviceName);
+        } else {
+            midiIn.openPort(midiInDeviceNum);
+        }
+        ofLogVerbose() << "Midi In Device initialised and set to port: " << midiIn.getPort() << " With name: "<<  midiIn.getName() << endl;
+        if (midiOutDeviceByString) {
+            midiOut.openPort(midiOutDeviceName);
+        } else {
+            midiOut.openPort(midiOutDeviceNum);
+        }
+        ofLogVerbose() << "Midi Out Device initialised and set to port: " << midiOut.getPort() << " With name: " << midiOut.getName() << endl;
     }
-    ofLogVerbose() << "Midi Out Device initialised and set to port: " << midiOut.getPort() << " With name: " << midiOut.getName() << endl;
 
-#endif
+    
 
     midiIn.listInPorts();
     midiOut.listOutPorts();

diff --git a/src/ofApp.h b/src/ofApp.h
@@ -44,7 +44,7 @@ class ofApp : public ofBaseApp, public ofxMidiListener {
     int frameRate;
     int incomingPortOsc, outGoingPortOsc, midiInChannel, midiOutChannel, midiInDeviceNum, midiOutDeviceNum;
     string outgoingIpOSC, midiInDeviceName, midiOutDeviceName;
-	bool midiInDeviceByString, midiOutDeviceByString;
+	bool midiInDeviceByString, midiOutDeviceByString, useVirtualPort;
 
 
 };