From f2135439b806e9c375f2e8588be23ea53c69832c Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 28 May 2009 16:41:02 +0000 Subject: Merge request_object and request_plugin. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2028 a436a847-0d15-0410-975c-d299462d15a1 --- src/client/HTTPEngineSender.cpp | 8 +------- src/client/HTTPEngineSender.hpp | 3 +-- src/client/OSCEngineSender.cpp | 14 ++------------ src/client/OSCEngineSender.hpp | 3 +-- 4 files changed, 5 insertions(+), 23 deletions(-) (limited to 'src/client') diff --git a/src/client/HTTPEngineSender.cpp b/src/client/HTTPEngineSender.cpp index 18b92cad..0a9428e5 100644 --- a/src/client/HTTPEngineSender.cpp +++ b/src/client/HTTPEngineSender.cpp @@ -190,13 +190,7 @@ HTTPEngineSender::ping() void -HTTPEngineSender::request_plugin(const URI& uri) -{ -} - - -void -HTTPEngineSender::request_object(const Path& path) +HTTPEngineSender::request_object(const URI& uri) { } diff --git a/src/client/HTTPEngineSender.hpp b/src/client/HTTPEngineSender.hpp index ee27e1de..7ec4fac8 100644 --- a/src/client/HTTPEngineSender.hpp +++ b/src/client/HTTPEngineSender.hpp @@ -109,8 +109,7 @@ public: // Requests // void ping(); - void request_plugin(const Raul::URI& uri); - void request_object(const Raul::Path& path); + void request_object(const Raul::URI& uri); void request_variable(const Raul::URI& path, const Raul::URI& key); void request_property(const Raul::URI& path, const Raul::URI& key); void request_plugins(); diff --git a/src/client/OSCEngineSender.cpp b/src/client/OSCEngineSender.cpp index 775dd047..bcc39430 100644 --- a/src/client/OSCEngineSender.cpp +++ b/src/client/OSCEngineSender.cpp @@ -280,21 +280,11 @@ OSCEngineSender::ping() void -OSCEngineSender::request_plugin(const URI& uri) -{ - send("/ingen/request_plugin", "is", - next_id(), - uri.c_str(), - LO_ARGS_END); -} - - -void -OSCEngineSender::request_object(const Path& path) +OSCEngineSender::request_object(const URI& uri) { send("/ingen/request_object", "is", next_id(), - path.c_str(), + uri.c_str(), LO_ARGS_END); } diff --git a/src/client/OSCEngineSender.hpp b/src/client/OSCEngineSender.hpp index 187093d3..3f11f96c 100644 --- a/src/client/OSCEngineSender.hpp +++ b/src/client/OSCEngineSender.hpp @@ -112,8 +112,7 @@ public: // Requests // void ping(); - void request_plugin(const Raul::URI& uri); - void request_object(const Raul::Path& path); + void request_object(const Raul::URI& uri); void request_variable(const Raul::URI& path, const Raul::URI& key); void request_property(const Raul::URI& path, const Raul::URI& key); void request_plugins(); -- cgit v1.2.1