From 76500fc464ffa1cdeec0d90c466783fe1b3ac07d Mon Sep 17 00:00:00 2001 From: David Robillard Date: Wed, 13 May 2009 16:21:37 +0000 Subject: Remove old/unused DSSI program API. If/when LV2 gets programs this should be implemented through the generic property based interface. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2001 a436a847-0d15-0410-975c-d299462d15a1 --- src/bindings/Client.hpp | 9 --------- src/client/HTTPEngineSender.cpp | 8 -------- src/client/HTTPEngineSender.hpp | 4 ---- src/client/OSCClientReceiver.cpp | 29 ----------------------------- src/client/OSCClientReceiver.hpp | 2 -- src/client/OSCEngineSender.cpp | 13 ------------- src/client/OSCEngineSender.hpp | 4 ---- src/client/SigClientInterface.hpp | 8 -------- src/client/ThreadedSigClientInterface.hpp | 10 ---------- src/common/interface/ClientInterface.hpp | 9 --------- src/common/interface/EngineInterface.hpp | 4 ---- src/engine/ClientBroadcaster.cpp | 16 ---------------- src/engine/ClientBroadcaster.hpp | 2 -- src/engine/HTTPClientSender.cpp | 16 ---------------- src/engine/HTTPClientSender.hpp | 9 --------- src/engine/OSCClientSender.cpp | 18 ------------------ src/engine/OSCClientSender.hpp | 9 --------- src/engine/QueuedEngineInterface.cpp | 9 --------- src/engine/QueuedEngineInterface.hpp | 4 ---- src/gui/NodeMenu.hpp | 3 --- 20 files changed, 186 deletions(-) diff --git a/src/bindings/Client.hpp b/src/bindings/Client.hpp index 439f583c..1a18ea73 100644 --- a/src/bindings/Client.hpp +++ b/src/bindings/Client.hpp @@ -77,13 +77,4 @@ public: uint32_t voice, uint32_t data_size, const void* data) {} - - virtual void program_add(const std::string& node_path, - uint32_t bank, - uint32_t program, - const std::string& program_name) {} - - virtual void program_remove(const std::string& node_path, - uint32_t bank, - uint32_t program) {} }; 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 @@ -194,14 +194,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 @@ -298,19 +298,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) { 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 signal_port_value; sigc::signal signal_voice_value; sigc::signal signal_activity; - sigc::signal signal_program_add; - sigc::signal 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 port_value_slot; sigc::slot voice_value_slot; sigc::slot activity_slot; - sigc::slot program_add_slot; - sigc::slot program_remove_slot; }; diff --git a/src/common/interface/ClientInterface.hpp b/src/common/interface/ClientInterface.hpp index 922592be..05ecfa7a 100644 --- a/src/common/interface/ClientInterface.hpp +++ b/src/common/interface/ClientInterface.hpp @@ -59,15 +59,6 @@ public: const Raul::Symbol& symbol) = 0; virtual void activity(const Raul::Path& path) = 0; - - virtual void program_add(const Raul::Path& node_path, - uint32_t bank, - uint32_t program, - const std::string& program_name) = 0; - - virtual void program_remove(const Raul::Path& node_path, - uint32_t bank, - uint32_t program) = 0; }; diff --git a/src/common/interface/EngineInterface.hpp b/src/common/interface/EngineInterface.hpp index 28bc98f7..5db47d47 100644 --- a/src/common/interface/EngineInterface.hpp +++ b/src/common/interface/EngineInterface.hpp @@ -58,10 +58,6 @@ public: virtual void disconnect_all(const Raul::Path& parent_patch_path, const Raul::Path& path) = 0; - virtual void set_program(const Raul::Path& node_path, - uint32_t bank, - uint32_t program) = 0; - virtual void midi_learn(const Raul::Path& node_path) = 0; // Requests diff --git a/src/engine/ClientBroadcaster.cpp b/src/engine/ClientBroadcaster.cpp index fcc23409..6fca9b17 100644 --- a/src/engine/ClientBroadcaster.cpp +++ b/src/engine/ClientBroadcaster.cpp @@ -208,22 +208,6 @@ ClientBroadcaster::send_activity(const Path& path) } -void -ClientBroadcaster::send_program_add(const Path& node_path, int bank, int program, const string& name) -{ - for (Clients::const_iterator i = _clients.begin(); i != _clients.end(); ++i) - (*i).second->program_add(node_path, bank, program, name); -} - - -void -ClientBroadcaster::send_program_remove(const Path& node_path, int bank, int program) -{ - for (Clients::const_iterator i = _clients.begin(); i != _clients.end(); ++i) - (*i).second->program_remove(node_path, bank, program); -} - - /** Send an object. * * @param recursive If true send all children of object diff --git a/src/engine/ClientBroadcaster.hpp b/src/engine/ClientBroadcaster.hpp index 346476c7..18d7647f 100644 --- a/src/engine/ClientBroadcaster.hpp +++ b/src/engine/ClientBroadcaster.hpp @@ -73,8 +73,6 @@ public: void send_property_change(const Raul::URI& node_path, const Raul::URI& key, const Raul::Atom& value); void send_port_value(const Raul::Path& port_path, const Raul::Atom& value); void send_activity(const Raul::Path& path); - void send_program_add(const Raul::Path& node_path, int bank, int program, const std::string& name); - void send_program_remove(const Raul::Path& node_path, int bank, int program); void send_plugins_to(Shared::ClientInterface*, const NodeFactory::Plugins& plugin_list); diff --git a/src/engine/HTTPClientSender.cpp b/src/engine/HTTPClientSender.cpp index 6e4f0480..5804ce43 100644 --- a/src/engine/HTTPClientSender.cpp +++ b/src/engine/HTTPClientSender.cpp @@ -212,20 +212,4 @@ HTTPClientSender::rename(const Raul::Path& old_path, const Raul::Path& new_path) } -void -HTTPClientSender::program_add(const Raul::Path& node_path, uint32_t bank, uint32_t program, const std::string& name) -{ - /*send("/ingen/program_add", "siis", - node_path.c_str(), bank, program, name.c_str(), LO_ARGS_END);*/ -} - - -void -HTTPClientSender::program_remove(const Raul::Path& node_path, uint32_t bank, uint32_t program) -{ - /*send("/ingen/program_remove", "sii", - node_path.c_str(), bank, program, LO_ARGS_END);*/ -} - - } // namespace Ingen diff --git a/src/engine/HTTPClientSender.hpp b/src/engine/HTTPClientSender.hpp index b73272d3..2cfe6098 100644 --- a/src/engine/HTTPClientSender.hpp +++ b/src/engine/HTTPClientSender.hpp @@ -119,15 +119,6 @@ public: virtual void activity(const Raul::Path& path); - virtual void program_add(const Raul::Path& node_path, - uint32_t bank, - uint32_t program, - const std::string& program_name); - - virtual void program_remove(const Raul::Path& node_path, - uint32_t bank, - uint32_t program); - private: Engine& _engine; std::string _url; diff --git a/src/engine/OSCClientSender.cpp b/src/engine/OSCClientSender.cpp index 63a22c54..5f351b87 100644 --- a/src/engine/OSCClientSender.cpp +++ b/src/engine/OSCClientSender.cpp @@ -360,22 +360,4 @@ OSCClientSender::rename(const Path& old_path, const Path& new_path) } -/** Sends information about a program associated with a node. - */ -void -OSCClientSender::program_add(const Path& node_path, uint32_t bank, uint32_t program, const std::string& name) -{ - send("/ingen/program_add", "siis", - node_path.c_str(), bank, program, name.c_str(), LO_ARGS_END); -} - - -void -OSCClientSender::program_remove(const Path& node_path, uint32_t bank, uint32_t program) -{ - send("/ingen/program_remove", "sii", - node_path.c_str(), bank, program, LO_ARGS_END); -} - - } // namespace Ingen diff --git a/src/engine/OSCClientSender.hpp b/src/engine/OSCClientSender.hpp index d3a20f0f..404bdee7 100644 --- a/src/engine/OSCClientSender.hpp +++ b/src/engine/OSCClientSender.hpp @@ -118,15 +118,6 @@ public: virtual void activity(const Raul::Path& path); - virtual void program_add(const Raul::Path& node_path, - uint32_t bank, - uint32_t program, - const std::string& program_name); - - virtual void program_remove(const Raul::Path& node_path, - uint32_t bank, - uint32_t program); - private: Raul::URI _url; }; diff --git a/src/engine/QueuedEngineInterface.cpp b/src/engine/QueuedEngineInterface.cpp index db5f719a..e19261f7 100644 --- a/src/engine/QueuedEngineInterface.cpp +++ b/src/engine/QueuedEngineInterface.cpp @@ -246,15 +246,6 @@ QueuedEngineInterface::set_voice_value(const Path& port_path, } -void -QueuedEngineInterface::set_program(const Path& node_path, - uint32_t bank, - uint32_t program) -{ - std::cerr << "FIXME: set program" << std::endl; -} - - void QueuedEngineInterface::midi_learn(const Path& node_path) { diff --git a/src/engine/QueuedEngineInterface.hpp b/src/engine/QueuedEngineInterface.hpp index e217d879..1263c225 100644 --- a/src/engine/QueuedEngineInterface.hpp +++ b/src/engine/QueuedEngineInterface.hpp @@ -116,10 +116,6 @@ public: virtual void disconnect_all(const Raul::Path& parent_patch_path, const Raul::Path& path); - virtual void set_program(const Raul::Path& node_path, - uint32_t bank, - uint32_t program); - virtual void midi_learn(const Raul::Path& node_path); // Requests // diff --git a/src/gui/NodeMenu.hpp b/src/gui/NodeMenu.hpp index bc885cb5..29abc603 100644 --- a/src/gui/NodeMenu.hpp +++ b/src/gui/NodeMenu.hpp @@ -39,9 +39,6 @@ class NodeMenu : public ObjectMenu public: NodeMenu(BaseObjectType* cobject, const Glib::RefPtr& xml); - virtual void program_add(int bank, int program, const std::string& name) {} - virtual void program_remove(int bank, int program) {} - void init(SharedPtr node); bool has_control_inputs(); -- cgit v1.2.1