diff options
Diffstat (limited to 'src/libs/client')
| -rw-r--r-- | src/libs/client/DeprecatedLoader.cpp | 2 | ||||
| -rw-r--r-- | src/libs/client/OSCClientReceiver.cpp | 4 | ||||
| -rw-r--r-- | src/libs/client/OSCEngineSender.cpp | 6 | ||||
| -rw-r--r-- | src/libs/client/OSCEngineSender.hpp | 4 | ||||
| -rw-r--r-- | src/libs/client/SigClientInterface.hpp | 4 | ||||
| -rw-r--r-- | src/libs/client/ThreadedSigClientInterface.hpp | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/src/libs/client/DeprecatedLoader.cpp b/src/libs/client/DeprecatedLoader.cpp index d064830b..6b44fcf8 100644 --- a/src/libs/client/DeprecatedLoader.cpp +++ b/src/libs/client/DeprecatedLoader.cpp @@ -299,7 +299,7 @@ DeprecatedLoader::load_patch(const Glib::ustring& filename, // Create it, if we're not merging if (!existing && path != "/") { - _engine->create_patch(path, poly); + _engine->new_patch(path, poly); for (GraphObject::Variables::const_iterator i = initial_data.begin(); i != initial_data.end(); ++i) _engine->set_variable(path, i->first, i->second); } diff --git a/src/libs/client/OSCClientReceiver.cpp b/src/libs/client/OSCClientReceiver.cpp index 3f5447d0..00c5c28f 100644 --- a/src/libs/client/OSCClientReceiver.cpp +++ b/src/libs/client/OSCClientReceiver.cpp @@ -238,7 +238,7 @@ OSCClientReceiver::_connection_cb(const char* path, const char* types, lo_arg** const char* const src_port_path = &argv[0]->s; const char* const dst_port_path = &argv[1]->s; - connection(src_port_path, dst_port_path); + connect(src_port_path, dst_port_path); return 0; } @@ -250,7 +250,7 @@ OSCClientReceiver::_disconnection_cb(const char* path, const char* types, lo_arg const char* src_port_path = &argv[0]->s; const char* dst_port_path = &argv[1]->s; - disconnection(src_port_path, dst_port_path); + disconnect(src_port_path, dst_port_path); return 0; } diff --git a/src/libs/client/OSCEngineSender.cpp b/src/libs/client/OSCEngineSender.cpp index 412cb5cd..44149865 100644 --- a/src/libs/client/OSCEngineSender.cpp +++ b/src/libs/client/OSCEngineSender.cpp @@ -183,11 +183,11 @@ OSCEngineSender::quit() // Object commands void -OSCEngineSender::create_patch(const string& path, - uint32_t poly) +OSCEngineSender::new_patch(const string& path, + uint32_t poly) { assert(_engine_addr); - lo_send(_engine_addr, "/ingen/create_patch", "isi", + lo_send(_engine_addr, "/ingen/new_patch", "isi", next_id(), path.c_str(), poly); diff --git a/src/libs/client/OSCEngineSender.hpp b/src/libs/client/OSCEngineSender.hpp index dfbdff62..bb935d7a 100644 --- a/src/libs/client/OSCEngineSender.hpp +++ b/src/libs/client/OSCEngineSender.hpp @@ -73,8 +73,8 @@ public: // Object commands - void create_patch(const string& path, - uint32_t poly); + void new_patch(const string& path, + uint32_t poly); void create_port(const string& path, const string& data_type, diff --git a/src/libs/client/SigClientInterface.hpp b/src/libs/client/SigClientInterface.hpp index 858ea3e6..1fed9e65 100644 --- a/src/libs/client/SigClientInterface.hpp +++ b/src/libs/client/SigClientInterface.hpp @@ -116,7 +116,7 @@ protected: void polyphonic(const string& path, bool polyphonic) { if (_enabled) signal_polyphonic.emit(path, polyphonic); } - void connection(const string& src_port_path, const string& dst_port_path) + void connect(const string& src_port_path, const string& dst_port_path) { if (_enabled) signal_connection.emit(src_port_path, dst_port_path); } void object_destroyed(const string& path) @@ -137,7 +137,7 @@ protected: void object_renamed(const string& old_path, const string& new_path) { if (_enabled) signal_object_renamed.emit(old_path, new_path); } - void disconnection(const string& src_port_path, const string& dst_port_path) + 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) diff --git a/src/libs/client/ThreadedSigClientInterface.hpp b/src/libs/client/ThreadedSigClientInterface.hpp index 2dab8897..63a35b59 100644 --- a/src/libs/client/ThreadedSigClientInterface.hpp +++ b/src/libs/client/ThreadedSigClientInterface.hpp @@ -106,7 +106,7 @@ public: void polyphonic(const string& path, bool polyphonic) { push_sig(sigc::bind(polyphonic_slot, path, polyphonic)); } - void connection(const string& src_port_path, const string& dst_port_path) + void connect(const string& src_port_path, const string& dst_port_path) { push_sig(sigc::bind(connection_slot, src_port_path, dst_port_path)); } void object_destroyed(const string& path) @@ -127,7 +127,7 @@ public: void object_renamed(const string& old_path, const string& new_path) { push_sig(sigc::bind(object_renamed_slot, old_path, new_path)); } - void disconnection(const string& src_port_path, const string& dst_port_path) + 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) |