summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/client/HTTPEngineSender.cpp2
-rw-r--r--src/client/HTTPEngineSender.hpp2
-rw-r--r--src/client/OSCEngineSender.cpp4
-rw-r--r--src/client/OSCEngineSender.hpp2
-rw-r--r--src/common/interface/EngineInterface.hpp2
-rw-r--r--src/engine/OSCEngineReceiver.cpp32
-rw-r--r--src/engine/OSCEngineReceiver.hpp2
-rw-r--r--src/engine/QueuedEngineInterface.cpp2
-rw-r--r--src/engine/QueuedEngineInterface.hpp2
-rw-r--r--src/gui/PatchView.cpp2
10 files changed, 26 insertions, 26 deletions
diff --git a/src/client/HTTPEngineSender.cpp b/src/client/HTTPEngineSender.cpp
index 41b87524..692d01fc 100644
--- a/src/client/HTTPEngineSender.cpp
+++ b/src/client/HTTPEngineSender.cpp
@@ -190,7 +190,7 @@ HTTPEngineSender::ping()
void
-HTTPEngineSender::request_object(const URI& uri)
+HTTPEngineSender::get(const URI& uri)
{
}
diff --git a/src/client/HTTPEngineSender.hpp b/src/client/HTTPEngineSender.hpp
index 26a2addd..00df2d7e 100644
--- a/src/client/HTTPEngineSender.hpp
+++ b/src/client/HTTPEngineSender.hpp
@@ -109,7 +109,7 @@ public:
// Requests //
void ping();
- void request_object(const Raul::URI& uri);
+ void get(const Raul::URI& uri);
void request_property(const Raul::URI& path, const Raul::URI& key);
void request_plugins();
void request_all_objects();
diff --git a/src/client/OSCEngineSender.cpp b/src/client/OSCEngineSender.cpp
index dfec86fe..516f6c4a 100644
--- a/src/client/OSCEngineSender.cpp
+++ b/src/client/OSCEngineSender.cpp
@@ -280,9 +280,9 @@ OSCEngineSender::ping()
void
-OSCEngineSender::request_object(const URI& uri)
+OSCEngineSender::get(const URI& uri)
{
- send("/ingen/request_object", "is",
+ send("/ingen/get", "is",
next_id(),
uri.c_str(),
LO_ARGS_END);
diff --git a/src/client/OSCEngineSender.hpp b/src/client/OSCEngineSender.hpp
index becf1ccb..d7204413 100644
--- a/src/client/OSCEngineSender.hpp
+++ b/src/client/OSCEngineSender.hpp
@@ -112,7 +112,7 @@ public:
// Requests //
void ping();
- void request_object(const Raul::URI& uri);
+ void get(const Raul::URI& uri);
void request_property(const Raul::URI& path, const Raul::URI& key);
void request_plugins();
void request_all_objects();
diff --git a/src/common/interface/EngineInterface.hpp b/src/common/interface/EngineInterface.hpp
index b2e33cb0..742e0ed5 100644
--- a/src/common/interface/EngineInterface.hpp
+++ b/src/common/interface/EngineInterface.hpp
@@ -64,7 +64,7 @@ public:
virtual void ping() = 0;
- virtual void request_object(const Raul::URI& uri) = 0;
+ virtual void get(const Raul::URI& uri) = 0;
virtual void request_property(const Raul::URI& uri,
const Raul::URI& key) = 0;
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();
diff --git a/src/gui/PatchView.cpp b/src/gui/PatchView.cpp
index ad62d43e..57a4f46c 100644
--- a/src/gui/PatchView.cpp
+++ b/src/gui/PatchView.cpp
@@ -223,7 +223,7 @@ PatchView::clear_clicked()
void
PatchView::refresh_clicked()
{
- App::instance().engine()->request_object(_patch->path());
+ App::instance().engine()->get(_patch->path());
}