From a7e39b85d7c35ec44c613e593c57ff27de0d06bc Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Tue, 19 Aug 2008 01:04:54 +0000
Subject: Remove more API/code: num_plugins (unused legacy of the really crap
OSC days).
git-svn-id: http://svn.drobilla.net/lad/ingen@1442 a436a847-0d15-0410-975c-d299462d15a1
---
src/libs/client/OSCClientReceiver.cpp | 13 -----
src/libs/client/OSCClientReceiver.hpp | 1 -
src/libs/client/SigClientInterface.hpp | 3 -
src/libs/client/ThreadedSigClientInterface.hpp | 4 --
src/libs/engine/OSCClientSender.cpp | 79 --------------------------
src/libs/engine/OSCClientSender.hpp | 2 -
6 files changed, 102 deletions(-)
(limited to 'src/libs')
diff --git a/src/libs/client/OSCClientReceiver.cpp b/src/libs/client/OSCClientReceiver.cpp
index 5f12cd6e..23fcd871 100644
--- a/src/libs/client/OSCClientReceiver.cpp
+++ b/src/libs/client/OSCClientReceiver.cpp
@@ -141,7 +141,6 @@ 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/num_plugins", "i", num_plugins_cb, this);
lo_server_thread_add_method(_st, "/ingen/plugin", "ssss", 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);
@@ -351,18 +350,6 @@ OSCClientReceiver::_response_error_cb(const char* path, const char* types, lo_ar
}
-/** Number of plugins in engine, should precede /ingen/plugin messages in response
- * to a /ingen/send_plugins
- */
-int
-OSCClientReceiver::_num_plugins_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg)
-{
- num_plugins(argv[0]->i);
-
- return 0;
-}
-
-
/** A plugin info response from the server, in response to an /ingen/send_plugins
*/
int
diff --git a/src/libs/client/OSCClientReceiver.hpp b/src/libs/client/OSCClientReceiver.hpp
index eb1efd21..5913322c 100644
--- a/src/libs/client/OSCClientReceiver.hpp
+++ b/src/libs/client/OSCClientReceiver.hpp
@@ -81,7 +81,6 @@ private:
LO_HANDLER(error);
LO_HANDLER(response_ok);
LO_HANDLER(response_error);
- LO_HANDLER(num_plugins);
LO_HANDLER(plugin);
LO_HANDLER(plugin_list_end);
LO_HANDLER(new_patch);
diff --git a/src/libs/client/SigClientInterface.hpp b/src/libs/client/SigClientInterface.hpp
index dbedd79c..a272fdee 100644
--- a/src/libs/client/SigClientInterface.hpp
+++ b/src/libs/client/SigClientInterface.hpp
@@ -51,7 +51,6 @@ public:
sigc::signal<void> signal_bundle_begin;
sigc::signal<void> signal_bundle_end;
sigc::signal<void, string> signal_error;
- sigc::signal<void, uint32_t> signal_num_plugins;
sigc::signal<void, string, string, string, string> signal_new_plugin;
sigc::signal<void, string, uint32_t> signal_new_patch;
sigc::signal<void, string, string> signal_new_node;
@@ -90,8 +89,6 @@ protected:
void transfer_begin() {}
void transfer_end() {}
- void num_plugins(uint32_t num) { signal_num_plugins.emit(num); }
-
void response_ok(int32_t id)
{ if (_enabled) signal_response_ok.emit(id); }
diff --git a/src/libs/client/ThreadedSigClientInterface.hpp b/src/libs/client/ThreadedSigClientInterface.hpp
index fb6eb447..7cbb2bfe 100644
--- a/src/libs/client/ThreadedSigClientInterface.hpp
+++ b/src/libs/client/ThreadedSigClientInterface.hpp
@@ -80,8 +80,6 @@ public:
void transfer_begin() {}
void transfer_end() {}
- void num_plugins(uint32_t num) { _num_plugins = num; }
-
void response_ok(int32_t id)
{ push_sig(sigc::bind(response_ok_slot, id)); }
@@ -146,11 +144,9 @@ private:
void push_sig(Closure ev);
Raul::SRSWQueue<Closure> _sigs;
- uint32_t _num_plugins;
sigc::slot<void> bundle_begin_slot;
sigc::slot<void> bundle_end_slot;
- sigc::slot<void, uint32_t> num_plugins_slot;
sigc::slot<void, int32_t> response_ok_slot;
sigc::slot<void, int32_t, string> response_error_slot;
sigc::slot<void, string> error_slot;
diff --git a/src/libs/engine/OSCClientSender.cpp b/src/libs/engine/OSCClientSender.cpp
index 4073f994..4518bfdf 100644
--- a/src/libs/engine/OSCClientSender.cpp
+++ b/src/libs/engine/OSCClientSender.cpp
@@ -122,85 +122,6 @@ OSCClientSender::error(const std::string& msg)
}
-/** \page client_osc_namespace
- * <p> \b /ingen/num_plugins
- * \arg \b num (int) - Number of plugins engine has loaded\n\n
- * \li This is sent before sending the list of plugins, so the client is aware
- * of how many plugins (/ingen/plugin messages) to expect.</p> \n \n
- */
-
-
-/** \page client_osc_namespace
- * <p> \b /ingen/num_plugins
- * \arg \b num (int) - Number of plugins engine has loaded\n\n
- * \li This is sent before sending the list of plugins, so the client is aware
- * of how many plugins (/ingen/plugin messages) to expect.</p> \n \n
- */
-void
-OSCClientSender::num_plugins(uint32_t num)
-{
- send("/ingen/num_plugins", "i", num, LO_ARGS_END);
-}
-
-
-/** \page client_osc_namespace
- * <p> \b /ingen/plugin - Notification of the existance of a plugin
- * \arg \b type (string) - Type if plugin ("LADSPA", "LV2", or "Internal")
- * \arg \b uri (string) - URI of the plugin (see engine namespace documentation) \n
- * \arg \b lib-name (string) - Name of shared library plugin resides in (ie "cmt.so")
- * \arg \b plug-label (string) - Label of the plugin (ie "dahdsr_iaoa")
- * \arg \b name (string) - Descriptive human-readable name of plugin (ie "ADSR Envelope")
- * </p> \n \n
- */
-/*
-void
-OSCClientSender::plugins()
-{
- Engine::instance().node_factory()->lock_plugin_list();
-
- const list<Plugin*>& plugs = Engine::instance().node_factory()->plugins();
- const Plugin* plugin;
-
- lo_timetag tt;
- lo_timetag_now(&tt);
- lo_bundle b = lo_bundle_new(tt);
- lo_message m = lo_message_new();
- list<lo_message> msgs;
-
- lo_message_add_int32(m, plugs.size());
- lo_bundle_add_message(b, "/ingen/num_plugins", m);
- msgs.push_back(m);
-
- for (list<Plugin*>::const_iterator j = plugs.begin(); j != plugs.end(); ++j) {
- plugin = (*j);
- m = lo_message_new();
-
- lo_message_add_string(m, plugin->type_const std::string&());
- lo_message_add_string(m, plugin->uri().c_str());
- lo_message_add_string(m, plugin->plug_label().c_str());
- lo_message_add_string(m, plugin->name().c_str());
- lo_bundle_add_message(b, "/ingen/plugin", m);
- msgs.push_back(m);
- if (lo_bundle_length(b) > 1024) {
- lo_send_bundle(_address, b);
- lo_bundle_free(b);
- b = lo_bundle_new(tt);
- }
- }
-
- if (lo_bundle_length(b) > 0) {
- lo_send_bundle(_address, b);
- lo_bundle_free(b);
- } else {
- lo_bundle_free(b);
- }
- for (list<lo_bundle>::const_iterator i = msgs.begin(); i != msgs.end(); ++i)
- lo_message_free(*i);
-
- Engine::instance().node_factory()->unlock_plugin_list();
-}
-*/
-
/** \page client_osc_namespace
* <p> \b /ingen/new_node - Notification of a new node's creation.
* \arg \b plug-uri (string) - URI of the plugin new node is an instance of
diff --git a/src/libs/engine/OSCClientSender.hpp b/src/libs/engine/OSCClientSender.hpp
index 9a79f934..1b890ddd 100644
--- a/src/libs/engine/OSCClientSender.hpp
+++ b/src/libs/engine/OSCClientSender.hpp
@@ -67,8 +67,6 @@ public:
void response_ok(int32_t id);
void response_error(int32_t id, const std::string& msg);
- void num_plugins(uint32_t num);
-
void error(const std::string& msg);
virtual void new_plugin(const std::string& uri,
--
cgit v1.2.1