Remove 'new_patch', 'new_node', and 'new_port' from interface in favour of generic 'put'.

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2011 a436a847-0d15-0410-975c-d299462d15a1

1 files changed, 1 insertions, 54 deletions

diff --git a/src/engine/OSCEngineReceiver.cpp b/src/engine/OSCEngineReceiver.cpp
index 8fa92803..37a8132a 100644
--- a/src/engine/OSCEngineReceiver.cpp
+++ b/src/engine/OSCEngineReceiver.cpp
@@ -94,7 +94,7 @@ OSCEngineReceiver::OSCEngineReceiver(Engine& engine, size_t queue_size, uint16_t
 	lo_server_add_method(_server, "/ingen/set_polyphonic", "isT", set_polyphonic_cb, this);
 	lo_server_add_method(_server, "/ingen/set_polyphonic", "isF", set_polyphonic_cb, this);
 	lo_server_add_method(_server, "/ingen/new_port", "issi", new_port_cb, this);
-	lo_server_add_method(_server, "/ingen/new_node", "iss", new_node_by_uri_cb, this);
+	lo_server_add_method(_server, "/ingen/put", NULL, new_port_cb, this);
 	lo_server_add_method(_server, "/ingen/destroy", "is", destroy_cb, this);
 	lo_server_add_method(_server, "/ingen/rename", "iss", rename_cb, this);
 	lo_server_add_method(_server, "/ingen/connect", "iss", connect_cb, this);
@@ -366,23 +366,6 @@ OSCEngineReceiver::_engine_deactivate_cb(const char* path, const char* types, lo
 
 
 /** \page engine_osc_namespace
- * <p> \b /ingen/new_patch - Creates a new, empty, toplevel patch.
- * \arg \b response-id  (integer)
- * \arg \b patch-path  (string) - Patch path (complete, ie /master/parent/new_patch)
- * \arg \b poly        (integer) - Patch's (internal) polyphony </p> \n \n
- */
-int
-OSCEngineReceiver::_new_patch_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg)
-{
-	const char*   patch_path  = &argv[1]->s;
-	const int32_t poly        =  argv[2]->i;
-
-	new_patch(patch_path, poly);
-	return 0;
-}
-
-
-/** \page engine_osc_namespace
  * <p> \b /ingen/rename - Rename an Object (only Nodes, for now)
  * \arg \b response-id (integer)
  * \arg \b old-path - Object's path
@@ -414,42 +397,6 @@ OSCEngineReceiver::_clear_patch_cb(const char* path, const char* types, lo_arg**
 }
 
 
-// FIXME: add index
-/** \page engine_osc_namespace
- * <p> \b /ingen/new_port - Add a port into a given patch (load a plugin by URI)
- * \arg \b response-id (integer)
- * \arg \b path (string) - Full path of the new port (ie. /patch2/subpatch/newport)
- * \arg \b data-type (string) - Type of port (lv2:AudioPort, lv2:ControlPort, lv2ev:EventPort)
- * \arg \b direction ("is-output") (integer) - Direction of data flow (Input = 0, Output = 1) </p> \n \n
- */
-int
-OSCEngineReceiver::_new_port_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg)
-{
-	const char*   port_path   = &argv[1]->s;
-	const char*   data_type   = &argv[2]->s;
-	const int32_t direction   =  argv[3]->i;
-
-	new_port(port_path, data_type, 0, (direction == 1));
-	return 0;
-}
-
-/** \page engine_osc_namespace
- * <p> \b /ingen/new_node - Add a node into a given patch (load a plugin by URI)
- * \arg \b response-id (integer)
- * \arg \b node-path (string) - Full path of the new node (ie. /patch2/subpatch/newnode)
- * \arg \b plug-uri (string) - URI of the plugin to load \n \n
- */
-int
-OSCEngineReceiver::_new_node_by_uri_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg)
-{
-	const char* node_path  = &argv[1]->s;
-	const char* plug_uri   = &argv[2]->s;
-
-	new_node(node_path, plug_uri);
-	return 0;
-}
-
-
 /** \page engine_osc_namespace
  * <p> \b /ingen/destroy - Removes (destroys) a Patch or a Node
  * \arg \b response-id (integer)