diff options
Diffstat (limited to 'src/client')
-rw-r--r-- | src/client/HTTPEngineSender.cpp | 8 | ||||
-rw-r--r-- | src/client/HTTPEngineSender.hpp | 4 | ||||
-rw-r--r-- | src/client/OSCClientReceiver.cpp | 29 | ||||
-rw-r--r-- | src/client/OSCClientReceiver.hpp | 2 | ||||
-rw-r--r-- | src/client/OSCEngineSender.cpp | 13 | ||||
-rw-r--r-- | src/client/OSCEngineSender.hpp | 4 | ||||
-rw-r--r-- | src/client/SigClientInterface.hpp | 8 | ||||
-rw-r--r-- | src/client/ThreadedSigClientInterface.hpp | 10 |
8 files changed, 0 insertions, 78 deletions
diff --git a/src/client/HTTPEngineSender.cpp b/src/client/HTTPEngineSender.cpp index 0d03f826..443dcfb6 100644 --- a/src/client/HTTPEngineSender.cpp +++ b/src/client/HTTPEngineSender.cpp @@ -195,14 +195,6 @@ HTTPEngineSender::set_voice_value(const Path& port_path, void -HTTPEngineSender::set_program(const Path& node_path, - uint32_t bank, - uint32_t program) -{ -} - - -void HTTPEngineSender::midi_learn(const Path& node_path) { } diff --git a/src/client/HTTPEngineSender.hpp b/src/client/HTTPEngineSender.hpp index bc983891..f30b9e37 100644 --- a/src/client/HTTPEngineSender.hpp +++ b/src/client/HTTPEngineSender.hpp @@ -118,10 +118,6 @@ public: uint32_t voice, const Raul::Atom& value); - virtual void set_program(const Raul::Path& node_path, - uint32_t bank, - uint32_t program); - virtual void midi_learn(const Raul::Path& node_path); diff --git a/src/client/OSCClientReceiver.cpp b/src/client/OSCClientReceiver.cpp index 8270750d..dac558f5 100644 --- a/src/client/OSCClientReceiver.cpp +++ b/src/client/OSCClientReceiver.cpp @@ -156,8 +156,6 @@ OSCClientReceiver::setup_callbacks() lo_server_thread_add_method(_st, "/ingen/set_port_value", "sf", set_port_value_cb, this); lo_server_thread_add_method(_st, "/ingen/set_voice_value", "sif", set_voice_value_cb, this); lo_server_thread_add_method(_st, "/ingen/activity", "s", activity_cb, this); - lo_server_thread_add_method(_st, "/ingen/program_add", "siis", program_add_cb, this); - lo_server_thread_add_method(_st, "/ingen/program_remove", "sii", program_remove_cb, this); } @@ -363,32 +361,5 @@ OSCClientReceiver::_plugin_cb(const char* path, const char* types, lo_arg** argv } -int -OSCClientReceiver::_program_add_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg) -{ - const char* node_path = &argv[0]->s; - int32_t bank = argv[1]->i; - int32_t program = argv[2]->i; - const char* name = &argv[3]->s; - - _target->program_add(node_path, bank, program, name); - - return 0; -} - - -int -OSCClientReceiver::_program_remove_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg) -{ - const char* node_path = &argv[0]->s; - int32_t bank = argv[1]->i; - int32_t program = argv[2]->i; - - _target->program_remove(node_path, bank, program); - - return 0; -} - - } // namespace Client } // namespace Ingen diff --git a/src/client/OSCClientReceiver.hpp b/src/client/OSCClientReceiver.hpp index 59dc1b94..7608fff3 100644 --- a/src/client/OSCClientReceiver.hpp +++ b/src/client/OSCClientReceiver.hpp @@ -96,8 +96,6 @@ private: LO_HANDLER(set_port_value); LO_HANDLER(set_voice_value); LO_HANDLER(activity); - LO_HANDLER(program_add); - LO_HANDLER(program_remove); }; diff --git a/src/client/OSCEngineSender.cpp b/src/client/OSCEngineSender.cpp index cba75657..86e9e8a8 100644 --- a/src/client/OSCEngineSender.cpp +++ b/src/client/OSCEngineSender.cpp @@ -299,19 +299,6 @@ OSCEngineSender::set_voice_value(const Path& port_path, void -OSCEngineSender::set_program(const Path& node_path, - uint32_t bank, - uint32_t program) -{ - send((string("/dssi") + node_path.str() + "/program").c_str(), - "ii", - bank, - program, - LO_ARGS_END); -} - - -void OSCEngineSender::midi_learn(const Path& node_path) { send("/ingen/midi_learn", "is", diff --git a/src/client/OSCEngineSender.hpp b/src/client/OSCEngineSender.hpp index a23f9155..8383dd53 100644 --- a/src/client/OSCEngineSender.hpp +++ b/src/client/OSCEngineSender.hpp @@ -121,10 +121,6 @@ public: uint32_t voice, const Raul::Atom& value); - virtual void set_program(const Raul::Path& node_path, - uint32_t bank, - uint32_t program); - virtual void midi_learn(const Raul::Path& node_path); diff --git a/src/client/SigClientInterface.hpp b/src/client/SigClientInterface.hpp index b9943e68..128fddf0 100644 --- a/src/client/SigClientInterface.hpp +++ b/src/client/SigClientInterface.hpp @@ -67,8 +67,6 @@ public: sigc::signal<void, Raul::Path, Raul::Atom> signal_port_value; sigc::signal<void, Raul::Path, uint32_t, Raul::Atom> signal_voice_value; sigc::signal<void, Raul::Path> signal_activity; - sigc::signal<void, Raul::Path, uint32_t, uint32_t, std::string> signal_program_add; - sigc::signal<void, Raul::Path, uint32_t, uint32_t> signal_program_remove; /** Fire pending signals. Only does anything on derived classes (that may queue) */ virtual bool emit_signals() { return false; } @@ -144,12 +142,6 @@ protected: void activity(const Raul::Path& port_path) { if (_enabled) signal_activity.emit(port_path); } - - void program_add(const Raul::Path& path, uint32_t bank, uint32_t program, const std::string& name) - { if (_enabled) signal_program_add.emit(path, bank, program, name); } - - void program_remove(const Raul::Path& path, uint32_t bank, uint32_t program) - { if (_enabled) signal_program_remove.emit(path, bank, program); } }; diff --git a/src/client/ThreadedSigClientInterface.hpp b/src/client/ThreadedSigClientInterface.hpp index bb348437..029a30c1 100644 --- a/src/client/ThreadedSigClientInterface.hpp +++ b/src/client/ThreadedSigClientInterface.hpp @@ -63,8 +63,6 @@ public: , property_change_slot(signal_property_change.make_slot()) , port_value_slot(signal_port_value.make_slot()) , activity_slot(signal_activity.make_slot()) - , program_add_slot(signal_program_add.make_slot()) - , program_remove_slot(signal_program_remove.make_slot()) { } @@ -136,12 +134,6 @@ public: void activity(const Raul::Path& port_path) { push_sig(sigc::bind(activity_slot, port_path)); } - void program_add(const Raul::Path& path, uint32_t bank, uint32_t program, const std::string& name) - { push_sig(sigc::bind(program_add_slot, path, bank, program, name)); } - - void program_remove(const Raul::Path& path, uint32_t bank, uint32_t program) - { push_sig(sigc::bind(program_remove_slot, path, bank, program)); } - /** Process all queued events - Called from GTK thread to emit signals. */ bool emit_signals(); @@ -173,8 +165,6 @@ private: sigc::slot<void, Raul::Path, Raul::Atom> port_value_slot; sigc::slot<void, Raul::Path, uint32_t, Raul::Atom> voice_value_slot; sigc::slot<void, Raul::Path> activity_slot; - sigc::slot<void, Raul::Path, uint32_t, uint32_t, std::string> program_add_slot; - sigc::slot<void, Raul::Path, uint32_t, uint32_t> program_remove_slot; }; |