From 29b77e922d7fd883795b04eadd528eca21a37a2f Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 3 Jan 2010 17:57:22 +0000 Subject: Remove patch clear command (fix ticket #375). git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2332 a436a847-0d15-0410-975c-d299462d15a1 --- src/client/ClientStore.cpp | 29 ----------------------------- src/client/ClientStore.hpp | 1 - src/client/HTTPEngineSender.cpp | 6 ------ src/client/HTTPEngineSender.hpp | 2 -- src/client/OSCClientReceiver.cpp | 9 --------- src/client/OSCClientReceiver.hpp | 1 - src/client/OSCEngineSender.cpp | 10 ---------- src/client/OSCEngineSender.hpp | 2 -- src/client/SigClientInterface.hpp | 4 ---- src/client/ThreadedSigClientInterface.hpp | 5 ----- 10 files changed, 69 deletions(-) (limited to 'src/client') diff --git a/src/client/ClientStore.cpp b/src/client/ClientStore.cpp index 64e84494..5d80af50 100644 --- a/src/client/ClientStore.cpp +++ b/src/client/ClientStore.cpp @@ -44,7 +44,6 @@ ClientStore::ClientStore(SharedPtr engine, SharedPtrsignal_object_deleted.connect(sigc::mem_fun(this, &ClientStore::del)); emitter->signal_object_moved.connect(sigc::mem_fun(this, &ClientStore::move)); emitter->signal_put.connect(sigc::mem_fun(this, &ClientStore::put)); - emitter->signal_clear_patch.connect(sigc::mem_fun(this, &ClientStore::clear_patch)); emitter->signal_connection.connect(sigc::mem_fun(this, &ClientStore::connect)); emitter->signal_disconnection.connect(sigc::mem_fun(this, &ClientStore::disconnect)); emitter->signal_property_change.connect(sigc::mem_fun(this, &ClientStore::set_property)); @@ -331,34 +330,6 @@ ClientStore::put(const URI& uri, const Resource::Properties& properties) } -void -ClientStore::clear_patch(const Path& path) -{ - iterator i = find(path); - if (i != end()) { - assert((*i).second->path() == path); - SharedPtr patch = PtrCast(i->second); - - iterator first_descendant = i; - ++first_descendant; - iterator descendants_end = find_descendants_end(i); - SharedPtr< Table > > removed - = yank(first_descendant, descendants_end); - - for (iterator i = removed->begin(); i != removed->end(); ++i) { - SharedPtr model = PtrCast(i->second); - assert(model); - model->signal_destroyed.emit(); - if (model->parent() == patch) - patch->remove_child(model); - } - - } else { - cerr << "[Store] Unable to find patch " << path << " to clear." << endl; - } -} - - void ClientStore::set_property(const URI& subject_uri, const URI& predicate, const Atom& value) { diff --git a/src/client/ClientStore.hpp b/src/client/ClientStore.hpp index f58f5d16..ba32b362 100644 --- a/src/client/ClientStore.hpp +++ b/src/client/ClientStore.hpp @@ -95,7 +95,6 @@ private: // Slots for SigClientInterface signals void object_moved(const Raul::Path& old_path, const Raul::Path& new_path); - void clear_patch(const Raul::Path& path); void activity(const Raul::Path& path); bool attempt_connection(const Raul::Path& src_port_path, const Raul::Path& dst_port_path); diff --git a/src/client/HTTPEngineSender.cpp b/src/client/HTTPEngineSender.cpp index daeae86e..ab8c7c3f 100644 --- a/src/client/HTTPEngineSender.cpp +++ b/src/client/HTTPEngineSender.cpp @@ -154,12 +154,6 @@ HTTPEngineSender::del(const Path& uri) } -void -HTTPEngineSender::clear_patch(const Path& patch_path) -{ -} - - void HTTPEngineSender::connect(const Path& src_port_path, const Path& dst_port_path) diff --git a/src/client/HTTPEngineSender.hpp b/src/client/HTTPEngineSender.hpp index 60b8345e..b2df7821 100644 --- a/src/client/HTTPEngineSender.hpp +++ b/src/client/HTTPEngineSender.hpp @@ -83,8 +83,6 @@ public: virtual void put(const Raul::URI& path, const Shared::Resource::Properties& properties); - virtual void clear_patch(const Raul::Path& path); - virtual void del(const Raul::Path& path); virtual void move(const Raul::Path& old_path, diff --git a/src/client/OSCClientReceiver.cpp b/src/client/OSCClientReceiver.cpp index 0f39b71b..02585d3a 100644 --- a/src/client/OSCClientReceiver.cpp +++ b/src/client/OSCClientReceiver.cpp @@ -147,7 +147,6 @@ OSCClientReceiver::setup_callbacks() 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", del_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); @@ -176,14 +175,6 @@ OSCClientReceiver::_del_cb(const char* path, const char* types, lo_arg** argv, i } -int -OSCClientReceiver::_clear_patch_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg) -{ - _target->clear_patch((const char*)&argv[0]->s); - return 0; -} - - int OSCClientReceiver::_put_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg) { diff --git a/src/client/OSCClientReceiver.hpp b/src/client/OSCClientReceiver.hpp index 18d2ac4d..d0cc4706 100644 --- a/src/client/OSCClientReceiver.hpp +++ b/src/client/OSCClientReceiver.hpp @@ -86,7 +86,6 @@ private: LO_HANDLER(plugin_list_end); LO_HANDLER(new_patch); LO_HANDLER(del); - LO_HANDLER(clear_patch); LO_HANDLER(move); LO_HANDLER(connection); LO_HANDLER(disconnection); diff --git a/src/client/OSCEngineSender.cpp b/src/client/OSCEngineSender.cpp index 516f6c4a..e2553528 100644 --- a/src/client/OSCEngineSender.cpp +++ b/src/client/OSCEngineSender.cpp @@ -169,16 +169,6 @@ OSCEngineSender::del(const Path& path) } -void -OSCEngineSender::clear_patch(const Path& patch_path) -{ - send("/ingen/clear_patch", "is", - next_id(), - patch_path.c_str(), - LO_ARGS_END); -} - - void OSCEngineSender::connect(const Path& src_port_path, const Path& dst_port_path) diff --git a/src/client/OSCEngineSender.hpp b/src/client/OSCEngineSender.hpp index d7204413..f43c3b18 100644 --- a/src/client/OSCEngineSender.hpp +++ b/src/client/OSCEngineSender.hpp @@ -80,8 +80,6 @@ public: virtual void put(const Raul::URI& path, const Shared::Resource::Properties& properties); - virtual void clear_patch(const Raul::Path& path); - virtual void del(const Raul::Path& path); virtual void move(const Raul::Path& old_path, diff --git a/src/client/SigClientInterface.hpp b/src/client/SigClientInterface.hpp index c262d408..785f6ac8 100644 --- a/src/client/SigClientInterface.hpp +++ b/src/client/SigClientInterface.hpp @@ -51,7 +51,6 @@ public: sigc::signal signal_new_patch; sigc::signal signal_new_port; sigc::signal signal_put; - sigc::signal signal_clear_patch; sigc::signal signal_object_moved; sigc::signal signal_object_deleted; sigc::signal signal_connection; @@ -98,9 +97,6 @@ protected: void del(const Raul::Path& path) { EMIT(object_deleted, path); } - void clear_patch(const Raul::Path& path) - { EMIT(clear_patch, path); } - void move(const Raul::Path& old_path, const Raul::Path& new_path) { EMIT(object_moved, old_path, new_path); } diff --git a/src/client/ThreadedSigClientInterface.hpp b/src/client/ThreadedSigClientInterface.hpp index 34847797..901fd4a6 100644 --- a/src/client/ThreadedSigClientInterface.hpp +++ b/src/client/ThreadedSigClientInterface.hpp @@ -53,7 +53,6 @@ public: , new_port_slot(signal_new_port.make_slot()) , put_slot(signal_put.make_slot()) , connection_slot(signal_connection.make_slot()) - , clear_patch_slot(signal_clear_patch.make_slot()) , object_deleted_slot(signal_object_deleted.make_slot()) , object_moved_slot(signal_object_moved.make_slot()) , disconnection_slot(signal_disconnection.make_slot()) @@ -93,9 +92,6 @@ public: void del(const Raul::Path& path) { push_sig(sigc::bind(object_deleted_slot, path)); } - void clear_patch(const Raul::Path& path) - { push_sig(sigc::bind(clear_patch_slot, path)); } - void move(const Raul::Path& old_path, const Raul::Path& new_path) { push_sig(sigc::bind(object_moved_slot, old_path, new_path)); } @@ -135,7 +131,6 @@ private: sigc::slot new_port_slot; sigc::slot put_slot; sigc::slot connection_slot; - sigc::slot clear_patch_slot; sigc::slot object_deleted_slot; sigc::slot object_moved_slot; sigc::slot disconnection_slot; -- cgit v1.2.1