Merge request_object and request_plugin.

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

1 files changed, 3 insertions, 23 deletions

diff --git a/src/engine/OSCEngineReceiver.cpp b/src/engine/OSCEngineReceiver.cpp
index e9a66665..912a2969 100644
--- a/src/engine/OSCEngineReceiver.cpp
+++ b/src/engine/OSCEngineReceiver.cpp
@@ -108,7 +108,6 @@ OSCEngineReceiver::OSCEngineReceiver(Engine& engine, size_t queue_size, uint16_t
 
 	// Queries
 	lo_server_add_method(_server, "/ingen/request_variable", "iss", variable_get_cb, this);
-	lo_server_add_method(_server, "/ingen/request_plugin", "is", request_plugin_cb, this);
 	lo_server_add_method(_server, "/ingen/request_object", "is", request_object_cb, this);
 	lo_server_add_method(_server, "/ingen/request_plugins", "i", request_plugins_cb, this);
 	lo_server_add_method(_server, "/ingen/request_all_objects", "i", request_all_objects_cb, this);
@@ -687,35 +686,16 @@ OSCEngineReceiver::_variable_get_cb(const char* path, const char* types, lo_arg*
 
 
 /** \page engine_osc_namespace
- * <h2>/ingen/request_plugin</h2>
- * \arg \b response-id (integer)
- * \arg \b port-path (string) - Full path of port to send the value of
- *
- * Request the value of a port.
- */
-int
-OSCEngineReceiver::_request_plugin_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg)
-{
-	const char* uri = &argv[1]->s;
-
-	request_plugin(uri);
-	return 0;
-}
-
-
-/** \page engine_osc_namespace
  * <h2>/ingen/request_object</h2>
  * \arg \b response-id (integer)
- * \arg \b port-path (string) - Full path of port to send the value of \n\n
+ * \arg \b uri (string) - URI of object (patch, port, node, plugin) to send
  *
- * Request all properties of a graph object.
+ * Request all properties of an object.
  */
 int
 OSCEngineReceiver::_request_object_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg)
 {
-	const char* object_path = &argv[1]->s;
-
-	request_object(object_path);
+	request_object(&argv[1]->s);
 	return 0;
 }