Remove meaningless/non-LV2/kludgey 'event' 'midi' and 'osc' distinction.

Expose event ports to jack midi, again.


git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@1665 a436a847-0d15-0410-975c-d299462d15a1

4 files changed, 10 insertions, 13 deletions

diff --git a/src/engine/JackAudioDriver.cpp b/src/engine/JackAudioDriver.cpp
index f0c402d9..6ffca0da 100644
--- a/src/engine/JackAudioDriver.cpp
+++ b/src/engine/JackAudioDriver.cpp
@@ -176,7 +176,7 @@ JackAudioDriver::activate()
 #endif*/
 	}
 
-	if (!_engine.midi_driver())
+	if (!_engine.midi_driver() || dynamic_cast<DummyMidiDriver*>(_engine.midi_driver()))
 		_engine.set_midi_driver(new JackMidiDriver(_client));
 }
 
diff --git a/src/engine/OSCClientSender.cpp b/src/engine/OSCClientSender.cpp
index dca2e0ed..c71f7e6b 100644
--- a/src/engine/OSCClientSender.cpp
+++ b/src/engine/OSCClientSender.cpp
@@ -143,7 +143,7 @@ void OSCClientSender::new_node(const std::string& node_path,
  * <p> \b /ingen/new_port - Notification of a new port's creation.
  * \arg \b path (string) - Path of new port
  * \arg \b index (integer) - Index (or sort key) of port on parent
- * \arg \b data-type (string) - Type of port (ingen:AudioPort, ingen:ControlPort, ingen:MIDIPort, or ingen:OSCPort)
+ * \arg \b data-type (string) - Type of port (ingen:AudioPort, ingen:ControlPort, ingen:EventPort)
  * \arg \b direction ("is-output") (integer) - Direction of data flow (Input = 0, Output = 1)
  *
  * \li Note that in the event of loading a patch, this message could be
diff --git a/src/engine/OSCEngineReceiver.cpp b/src/engine/OSCEngineReceiver.cpp
index d9c8f7c2..c2df9601 100644
--- a/src/engine/OSCEngineReceiver.cpp
+++ b/src/engine/OSCEngineReceiver.cpp
@@ -456,7 +456,7 @@ OSCEngineReceiver::_set_polyphonic_cb(const char* path, const char* types, lo_ar
  * <p> \b /ingen/new_port - Add a port into a given patch (load a plugin by URI)
  * \arg \b response-id (integer)
  * \arg \b path (string) - Full path of the new port (ie. /patch2/subpatch/newport)
- * \arg \b data-type (string) - Type of port (lv2:AudioPort, lv2:ControlPort, lv2ev:EventPort, ingen:MIDIPort, or ingen:OSCPort)
+ * \arg \b data-type (string) - Type of port (lv2:AudioPort, lv2:ControlPort, lv2ev:EventPort)
  * \arg \b direction ("is-output") (integer) - Direction of data flow (Input = 0, Output = 1) </p> \n \n
  */
 int
diff --git a/src/engine/events/CreatePortEvent.cpp b/src/engine/events/CreatePortEvent.cpp
index 6f3f80e5..b70615d7 100644
--- a/src/engine/events/CreatePortEvent.cpp
+++ b/src/engine/events/CreatePortEvent.cpp
@@ -106,15 +106,13 @@ CreatePortEvent::pre_process()
 			_engine.engine_store()->add(_patch_port);
 
 			if (!_patch->parent()) {
-				if (_type == "lv2:AudioPort")
+				if (_type == "lv2:AudioPort") {
 					_driver_port = _engine.audio_driver()->create_port(
 							dynamic_cast<DuplexPort*>(_patch_port));
-				else if (_type == "ingen:MIDIPort" || _type == "lv2ev:EventPort")
+				} else if (_type == "lv2ev:EventPort") {
 					_driver_port = _engine.midi_driver()->create_port(
 							dynamic_cast<DuplexPort*>(_patch_port));
-				else if (_type == "ingen:OSCPort" && _engine.osc_driver())
-					_driver_port = _engine.osc_driver()->create_port(
-							dynamic_cast<DuplexPort*>(_patch_port));
+				}
 			}
 
 			assert(_ports_array->size() == _patch->num_ports());
@@ -134,14 +132,13 @@ CreatePortEvent::execute(ProcessContext& context)
 		_engine.maid()->push(_patch->external_ports());
 		_patch->external_ports(_ports_array);
 	}
-
+			
 	if (_driver_port) {
-		if (_type == "lv2:AudioPort")
+		if (_type == "lv2:AudioPort") {
 			_engine.audio_driver()->add_port(_driver_port);
-		else if (_type == "ingen:MIDIPort" || _type == "lv2ev:EventPort")
+		} else if (_type == "lv2ev:EventPort") {
 			_engine.midi_driver()->add_port(_driver_port);
-		else if (_type == "ingen:OSCPort")
-			cerr << "OSC DRIVER PORT" << endl;
+		}
 	}
 	
 	if (_source)