From d72ed9fd506756c83d97b62f6640135f3b8c32bb Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 16 Aug 2008 22:59:01 +0000 Subject: Closer... git-svn-id: http://svn.drobilla.net/lad/ingen@1407 a436a847-0d15-0410-975c-d299462d15a1 --- src/libs/client/DeprecatedLoader.cpp | 18 +++++++-------- src/libs/client/OSCClientReceiver.cpp | 6 ++--- src/libs/client/OSCClientReceiver.hpp | 2 +- src/libs/client/OSCEngineSender.cpp | 32 +++++++++++++------------- src/libs/client/OSCEngineSender.hpp | 22 +++++++++--------- src/libs/client/SigClientInterface.hpp | 2 +- src/libs/client/ThreadedSigClientInterface.hpp | 3 ++- 7 files changed, 43 insertions(+), 42 deletions(-) (limited to 'src/libs/client') diff --git a/src/libs/client/DeprecatedLoader.cpp b/src/libs/client/DeprecatedLoader.cpp index 6b44fcf8..8de8a9b6 100644 --- a/src/libs/client/DeprecatedLoader.cpp +++ b/src/libs/client/DeprecatedLoader.cpp @@ -461,22 +461,22 @@ DeprecatedLoader::load_node(const Path& parent, xmlDocPtr doc, const xmlNodePtr if (plugin_type == "Internal") { if (plugin_label == "audio_input") { - _engine->create_port(path, "ingen:AudioPort", false); + _engine->new_port(path, "ingen:AudioPort", false); is_port = true; } else if (plugin_label == "audio_output") { - _engine->create_port(path, "ingen:AudioPort", true); + _engine->new_port(path, "ingen:AudioPort", true); is_port = true; } else if (plugin_label == "control_input") { - _engine->create_port(path, "ingen:ControlPort", false); + _engine->new_port(path, "ingen:ControlPort", false); is_port = true; } else if (plugin_label == "control_output" ) { - _engine->create_port(path, "ingen:ControlPort", true); + _engine->new_port(path, "ingen:ControlPort", true); is_port = true; } else if (plugin_label == "midi_input") { - _engine->create_port(path, "ingen:MIDIPort", false); + _engine->new_port(path, "ingen:MIDIPort", false); is_port = true; } else if (plugin_label == "midi_output" ) { - _engine->create_port(path, "ingen:MIDIPort", true); + _engine->new_port(path, "ingen:MIDIPort", true); is_port = true; } else { cerr << "WARNING: Unknown internal plugin label \"" << plugin_label << "\"" << endl; @@ -519,9 +519,9 @@ DeprecatedLoader::load_node(const Path& parent, xmlDocPtr doc, const xmlNodePtr } if (plugin_uri != "") - _engine->create_node(path, plugin_uri, polyphonic); + _engine->new_node(path, plugin_uri, polyphonic); else - _engine->create_node(path, plugin_type, library_name, plugin_label, polyphonic); + _engine->new_node(path, plugin_type, library_name, plugin_label, polyphonic); for (GraphObject::Variables::const_iterator i = initial_data.begin(); i != initial_data.end(); ++i) _engine->set_variable(path, i->first, i->second); @@ -531,7 +531,7 @@ DeprecatedLoader::load_node(const Path& parent, xmlDocPtr doc, const xmlNodePtr // Not deprecated } else { - _engine->create_node(path, plugin_uri, polyphonic); + _engine->new_node(path, plugin_uri, polyphonic); for (GraphObject::Variables::const_iterator i = initial_data.begin(); i != initial_data.end(); ++i) _engine->set_variable(path, i->first, i->second); return true; diff --git a/src/libs/client/OSCClientReceiver.cpp b/src/libs/client/OSCClientReceiver.cpp index 00c5c28f..c9398685 100644 --- a/src/libs/client/OSCClientReceiver.cpp +++ b/src/libs/client/OSCClientReceiver.cpp @@ -158,7 +158,7 @@ OSCClientReceiver::setup_callbacks() lo_server_thread_add_method(_st, "/ingen/new_port", "sisi", new_port_cb, this); lo_server_thread_add_method(_st, "/ingen/polyphonic", "sT", polyphonic_cb, this); lo_server_thread_add_method(_st, "/ingen/polyphonic", "sF", polyphonic_cb, this); - lo_server_thread_add_method(_st, "/ingen/variable_change", NULL, variable_change_cb, this); + lo_server_thread_add_method(_st, "/ingen/set_variable", NULL, set_variable_cb, this); lo_server_thread_add_method(_st, "/ingen/control_change", "sf", control_change_cb, this); lo_server_thread_add_method(_st, "/ingen/port_activity", "s", port_activity_cb, this); lo_server_thread_add_method(_st, "/ingen/program_add", "siis", program_add_cb, this); @@ -305,7 +305,7 @@ OSCClientReceiver::_polyphonic_cb(const char* path, const char* types, lo_arg** /** Notification of a new or updated piece of variable. */ int -OSCClientReceiver::_variable_change_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg) +OSCClientReceiver::_set_variable_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg) { if (argc != 3 || types[0] != 's' || types[1] != 's') return 1; @@ -315,7 +315,7 @@ OSCClientReceiver::_variable_change_cb(const char* path, const char* types, lo_a Atom value = AtomLiblo::lo_arg_to_atom(types[2], argv[2]); - variable_change(obj_path, key, value); + set_variable(obj_path, key, value); return 0; } diff --git a/src/libs/client/OSCClientReceiver.hpp b/src/libs/client/OSCClientReceiver.hpp index 2dcc4906..76689ff2 100644 --- a/src/libs/client/OSCClientReceiver.hpp +++ b/src/libs/client/OSCClientReceiver.hpp @@ -96,7 +96,7 @@ private: LO_HANDLER(new_node); LO_HANDLER(new_port); LO_HANDLER(polyphonic); - LO_HANDLER(variable_change); + LO_HANDLER(set_variable); LO_HANDLER(control_change); LO_HANDLER(port_activity); LO_HANDLER(program_add); diff --git a/src/libs/client/OSCEngineSender.cpp b/src/libs/client/OSCEngineSender.cpp index 44149865..4d8007db 100644 --- a/src/libs/client/OSCEngineSender.cpp +++ b/src/libs/client/OSCEngineSender.cpp @@ -195,12 +195,12 @@ OSCEngineSender::new_patch(const string& path, void -OSCEngineSender::create_port(const string& path, - const string& data_type, - bool is_output) +OSCEngineSender::new_port(const string& path, + const string& data_type, + bool is_output) { assert(_engine_addr); - lo_send(_engine_addr, "/ingen/create_port", "issi", + lo_send(_engine_addr, "/ingen/new_port", "issi", next_id(), path.c_str(), data_type.c_str(), @@ -209,19 +209,19 @@ OSCEngineSender::create_port(const string& path, void -OSCEngineSender::create_node(const string& path, - const string& plugin_uri, - bool polyphonic) +OSCEngineSender::new_node(const string& path, + const string& plugin_uri, + bool polyphonic) { assert(_engine_addr); if (polyphonic) - lo_send(_engine_addr, "/ingen/create_node", "issT", + lo_send(_engine_addr, "/ingen/new_node", "issT", next_id(), path.c_str(), plugin_uri.c_str()); else - lo_send(_engine_addr, "/ingen/create_node", "issF", + lo_send(_engine_addr, "/ingen/new_node", "issF", next_id(), path.c_str(), plugin_uri.c_str()); @@ -233,22 +233,22 @@ OSCEngineSender::create_node(const string& path, * DO NOT USE THIS. */ void -OSCEngineSender::create_node(const string& path, - const string& plugin_type, - const string& library_name, - const string& plugin_label, - bool polyphonic) +OSCEngineSender::new_node(const string& path, + const string& plugin_type, + const string& library_name, + const string& plugin_label, + bool polyphonic) { assert(_engine_addr); if (polyphonic) - lo_send(_engine_addr, "/ingen/create_node", "issssT", + lo_send(_engine_addr, "/ingen/new_node", "issssT", next_id(), path.c_str(), plugin_type.c_str(), library_name.c_str(), plugin_label.c_str()); else - lo_send(_engine_addr, "/ingen/create_node", "issssF", + lo_send(_engine_addr, "/ingen/new_node", "issssF", next_id(), path.c_str(), plugin_type.c_str(), diff --git a/src/libs/client/OSCEngineSender.hpp b/src/libs/client/OSCEngineSender.hpp index bb935d7a..610841f6 100644 --- a/src/libs/client/OSCEngineSender.hpp +++ b/src/libs/client/OSCEngineSender.hpp @@ -76,19 +76,19 @@ public: void new_patch(const string& path, uint32_t poly); - void create_port(const string& path, - const string& data_type, - bool is_output); + void new_port(const string& path, + const string& data_type, + bool is_output); - void create_node(const string& path, - const string& plugin_uri, - bool polyphonic); + void new_node(const string& path, + const string& plugin_uri, + bool polyphonic); - void create_node(const string& path, - const string& plugin_type, - const string& library_name, - const string& plugin_label, - bool polyphonic); + void new_node(const string& path, + const string& plugin_type, + const string& library_name, + const string& plugin_label, + bool polyphonic); void rename(const string& old_path, const string& new_name); diff --git a/src/libs/client/SigClientInterface.hpp b/src/libs/client/SigClientInterface.hpp index 1fed9e65..fd2c0bee 100644 --- a/src/libs/client/SigClientInterface.hpp +++ b/src/libs/client/SigClientInterface.hpp @@ -140,7 +140,7 @@ protected: void disconnect(const string& src_port_path, const string& dst_port_path) { if (_enabled) signal_disconnection.emit(src_port_path, dst_port_path); } - void variable_change(const string& path, const string& key, const Raul::Atom& value) + void set_variable(const string& path, const string& key, const Raul::Atom& value) { if (_enabled) signal_variable_change.emit(path, key, value); } void control_change(const string& port_path, float value) diff --git a/src/libs/client/ThreadedSigClientInterface.hpp b/src/libs/client/ThreadedSigClientInterface.hpp index 63a35b59..bdca9a0d 100644 --- a/src/libs/client/ThreadedSigClientInterface.hpp +++ b/src/libs/client/ThreadedSigClientInterface.hpp @@ -31,6 +31,7 @@ using std::string; typedef sigc::slot Closure; namespace Ingen { +namespace Shared { class EngineInterface; } namespace Client { @@ -130,7 +131,7 @@ public: void disconnect(const string& src_port_path, const string& dst_port_path) { push_sig(sigc::bind(disconnection_slot, src_port_path, dst_port_path)); } - void variable_change(const string& path, const string& key, const Raul::Atom& value) + void set_variable(const string& path, const string& key, const Raul::Atom& value) { push_sig(sigc::bind(variable_change_slot, path, key, value)); } void control_change(const string& port_path, float value) -- cgit v1.2.1