From 49dcb26a2133e5067a1e63b2a5633444c08bb85a Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 14 Feb 2010 01:27:46 +0000 Subject: Remove voice specific control setting. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2445 a436a847-0d15-0410-975c-d299462d15a1 --- src/client/ClientStore.cpp | 12 ------------ src/client/ClientStore.hpp | 1 - src/client/HTTPEngineSender.cpp | 8 -------- src/client/HTTPEngineSender.hpp | 4 ---- src/client/OSCClientReceiver.cpp | 14 -------------- src/client/OSCClientReceiver.hpp | 1 - src/client/OSCEngineSender.cpp | 16 ---------------- src/client/OSCEngineSender.hpp | 4 ---- src/client/SigClientInterface.hpp | 4 ---- src/client/ThreadedSigClientInterface.hpp | 4 ---- 10 files changed, 68 deletions(-) (limited to 'src/client') diff --git a/src/client/ClientStore.cpp b/src/client/ClientStore.cpp index cf05e599..b12cdd7b 100644 --- a/src/client/ClientStore.cpp +++ b/src/client/ClientStore.cpp @@ -52,7 +52,6 @@ ClientStore::ClientStore(SharedPtr engine, SharedPtrsignal_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)); - emitter->signal_voice_value.connect(sigc::mem_fun(this, &ClientStore::set_voice_value)); emitter->signal_activity.connect(sigc::mem_fun(this, &ClientStore::activity)); } @@ -385,17 +384,6 @@ ClientStore::set_property(const URI& subject_uri, const URI& predicate, const At } -void -ClientStore::set_voice_value(const Path& port_path, uint32_t voice, const Atom& value) -{ - SharedPtr port = PtrCast(object(port_path)); - if (port) - port->value(voice, value); - else - LOG(error) << "Polyphonic control change for non-existent port " << port_path << endl; -} - - void ClientStore::activity(const Path& path) { diff --git a/src/client/ClientStore.hpp b/src/client/ClientStore.hpp index 978bc7d5..35dabdcf 100644 --- a/src/client/ClientStore.hpp +++ b/src/client/ClientStore.hpp @@ -73,7 +73,6 @@ public: const Shared::Resource::Properties& add); void move(const Raul::Path& old_path, const Raul::Path& new_path); void set_property(const Raul::URI& subject_path, const Raul::URI& predicate, const Raul::Atom& value); - void set_voice_value(const Raul::Path& port_path, uint32_t voice, const Raul::Atom& value); void connect(const Raul::Path& src_port_path, const Raul::Path& dst_port_path); void disconnect(const Raul::Path& src_port_path, const Raul::Path& dst_port_path); void del(const Raul::Path& path); diff --git a/src/client/HTTPEngineSender.cpp b/src/client/HTTPEngineSender.cpp index d515926b..f7400252 100644 --- a/src/client/HTTPEngineSender.cpp +++ b/src/client/HTTPEngineSender.cpp @@ -186,14 +186,6 @@ HTTPEngineSender::disconnect_all(const Path& parent_patch_path, } -void -HTTPEngineSender::set_voice_value(const Path& port_path, - uint32_t voice, - const Atom& value) -{ -} - - void HTTPEngineSender::set_property(const URI& subject, const URI& predicate, diff --git a/src/client/HTTPEngineSender.hpp b/src/client/HTTPEngineSender.hpp index 570ab3e9..6c7f7ed3 100644 --- a/src/client/HTTPEngineSender.hpp +++ b/src/client/HTTPEngineSender.hpp @@ -105,10 +105,6 @@ public: const Raul::URI& predicate, const Raul::Atom& value); - virtual void set_voice_value(const Raul::Path& port_path, - uint32_t voice, - const Raul::Atom& value); - // Requests // void ping(); void get(const Raul::URI& uri); diff --git a/src/client/OSCClientReceiver.cpp b/src/client/OSCClientReceiver.cpp index 4cf28156..fabfd925 100644 --- a/src/client/OSCClientReceiver.cpp +++ b/src/client/OSCClientReceiver.cpp @@ -149,7 +149,6 @@ OSCClientReceiver::setup_callbacks() lo_server_thread_add_method(_st, "/connect", "ss", connection_cb, this); lo_server_thread_add_method(_st, "/disconnect", "ss", disconnection_cb, this); lo_server_thread_add_method(_st, "/set_property", NULL, set_property_cb, this); - lo_server_thread_add_method(_st, "/set_voice_value", "sif", set_voice_value_cb, this); lo_server_thread_add_method(_st, "/activity", "s", activity_cb, this); } @@ -235,19 +234,6 @@ OSCClientReceiver::_set_property_cb(const char* path, const char* types, lo_arg* } -int -OSCClientReceiver::_set_voice_value_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg) -{ - const char* const port_path = &argv[0]->s; - const int voice = argv[1]->i; - const float value = argv[2]->f; - - _target->set_voice_value(port_path, voice, value); - - return 0; -} - - int OSCClientReceiver::_activity_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 31082858..de11a5e0 100644 --- a/src/client/OSCClientReceiver.hpp +++ b/src/client/OSCClientReceiver.hpp @@ -91,7 +91,6 @@ private: LO_HANDLER(disconnection); LO_HANDLER(put); LO_HANDLER(set_property); - LO_HANDLER(set_voice_value); LO_HANDLER(activity); }; diff --git a/src/client/OSCEngineSender.cpp b/src/client/OSCEngineSender.cpp index 30f5cb76..62ad94ec 100644 --- a/src/client/OSCEngineSender.cpp +++ b/src/client/OSCEngineSender.cpp @@ -216,22 +216,6 @@ OSCEngineSender::disconnect_all(const Path& parent_patch_path, } -void -OSCEngineSender::set_voice_value(const Path& port_path, - uint32_t voice, - const Atom& value) -{ - lo_message m = lo_message_new(); - lo_message_add_int32(m, next_id()); - lo_message_add_string(m, port_path.c_str()); - lo_message_add_int32(m, voice); - if (value.type() == Atom::BLOB) - lo_message_add_string(m, value.get_blob_type()); - Raul::AtomLiblo::lo_message_add_atom(m, value); - send_message("/set_port_value", m); -} - - void OSCEngineSender::set_property(const URI& subject, const URI& predicate, diff --git a/src/client/OSCEngineSender.hpp b/src/client/OSCEngineSender.hpp index 916d1466..538acad9 100644 --- a/src/client/OSCEngineSender.hpp +++ b/src/client/OSCEngineSender.hpp @@ -102,10 +102,6 @@ public: const Raul::URI& predicate, const Raul::Atom& value); - virtual void set_voice_value(const Raul::Path& port_path, - uint32_t voice, - const Raul::Atom& value); - // Requests // void ping(); void get(const Raul::URI& uri); diff --git a/src/client/SigClientInterface.hpp b/src/client/SigClientInterface.hpp index 3334c5c7..2637e7a2 100644 --- a/src/client/SigClientInterface.hpp +++ b/src/client/SigClientInterface.hpp @@ -60,7 +60,6 @@ public: sigc::signal signal_variable_change; sigc::signal signal_property_change; sigc::signal signal_port_value; - sigc::signal signal_voice_value; sigc::signal signal_activity; /** Fire pending signals. Only does anything on derived classes (that may queue) */ @@ -112,9 +111,6 @@ protected: void set_property(const Raul::URI& subject, const Raul::URI& key, const Raul::Atom& value) { EMIT(property_change, subject, key, value); } - void set_voice_value(const Raul::Path& port_path, uint32_t voice, const Raul::Atom& value) - { EMIT(voice_value, port_path, voice, value); } - void activity(const Raul::Path& port_path) { EMIT(activity, port_path); } }; diff --git a/src/client/ThreadedSigClientInterface.hpp b/src/client/ThreadedSigClientInterface.hpp index bb86d65a..6a9cffdd 100644 --- a/src/client/ThreadedSigClientInterface.hpp +++ b/src/client/ThreadedSigClientInterface.hpp @@ -105,9 +105,6 @@ public: void set_property(const Raul::URI& subject, const Raul::URI& key, const Raul::Atom& value) { push_sig(sigc::bind(property_change_slot, subject, key, value)); } - void set_voice_value(const Raul::Path& port_path, uint32_t voice, const Raul::Atom& value) - { push_sig(sigc::bind(voice_value_slot, port_path, voice, value)); } - void activity(const Raul::Path& port_path) { push_sig(sigc::bind(activity_slot, port_path)); } @@ -140,7 +137,6 @@ private: sigc::slot variable_change_slot; sigc::slot property_change_slot; sigc::slot port_value_slot; - sigc::slot voice_value_slot; sigc::slot activity_slot; }; -- cgit v1.2.1