summaryrefslogtreecommitdiffstats
path: root/src/client
diff options
context:
space:
mode:
Diffstat (limited to 'src/client')
-rw-r--r--src/client/DeprecatedLoader.cpp8
-rw-r--r--src/client/HTTPEngineSender.cpp13
-rw-r--r--src/client/HTTPEngineSender.hpp5
-rw-r--r--src/client/OSCEngineSender.cpp20
-rw-r--r--src/client/OSCEngineSender.hpp5
5 files changed, 4 insertions, 47 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);