Remove deprecated new_node interface in favour of URI hackery.

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

12 files changed, 14 insertions, 130 deletions

diff --git a/src/client/DeprecatedLoader.cpp b/src/client/DeprecatedLoader.cpp
index ac693421..5a315813 100644
--- a/src/client/DeprecatedLoader.cpp
+++ b/src/client/DeprecatedLoader.cpp
@@ -505,10 +505,10 @@ DeprecatedLoader::load_node(const Path& parent, xmlDocPtr doc, const xmlNodePtr
 				plugin_uri = NS_INTERNALS "Trigger";
 			}
 
-			if (plugin_uri != "")
-				_engine->new_node(path, plugin_uri);
-			else
-				_engine->new_node_deprecated(path, plugin_type, library_name, plugin_label);
+			if (plugin_uri == "")
+				plugin_uri = "om:" + plugin_type + ":" + library_name + ":" + plugin_label;
+
+			_engine->new_node(path, plugin_uri);
 
 			_engine->set_variable(path, "ingen:polyphonic", bool(polyphonic));
 		
diff --git a/src/client/HTTPEngineSender.cpp b/src/client/HTTPEngineSender.cpp
index 4a54183d..55119160 100644
--- a/src/client/HTTPEngineSender.cpp
+++ b/src/client/HTTPEngineSender.cpp
@@ -137,19 +137,6 @@ HTTPEngineSender::new_node(const string& path,
 }
 
 
-/** Create a node using library name and plugin label (DEPRECATED).
- *
- * DO NOT USE THIS.
- */
-void
-HTTPEngineSender::new_node_deprecated(const string& path,
-                                      const string& plugin_type,
-                                      const string& library_name,
-                                      const string& plugin_label)
-{
-}
-
-
 void
 HTTPEngineSender::rename(const string& old_path,
                          const string& new_name)
diff --git a/src/client/HTTPEngineSender.hpp b/src/client/HTTPEngineSender.hpp
index 88f3a132..1579e120 100644
--- a/src/client/HTTPEngineSender.hpp
+++ b/src/client/HTTPEngineSender.hpp
@@ -89,11 +89,6 @@ public:
 	void new_node(const string& path,
 	              const string& plugin_uri);
 	
-	void new_node_deprecated(const string& path,
-	                         const string& plugin_type,
-	                         const string& library_name,
-	                         const string& plugin_label);
-
 	void rename(const string& old_path,
 	            const string& new_name);
 
diff --git a/src/client/OSCEngineSender.cpp b/src/client/OSCEngineSender.cpp
index 0dfa9d5b..8ff0b226 100644
--- a/src/client/OSCEngineSender.cpp
+++ b/src/client/OSCEngineSender.cpp
@@ -199,26 +199,6 @@ OSCEngineSender::new_node(const string& path,
 }
 
 
-/** Create a node using library name and plugin label (DEPRECATED).
- *
- * DO NOT USE THIS.
- */
-void
-OSCEngineSender::new_node_deprecated(const string& path,
-                                     const string& plugin_type,
-                                     const string& library_name,
-                                     const string& plugin_label)
-{
-	send("/ingen/new_node",  "issss",
-		next_id(),
-		path.c_str(),
-		plugin_type.c_str(),
-		library_name.c_str(),
-		plugin_label.c_str(),
-		LO_ARGS_END);
-}
-
-
 void
 OSCEngineSender::rename(const string& old_path,
                         const string& new_name)
diff --git a/src/client/OSCEngineSender.hpp b/src/client/OSCEngineSender.hpp
index 620a73da..cae8586a 100644
--- a/src/client/OSCEngineSender.hpp
+++ b/src/client/OSCEngineSender.hpp
@@ -93,11 +93,6 @@ public:
 	void new_node(const string& path,
 	              const string& plugin_uri);
 	
-	void new_node_deprecated(const string& path,
-	                         const string& plugin_type,
-	                         const string& library_name,
-	                         const string& plugin_label);
-
 	void rename(const string& old_path,
 	            const string& new_name);
 
diff --git a/src/common/interface/EngineInterface.hpp b/src/common/interface/EngineInterface.hpp
index 2e84e4e3..14289c20 100644
--- a/src/common/interface/EngineInterface.hpp
+++ b/src/common/interface/EngineInterface.hpp
@@ -56,12 +56,6 @@ public:
 	
 	// Object commands
 	
-	/** DEPRECATED */
-	virtual void new_node_deprecated(const std::string& path,
-	                                 const std::string& plugin_type,
-	                                 const std::string& library_name,
-	                                 const std::string& plugin_label) = 0;
-
 	virtual void disconnect_all(const std::string& parent_patch_path,
 	                            const std::string& path) = 0;
 	
diff --git a/src/engine/OSCEngineReceiver.cpp b/src/engine/OSCEngineReceiver.cpp
index e2377d95..cb859ad8 100644
--- a/src/engine/OSCEngineReceiver.cpp
+++ b/src/engine/OSCEngineReceiver.cpp
@@ -94,9 +94,6 @@ 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", "issss", new_node_cb, this);
-	lo_server_add_method(_server, "/ingen/new_node", "issss", new_node_cb, this);
-	lo_server_add_method(_server, "/ingen/new_node", "iss", new_node_by_uri_cb, this);
 	lo_server_add_method(_server, "/ingen/new_node", "iss", new_node_by_uri_cb, this);
 	lo_server_add_method(_server, "/ingen/destroy", "is", destroy_cb, this);
 	lo_server_add_method(_server, "/ingen/rename", "iss", rename_cb, this);
@@ -456,31 +453,6 @@ OSCEngineReceiver::_new_node_by_uri_cb(const char* path, const char* types, lo_a
 
 
 /** \page engine_osc_namespace
- * <p> \b /ingen/new_node - Add a node into a given patch (load a plugin by libname, label) \b DEPRECATED
- * \arg \b response-id (integer)
- * \arg \b node-path (string) - Full path of the new node (ie. /patch2/subpatch/newnode)
- * \arg \b type (string) - Plugin type ("LADSPA" or "Internal")
- * \arg \b lib-name (string) - Name of library where plugin resides (eg "cmt.so")
- * \arg \b plug-label (string) - Label (ID) of plugin (eg "sine_fcaa") \n \n
- *
- * \li This is only here to provide backwards compatibility for old patches that store LADSPA plugin
- * references as libname, label.  It is to be removed ASAP, don't use it.
- * </p> \n \n
- */
-int
-OSCEngineReceiver::_new_node_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg)
-{
-	const char* node_path   = &argv[1]->s;
-	const char* type        = &argv[2]->s;
-	const char* lib_name    = &argv[3]->s;
-	const char* plug_label  = &argv[4]->s;
-	
-	new_node_deprecated(node_path, type, lib_name, plug_label);
-	return 0;
-}
-
-
-/** \page engine_osc_namespace
  * <p> \b /ingen/destroy - Removes (destroys) a Patch or a Node
  * \arg \b response-id (integer)
  * \arg \b node-path (string) - Full path of the object </p> \n \n
diff --git a/src/engine/OSCEngineReceiver.hpp b/src/engine/OSCEngineReceiver.hpp
index 6ab017d0..b3ccc6a5 100644
--- a/src/engine/OSCEngineReceiver.hpp
+++ b/src/engine/OSCEngineReceiver.hpp
@@ -94,7 +94,6 @@ private:
 	LO_HANDLER(new_patch);
 	LO_HANDLER(rename);
 	LO_HANDLER(new_port);
-	LO_HANDLER(new_node);
 	LO_HANDLER(new_node_by_uri);
 	LO_HANDLER(clear_patch);
 	LO_HANDLER(set_polyphony);
diff --git a/src/engine/QueuedEngineInterface.cpp b/src/engine/QueuedEngineInterface.cpp
index 00d142c9..4c24c405 100644
--- a/src/engine/QueuedEngineInterface.cpp
+++ b/src/engine/QueuedEngineInterface.cpp
@@ -174,22 +174,11 @@ void
 QueuedEngineInterface::new_node(const string& path,
                                 const string& plugin_uri)
 {
-	push_queued(new CreateNodeEvent(_engine, _responder, now(),
-		path, plugin_uri, true)); // FIXME: polyphonic by default
+	push_queued(new CreateNodeEvent(_engine, _responder, now(), path, plugin_uri, true));
 }
 
 
 void
-QueuedEngineInterface::new_node_deprecated(const string& path,
-                                           const string& plugin_type,
-                                           const string& plugin_lib,
-                                           const string& plugin_label)
-{
-	push_queued(new CreateNodeEvent(_engine, _responder, now(),
-		path, plugin_type, plugin_lib, plugin_label, true)); // FIXME: polyphonic by default
-}
-
-void
 QueuedEngineInterface::rename(const string& old_path,
                               const string& new_path)
 {
diff --git a/src/engine/QueuedEngineInterface.hpp b/src/engine/QueuedEngineInterface.hpp
index ed50f7c8..bd90e097 100644
--- a/src/engine/QueuedEngineInterface.hpp
+++ b/src/engine/QueuedEngineInterface.hpp
@@ -86,12 +86,6 @@ public:
 	virtual void new_node(const string& path,
 	                      const string& plugin_uri);
 	
-	/** FIXME: DEPRECATED, REMOVE */
-	virtual void new_node_deprecated(const string& path,
-	                                 const string& plugin_type,
-	                                 const string& lib_path,
-	                                 const string& plug_label);
-
 	virtual void rename(const string& old_path,
 	                    const string& new_name);
 
diff --git a/src/engine/events/CreateNodeEvent.cpp b/src/engine/events/CreateNodeEvent.cpp
index d88afb89..41470d45 100644
--- a/src/engine/events/CreateNodeEvent.cpp
+++ b/src/engine/events/CreateNodeEvent.cpp
@@ -47,26 +47,15 @@ CreateNodeEvent::CreateNodeEvent(Engine& engine, SharedPtr<Responder> responder,
 	, _compiled_patch(NULL)
 	, _node_already_exists(false)
 {
-}
-
-
-/** DEPRECATED: Construct from type, library name, and plugin label.
- *
- * Do not use.
- */
-CreateNodeEvent::CreateNodeEvent(Engine& engine, SharedPtr<Responder> responder, SampleCount timestamp, const string& path,
-		const string& plugin_type, const string& plugin_lib, const string& plugin_label, bool polyphonic)
-: QueuedEvent(engine, responder, timestamp),
-  _path(path),
-  _plugin_type(plugin_type),
-  _plugin_lib(plugin_lib),
-  _plugin_label(plugin_label),
-  _polyphonic(polyphonic),
-  _patch(NULL),
-  _node(NULL),
-  _compiled_patch(NULL),
-  _node_already_exists(false)
-{
+	if (_plugin_uri.substr(0, 3) == "om:") {
+		size_t colon = 2;
+		_plugin_uri = _plugin_uri.substr(colon + 1);
+		if ((colon = _plugin_uri.find(":")) == string::npos)
+			return;
+		_plugin_type = _plugin_uri.substr(0, colon + 1);
+		_plugin_label = _plugin_uri.substr(colon + 1);
+		_plugin_uri = "";
+	}
 }
 
 
diff --git a/src/engine/events/CreateNodeEvent.hpp b/src/engine/events/CreateNodeEvent.hpp
index 6b9e4f30..61fd2c5c 100644
--- a/src/engine/events/CreateNodeEvent.hpp
+++ b/src/engine/events/CreateNodeEvent.hpp
@@ -47,16 +47,6 @@ public:
 	                 const string&        plugin_uri,
 	                 bool                 poly);
 	
-	// DEPRECATED
-	CreateNodeEvent(Engine&              engine,
-	                SharedPtr<Responder> responder,
-	                SampleCount          timestamp,
-	                const string&        node_path,
-	                const string&        plugin_type,
-	                const string&        lib_name,
-	                const string&        plugin_label,
-	                bool                 poly);
-
 	void pre_process();
 	void execute(ProcessContext& context);
 	void post_process();