summaryrefslogtreecommitdiffstats
path: root/src/libs/engine
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2008-08-16 23:30:21 +0000
committerDavid Robillard <d@drobilla.net>2008-08-16 23:30:21 +0000
commit3dc90cc95df35e5c786857336f22856c6373b00f (patch)
tree5d59f52c6242e6a0fced015542bd966f33779815 /src/libs/engine
parentd72ed9fd506756c83d97b62f6640135f3b8c32bb (diff)
downloadingen-3dc90cc95df35e5c786857336f22856c6373b00f.tar.gz
ingen-3dc90cc95df35e5c786857336f22856c6373b00f.tar.bz2
ingen-3dc90cc95df35e5c786857336f22856c6373b00f.zip
Clooser...
git-svn-id: http://svn.drobilla.net/lad/ingen@1408 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/libs/engine')
-rw-r--r--src/libs/engine/OSCClientSender.cpp18
-rw-r--r--src/libs/engine/OSCClientSender.hpp7
-rw-r--r--src/libs/engine/OSCEngineReceiver.cpp2
-rw-r--r--src/libs/engine/ObjectSender.cpp2
-rw-r--r--src/libs/engine/QueuedEngineInterface.cpp10
-rw-r--r--src/libs/engine/QueuedEngineInterface.hpp10
6 files changed, 23 insertions, 26 deletions
diff --git a/src/libs/engine/OSCClientSender.cpp b/src/libs/engine/OSCClientSender.cpp
index 2c7b5825..c9b156db 100644
--- a/src/libs/engine/OSCClientSender.cpp
+++ b/src/libs/engine/OSCClientSender.cpp
@@ -289,23 +289,21 @@ OSCClientSender::plugins()
* <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
* \arg \b path (string) - Path of the new node
- * \arg \b polyphonic (boolean) - Node is polyphonic
- * \arg \b num-ports (integer) - Number of ports (number of new_port messages to expect)\n\n
+ * \arg \b polyphonic (boolean) - Node is polyphonic\n\n
* \li New nodes are sent as a bundle. The first message in the bundle will be
* this one (/ingen/new_node), followed by a series of /ingen/new_port commands,
* followed by /ingen/new_node_end. </p> \n \n
*/
-void OSCClientSender::new_node(const std::string& plugin_uri,
- const std::string& node_path,
- bool is_polyphonic,
- uint32_t num_ports)
+void OSCClientSender::new_node(const std::string& node_path,
+ const std::string& plugin_uri,
+ bool is_polyphonic)
{
if (is_polyphonic)
- send("/ingen/new_node", "ssTi", plugin_uri.c_str(),
- node_path.c_str(), num_ports, LO_ARGS_END);
+ send("/ingen/new_node", "ssT", node_path.c_str(),
+ plugin_uri.c_str(), LO_ARGS_END);
else
- send("/ingen/new_node", "ssFi", plugin_uri.c_str(),
- node_path.c_str(), num_ports, LO_ARGS_END);
+ send("/ingen/new_node", "ssF", node_path.c_str(),
+ plugin_uri.c_str(), LO_ARGS_END);
}
diff --git a/src/libs/engine/OSCClientSender.hpp b/src/libs/engine/OSCClientSender.hpp
index 77cafbd8..cc700e38 100644
--- a/src/libs/engine/OSCClientSender.hpp
+++ b/src/libs/engine/OSCClientSender.hpp
@@ -84,10 +84,9 @@ public:
virtual void new_patch(const std::string& path, uint32_t poly);
- virtual void new_node(const std::string& plugin_uri,
- const std::string& node_path,
- bool is_polyphonic,
- uint32_t num_ports);
+ virtual void new_node(const std::string& path,
+ const std::string& plugin_uri,
+ bool is_polyphonic);
virtual void new_port(const std::string& path,
uint32_t index,
diff --git a/src/libs/engine/OSCEngineReceiver.cpp b/src/libs/engine/OSCEngineReceiver.cpp
index e8f22a2d..4cc27367 100644
--- a/src/libs/engine/OSCEngineReceiver.cpp
+++ b/src/libs/engine/OSCEngineReceiver.cpp
@@ -544,7 +544,7 @@ OSCEngineReceiver::_new_node_cb(const char* path, const char* types, lo_arg** ar
const char* plug_label = &argv[4]->s;
bool polyphonic = (types[5] == 'T');
- new_node(node_path, type, lib_name, plug_label, polyphonic);
+ new_node_deprecated(node_path, type, lib_name, plug_label, polyphonic);
return 0;
}
diff --git a/src/libs/engine/ObjectSender.cpp b/src/libs/engine/ObjectSender.cpp
index 5a4436c0..5e456dbc 100644
--- a/src/libs/engine/ObjectSender.cpp
+++ b/src/libs/engine/ObjectSender.cpp
@@ -95,7 +95,7 @@ ObjectSender::send_node(ClientInterface* client, const NodeImpl* node, bool recu
client->bundle_begin();
- client->new_node(node->plugin()->uri(), node->path(), node->polyphonic(), node->num_ports());
+ client->new_node(node->path(), node->plugin()->uri(), node->polyphonic());
client->polyphonic(node->path(), node->polyphonic());
// Send variable
diff --git a/src/libs/engine/QueuedEngineInterface.cpp b/src/libs/engine/QueuedEngineInterface.cpp
index 5a174bf6..65f2c14b 100644
--- a/src/libs/engine/QueuedEngineInterface.cpp
+++ b/src/libs/engine/QueuedEngineInterface.cpp
@@ -164,11 +164,11 @@ QueuedEngineInterface::new_node(const string& path,
void
-QueuedEngineInterface::new_node(const string& path,
- const string& plugin_type,
- const string& plugin_lib,
- const string& plugin_label,
- bool polyphonic)
+QueuedEngineInterface::new_node_deprecated(const string& path,
+ const string& plugin_type,
+ const string& plugin_lib,
+ const string& plugin_label,
+ bool polyphonic)
{
push_queued(new CreateNodeEvent(_engine, _responder, now(),
path, plugin_type, plugin_lib, plugin_label, polyphonic));
diff --git a/src/libs/engine/QueuedEngineInterface.hpp b/src/libs/engine/QueuedEngineInterface.hpp
index 36f16aec..280e9b4e 100644
--- a/src/libs/engine/QueuedEngineInterface.hpp
+++ b/src/libs/engine/QueuedEngineInterface.hpp
@@ -93,11 +93,11 @@ public:
bool polyphonic);
/** FIXME: DEPRECATED, REMOVE */
- virtual void new_node(const string& path,
- const string& plugin_type,
- const string& lib_path,
- const string& plug_label,
- bool polyphonic);
+ virtual void new_node_deprecated(const string& path,
+ const string& plugin_type,
+ const string& lib_path,
+ const string& plug_label,
+ bool polyphonic);
virtual void rename(const string& old_path,
const string& new_name);