diff options
Diffstat (limited to 'src/engine')
-rw-r--r-- | src/engine/OSCEngineReceiver.cpp | 32 | ||||
-rw-r--r-- | src/engine/OSCEngineReceiver.hpp | 2 | ||||
-rw-r--r-- | src/engine/QueuedEngineInterface.cpp | 2 | ||||
-rw-r--r-- | src/engine/QueuedEngineInterface.hpp | 2 |
4 files changed, 19 insertions, 19 deletions
diff --git a/src/engine/OSCEngineReceiver.cpp b/src/engine/OSCEngineReceiver.cpp index c1c1feac..10e725c1 100644 --- a/src/engine/OSCEngineReceiver.cpp +++ b/src/engine/OSCEngineReceiver.cpp @@ -107,7 +107,7 @@ OSCEngineReceiver::OSCEngineReceiver(Engine& engine, size_t queue_size, uint16_t // Queries lo_server_add_method(_server, "/ingen/request_property", "iss", request_property_cb, this); - lo_server_add_method(_server, "/ingen/request_object", "is", request_object_cb, this); + lo_server_add_method(_server, "/ingen/get", "is", get_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); @@ -375,6 +375,21 @@ OSCEngineReceiver::_engine_deactivate_cb(const char* path, const char* types, lo /** \page engine_osc_namespace + * <h2>/ingen/get</h2> + * \arg \b response-id (integer) + * \arg \b uri (string) - URI of object (patch, port, node, plugin) to send + * + * Request all properties of an object. + */ +int +OSCEngineReceiver::_get_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg) +{ + get(&argv[1]->s); + return 0; +} + + +/** \page engine_osc_namespace * <h2>/ingen/put</h2> * \arg \b response-id (integer) * \arg \b path (string) - Path of object @@ -685,21 +700,6 @@ OSCEngineReceiver::_request_property_cb(const char* path, const char* types, lo_ /** \page engine_osc_namespace - * <h2>/ingen/request_object</h2> - * \arg \b response-id (integer) - * \arg \b uri (string) - URI of object (patch, port, node, plugin) to send - * - * 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) -{ - request_object(&argv[1]->s); - return 0; -} - - -/** \page engine_osc_namespace * <h2>/ingen/request_plugins</h2> * \arg \b response-id (integer) * diff --git a/src/engine/OSCEngineReceiver.hpp b/src/engine/OSCEngineReceiver.hpp index dc450f18..c1061792 100644 --- a/src/engine/OSCEngineReceiver.hpp +++ b/src/engine/OSCEngineReceiver.hpp @@ -89,6 +89,7 @@ private: LO_HANDLER(load_plugins); LO_HANDLER(engine_activate); LO_HANDLER(engine_deactivate); + LO_HANDLER(get); LO_HANDLER(put); LO_HANDLER(move); LO_HANDLER(del); @@ -103,7 +104,6 @@ private: LO_HANDLER(midi_learn); LO_HANDLER(set_property); LO_HANDLER(property_set); - LO_HANDLER(request_object); LO_HANDLER(request_property); LO_HANDLER(request_plugins); LO_HANDLER(request_all_objects); diff --git a/src/engine/QueuedEngineInterface.cpp b/src/engine/QueuedEngineInterface.cpp index 7e824cae..a6a3f1cd 100644 --- a/src/engine/QueuedEngineInterface.cpp +++ b/src/engine/QueuedEngineInterface.cpp @@ -268,7 +268,7 @@ QueuedEngineInterface::ping() void -QueuedEngineInterface::request_object(const URI& uri) +QueuedEngineInterface::get(const URI& uri) { push_queued(new GetEvent(_engine, _responder, now(), uri)); } diff --git a/src/engine/QueuedEngineInterface.hpp b/src/engine/QueuedEngineInterface.hpp index 556c8049..4ba07540 100644 --- a/src/engine/QueuedEngineInterface.hpp +++ b/src/engine/QueuedEngineInterface.hpp @@ -108,7 +108,7 @@ public: // Requests // virtual void ping(); - virtual void request_object(const Raul::URI& uri); + virtual void get(const Raul::URI& uri); virtual void request_property(const Raul::URI& object_path, const Raul::URI& key); virtual void request_plugins(); virtual void request_all_objects(); |