diff options
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/ClientStore.cpp | 2 | ||||
| -rw-r--r-- | src/client/OSCClientReceiver.cpp | 7 | ||||
| -rw-r--r-- | src/client/SigClientInterface.hpp | 4 | ||||
| -rw-r--r-- | src/client/ThreadedSigClientInterface.hpp | 6 |
4 files changed, 9 insertions, 10 deletions
diff --git a/src/client/ClientStore.cpp b/src/client/ClientStore.cpp index 3a1acc21..10a5ac9b 100644 --- a/src/client/ClientStore.cpp +++ b/src/client/ClientStore.cpp @@ -43,7 +43,7 @@ ClientStore::ClientStore(SharedPtr<EngineInterface> engine, SharedPtr<SigClientI if (!emitter) return; - emitter->signal_object_destroyed.connect(sigc::mem_fun(this, &ClientStore::del)); + emitter->signal_object_deleted.connect(sigc::mem_fun(this, &ClientStore::del)); emitter->signal_object_moved.connect(sigc::mem_fun(this, &ClientStore::move)); emitter->signal_new_plugin.connect(sigc::mem_fun(this, &ClientStore::new_plugin)); emitter->signal_put.connect(sigc::mem_fun(this, &ClientStore::put)); diff --git a/src/client/OSCClientReceiver.cpp b/src/client/OSCClientReceiver.cpp index 9c94659a..ece3289c 100644 --- a/src/client/OSCClientReceiver.cpp +++ b/src/client/OSCClientReceiver.cpp @@ -143,14 +143,13 @@ OSCClientReceiver::setup_callbacks() lo_server_thread_add_method(_st, "/ingen/ok", "i", response_ok_cb, this); lo_server_thread_add_method(_st, "/ingen/error", "is", response_error_cb, this); lo_server_thread_add_method(_st, "/ingen/plugin", "sss", plugin_cb, this); - lo_server_thread_add_method(_st, "/ingen/new_patch", "si", new_patch_cb, this); - lo_server_thread_add_method(_st, "/ingen/destroyed", "s", destroyed_cb, this); - lo_server_thread_add_method(_st, "/ingen/clear_patch", "s", clear_patch_cb, this); + lo_server_thread_add_method(_st, "/ingen/put", NULL, put_cb, this); lo_server_thread_add_method(_st, "/ingen/move", "ss", move_cb, this); + lo_server_thread_add_method(_st, "/ingen/delete", "s", destroyed_cb, this); + lo_server_thread_add_method(_st, "/ingen/clear_patch", "s", clear_patch_cb, this); lo_server_thread_add_method(_st, "/ingen/new_connection", "ss", connection_cb, this); lo_server_thread_add_method(_st, "/ingen/disconnection", "ss", disconnection_cb, this); lo_server_thread_add_method(_st, "/ingen/new_port", "sisi", new_port_cb, this); - lo_server_thread_add_method(_st, "/ingen/put", NULL, new_port_cb, this); lo_server_thread_add_method(_st, "/ingen/set_variable", NULL, set_variable_cb, this); lo_server_thread_add_method(_st, "/ingen/set_property", NULL, set_property_cb, this); lo_server_thread_add_method(_st, "/ingen/set_port_value", "sf", set_port_value_cb, this); diff --git a/src/client/SigClientInterface.hpp b/src/client/SigClientInterface.hpp index a95336d5..6038ad9e 100644 --- a/src/client/SigClientInterface.hpp +++ b/src/client/SigClientInterface.hpp @@ -56,7 +56,7 @@ public: sigc::signal<void, Raul::Path, Shared::Resource::Properties> signal_put; sigc::signal<void, Raul::Path> signal_clear_patch; sigc::signal<void, Raul::Path, Raul::Path> signal_object_moved; - sigc::signal<void, Raul::Path> signal_object_destroyed; + sigc::signal<void, Raul::Path> signal_object_deleted; sigc::signal<void, Raul::Path, Raul::Path> signal_connection; sigc::signal<void, Raul::Path, Raul::Path> signal_disconnection; sigc::signal<void, Raul::URI, Raul::URI, Raul::Atom> signal_variable_change; @@ -105,7 +105,7 @@ protected: { if (_enabled) signal_connection.emit(src_port_path, dst_port_path); } void del(const Raul::Path& path) - { if (_enabled) signal_object_destroyed.emit(path); } + { if (_enabled) signal_object_deleted.emit(path); } void clear_patch(const Raul::Path& path) { if (_enabled) signal_clear_patch.emit(path); } diff --git a/src/client/ThreadedSigClientInterface.hpp b/src/client/ThreadedSigClientInterface.hpp index f0fa5321..21b92d56 100644 --- a/src/client/ThreadedSigClientInterface.hpp +++ b/src/client/ThreadedSigClientInterface.hpp @@ -55,7 +55,7 @@ public: , put_slot(signal_put.make_slot()) , connection_slot(signal_connection.make_slot()) , clear_patch_slot(signal_clear_patch.make_slot()) - , object_destroyed_slot(signal_object_destroyed.make_slot()) + , object_deleted_slot(signal_object_deleted.make_slot()) , object_moved_slot(signal_object_moved.make_slot()) , disconnection_slot(signal_disconnection.make_slot()) , variable_change_slot(signal_variable_change.make_slot()) @@ -99,7 +99,7 @@ public: { push_sig(sigc::bind(connection_slot, src_port_path, dst_port_path)); } void del(const Raul::Path& path) - { push_sig(sigc::bind(object_destroyed_slot, path)); } + { push_sig(sigc::bind(object_deleted_slot, path)); } void clear_patch(const Raul::Path& path) { push_sig(sigc::bind(clear_patch_slot, path)); } @@ -147,7 +147,7 @@ private: sigc::slot<void, Raul::Path, Shared::Resource::Properties> put_slot; sigc::slot<void, Raul::Path, Raul::Path> connection_slot; sigc::slot<void, Raul::Path> clear_patch_slot; - sigc::slot<void, Raul::Path> object_destroyed_slot; + sigc::slot<void, Raul::Path> object_deleted_slot; sigc::slot<void, Raul::Path, Raul::Path> object_moved_slot; sigc::slot<void, Raul::Path, Raul::Path> disconnection_slot; sigc::slot<void, Raul::URI, Raul::URI, Raul::Atom> variable_change_slot; |