From 670bf40134c1aa7c1ff175ff8acd9dbed7b9ab41 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 9 Oct 2007 21:04:06 +0000 Subject: Fix port type URIs mismatching, fixes Jack ports not showing up. git-svn-id: http://svn.drobilla.net/lad/ingen@864 a436a847-0d15-0410-975c-d299462d15a1 --- src/libs/client/DeprecatedLoader.cpp | 4 ++-- src/libs/engine/OSCClientSender.cpp | 2 +- src/libs/engine/OSCEngineReceiver.cpp | 2 +- src/libs/engine/events/CreatePortEvent.cpp | 12 ++++++------ src/libs/gui/PatchCanvas.cpp | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src/libs') diff --git a/src/libs/client/DeprecatedLoader.cpp b/src/libs/client/DeprecatedLoader.cpp index eee9485a..5e724c1c 100644 --- a/src/libs/client/DeprecatedLoader.cpp +++ b/src/libs/client/DeprecatedLoader.cpp @@ -390,10 +390,10 @@ DeprecatedLoader::load_node(const Path& parent, xmlDocPtr doc, const xmlNodePtr _engine->create_port(path, "ingen:ControlPort", true); is_port = true; } else if (plugin_label == "midi_input") { - _engine->create_port(path, "ingen:MidiPort", false); + _engine->create_port(path, "ingen:MIDIPort", false); is_port = true; } else if (plugin_label == "midi_output" ) { - _engine->create_port(path, "ingen:MidiPort", true); + _engine->create_port(path, "ingen:MIDIPort", true); is_port = true; } } diff --git a/src/libs/engine/OSCClientSender.cpp b/src/libs/engine/OSCClientSender.cpp index fff564d6..53ff35e5 100644 --- a/src/libs/engine/OSCClientSender.cpp +++ b/src/libs/engine/OSCClientSender.cpp @@ -271,7 +271,7 @@ void OSCClientSender::new_node(const std::string& plugin_uri, /** \page client_osc_namespace *

\b /ingen/new_port - Notification of a new port's creation. * \arg \b path (string) - Path of new port - * \arg \b data-type (string) - Type of port (ingen:audio, ingen:control, ingen:midi, or ingen:osc) + * \arg \b data-type (string) - Type of port (ingen:AudioPort, ingen:ControlPort, ingen:MIDIPort, or ingen:OSCPort) * \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/libs/engine/OSCEngineReceiver.cpp b/src/libs/engine/OSCEngineReceiver.cpp index 7d05e0bb..66e74e70 100644 --- a/src/libs/engine/OSCEngineReceiver.cpp +++ b/src/libs/engine/OSCEngineReceiver.cpp @@ -476,7 +476,7 @@ OSCEngineReceiver::_set_polyphonic_cb(const char* path, const char* types, lo_ar *

\b /ingen/create_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) - Data type for port to contain ("ingen:audio", "ingen:control", "ingen:midi", or "ingen:osc") + * \arg \b data-type (string) - Type of port (ingen:AudioPort, ingen:ControlPort, ingen:MIDIPort, or ingen:OSCPort) * \arg \b direction ("is-output") (integer) - Direction of data flow (Input = 0, Output = 1)

\n \n */ int diff --git a/src/libs/engine/events/CreatePortEvent.cpp b/src/libs/engine/events/CreatePortEvent.cpp index 27dcf7bc..3cdda4d1 100644 --- a/src/libs/engine/events/CreatePortEvent.cpp +++ b/src/libs/engine/events/CreatePortEvent.cpp @@ -110,13 +110,13 @@ CreatePortEvent::pre_process() _engine.object_store()->add(_patch_port); if (!_patch->parent()) { - if (_type == "ingen:audio") + if (_type == "ingen:AudioPort") _driver_port = _engine.audio_driver()->create_port( dynamic_cast(_patch_port)); - else if (_type == "ingen:midi") + else if (_type == "ingen:MIDIPort") _driver_port = _engine.midi_driver()->create_port( dynamic_cast(_patch_port)); - else if (_type == "ingen:osc" && _engine.osc_driver()) + else if (_type == "ingen:OSCPort" && _engine.osc_driver()) _driver_port = _engine.osc_driver()->create_port( dynamic_cast(_patch_port)); } @@ -143,11 +143,11 @@ CreatePortEvent::execute(ProcessContext& context) } if (_driver_port) - if (_type == "ingen:audio") + if (_type == "ingen:AudioPort") _engine.audio_driver()->add_port(_driver_port); - else if (_type == "ingen:midi") + else if (_type == "ingen:MIDIPort") _engine.midi_driver()->add_port(_driver_port); - else if (_type == "ingen:osc") + else if (_type == "ingen:OSCPort") cerr << "OSC DRIVER PORT" << endl; if (_source) diff --git a/src/libs/gui/PatchCanvas.cpp b/src/libs/gui/PatchCanvas.cpp index 74000b79..918d99ed 100644 --- a/src/libs/gui/PatchCanvas.cpp +++ b/src/libs/gui/PatchCanvas.cpp @@ -87,10 +87,10 @@ PatchCanvas::PatchCanvas(SharedPtr patch, int width, int height) "control_output", "ingen:ControlPort", true)); _menu_add_midi_input->signal_activate().connect( sigc::bind(sigc::mem_fun(this, &PatchCanvas::menu_add_port), - "midi_input", "ingen:MidiPort", false)); + "midi_input", "ingen:MIDIPort", false)); _menu_add_midi_output->signal_activate().connect( sigc::bind(sigc::mem_fun(this, &PatchCanvas::menu_add_port), - "midi_output", "ingen:MidiPort", true)); + "midi_output", "ingen:MIDIPort", true)); _menu_add_osc_input->signal_activate().connect( sigc::bind(sigc::mem_fun(this, &PatchCanvas::menu_add_port), "osc_input", "ingen:OSCPort", false)); -- cgit v1.2.1