Eliminate redundant ingen ontology parts, and save ingen Patchage in an LV2 compatible format.

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

6 files changed, 19 insertions, 19 deletions

diff --git a/src/engine/LADSPANode.cpp b/src/engine/LADSPANode.cpp
index 6af45985..cea1ef78 100644
--- a/src/engine/LADSPANode.cpp
+++ b/src/engine/LADSPANode.cpp
@@ -236,11 +236,11 @@ LADSPANode::instantiate()
 
 		if (port->is_input() && port->buffer_size() == 1) {
 			if (min)
-				port->set_variable("ingen:minimum", min.get());
+				port->set_variable("lv2:minimum", min.get());
 			if (max)
-				port->set_variable("ingen:maximum", max.get());
+				port->set_variable("lv2:maximum", max.get());
 			if (default_val)
-				port->set_variable("ingen:default", default_val.get());
+				port->set_variable("lv2:default", default_val.get());
 		}
 	}
 
diff --git a/src/engine/MidiControlNode.cpp b/src/engine/MidiControlNode.cpp
index 0aeac448..c7cd64ed 100644
--- a/src/engine/MidiControlNode.cpp
+++ b/src/engine/MidiControlNode.cpp
@@ -46,13 +46,13 @@ MidiControlNode::MidiControlNode(const string& path,
 	_ports->at(0) = _midi_in_port;
 	
 	_param_port = new InputPort(this, "controller", 1, 1, DataType::CONTROL, 0.0f, 1);
-	_param_port->set_variable("ingen:minimum", 0.0f);
-	_param_port->set_variable("ingen:maximum", 127.0f);
-	_param_port->set_variable("ingen:integer", true);
+	_param_port->set_variable("lv2:minimum", 0.0f);
+	_param_port->set_variable("lv2:maximum", 127.0f);
+	_param_port->set_variable("lv2:integer", true);
 	_ports->at(1) = _param_port;
 
 	_log_port = new InputPort(this, "logarithmic", 2, 1, DataType::CONTROL, 0.0f, 1);
-	_log_port->set_variable("ingen:toggled", true);
+	_log_port->set_variable("lv2:toggled", true);
 	_ports->at(2) = _log_port;
 	
 	_min_port = new InputPort(this, "minimum", 3, 1, DataType::CONTROL, 0.0f, 1);
diff --git a/src/engine/MidiNoteNode.cpp b/src/engine/MidiNoteNode.cpp
index ae7a7f0e..c6b116bb 100644
--- a/src/engine/MidiNoteNode.cpp
+++ b/src/engine/MidiNoteNode.cpp
@@ -52,16 +52,16 @@ MidiNoteNode::MidiNoteNode(const string& path, bool polyphonic, PatchImpl* paren
 	_ports->at(1) = _freq_port;
 	
 	_vel_port = new OutputPort(this, "velocity", 2, _polyphony, DataType::AUDIO, 0.0f, _buffer_size);
-	_vel_port->set_variable("ingen:minimum", 0.0f);
-	_vel_port->set_variable("ingen:maximum", 1.0f);
+	_vel_port->set_variable("lv2:minimum", 0.0f);
+	_vel_port->set_variable("lv2:maximum", 1.0f);
 	_ports->at(2) = _vel_port;
 	
 	_gate_port = new OutputPort(this, "gate", 3, _polyphony, DataType::AUDIO, 0.0f, _buffer_size);
-	_gate_port->set_variable("ingen:toggled", true);
+	_gate_port->set_variable("lv2:toggled", true);
 	_ports->at(3) = _gate_port;
 	
 	_trig_port = new OutputPort(this, "trigger", 4, _polyphony, DataType::AUDIO, 0.0f, _buffer_size);
-	_trig_port->set_variable("ingen:toggled", true);
+	_trig_port->set_variable("lv2:toggled", true);
 	_ports->at(4) = _trig_port;
 }
 
diff --git a/src/engine/MidiTriggerNode.cpp b/src/engine/MidiTriggerNode.cpp
index aa2c272f..8ab4991e 100644
--- a/src/engine/MidiTriggerNode.cpp
+++ b/src/engine/MidiTriggerNode.cpp
@@ -41,9 +41,9 @@ MidiTriggerNode::MidiTriggerNode(const string& path, bool polyphonic, PatchImpl*
 	_ports->at(0) = _midi_in_port;
 	
 	_note_port = new InputPort(this, "note", 1, 1, DataType::CONTROL, 60.0f, 1);
-	_note_port->set_variable("ingen:minimum", 0.0f);
-	_note_port->set_variable("ingen:maximum", 127.0f);
-	_note_port->set_variable("ingen:integer", true);
+	_note_port->set_variable("lv2:minimum", 0.0f);
+	_note_port->set_variable("lv2:maximum", 127.0f);
+	_note_port->set_variable("lv2:integer", true);
 	_ports->at(1) = _note_port;
 	
 	_gate_port = new OutputPort(this, "gate", 2, 1, DataType::AUDIO, 0.0f, _buffer_size);
diff --git a/src/engine/OSCEngineReceiver.cpp b/src/engine/OSCEngineReceiver.cpp
index e4e2fec1..87f4abd2 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 (ingen:AudioPort, ingen:ControlPort, ingen:MIDIPort, or ingen:OSCPort)
+ * \arg \b data-type (string) - Type of port (lv2:AudioPort, lv2:ControlPort, lv2ev:EventPort, ingen:MIDIPort, or ingen:OSCPort)
  * \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 e767f522..30b019e9 100644
--- a/src/engine/events/CreatePortEvent.cpp
+++ b/src/engine/events/CreatePortEvent.cpp
@@ -110,10 +110,10 @@ CreatePortEvent::pre_process()
 			_engine.engine_store()->add(_patch_port);
 
 			if (!_patch->parent()) {
-				if (_type == "ingen:AudioPort")
+				if (_type == "lv2:AudioPort")
 					_driver_port = _engine.audio_driver()->create_port(
 							dynamic_cast<DuplexPort*>(_patch_port));
-				else if (_type == "ingen:MIDIPort" || _type == "ingen:EventPort")
+				else if (_type == "ingen:MIDIPort" || _type == "lv2ev:EventPort")
 					_driver_port = _engine.midi_driver()->create_port(
 							dynamic_cast<DuplexPort*>(_patch_port));
 				else if (_type == "ingen:OSCPort" && _engine.osc_driver())
@@ -143,9 +143,9 @@ CreatePortEvent::execute(ProcessContext& context)
 	}
 
 	if (_driver_port) {
-		if (_type == "ingen:AudioPort")
+		if (_type == "lv2:AudioPort")
 			_engine.audio_driver()->add_port(_driver_port);
-		else if (_type == "ingen:MIDIPort" || _type == "ingen:EventPort")
+		else if (_type == "ingen:MIDIPort" || _type == "lv2ev:EventPort")
 			_engine.midi_driver()->add_port(_driver_port);
 		else if (_type == "ingen:OSCPort")
 			cerr << "OSC DRIVER PORT" << endl;