summaryrefslogtreecommitdiffstats
path: root/src/engine
diff options
context:
space:
mode:
Diffstat (limited to 'src/engine')
-rw-r--r--src/engine/OSCEngineReceiver.cpp17
-rw-r--r--src/engine/OSCEngineReceiver.hpp1
-rw-r--r--src/engine/QueuedEngineInterface.cpp7
-rw-r--r--src/engine/QueuedEngineInterface.hpp1
-rw-r--r--src/engine/events.hpp1
-rw-r--r--src/engine/events/RequestMetadataEvent.cpp35
-rw-r--r--src/engine/events/RequestMetadataEvent.hpp6
-rw-r--r--src/engine/events/RequestPortValueEvent.cpp83
-rw-r--r--src/engine/events/RequestPortValueEvent.hpp51
-rw-r--r--src/engine/wscript1
10 files changed, 39 insertions, 164 deletions
diff --git a/src/engine/OSCEngineReceiver.cpp b/src/engine/OSCEngineReceiver.cpp
index 759d59a5..d5707720 100644
--- a/src/engine/OSCEngineReceiver.cpp
+++ b/src/engine/OSCEngineReceiver.cpp
@@ -112,7 +112,6 @@ OSCEngineReceiver::OSCEngineReceiver(Engine& engine, size_t queue_size, uint16_t
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_port_value", "is", request_port_value_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);
@@ -742,22 +741,6 @@ OSCEngineReceiver::_request_object_cb(const char* path, const char* types, lo_ar
/** \page engine_osc_namespace
- * <p> \b /ingen/request_port_value - Requests the engine send the value of a port.
- * \arg \b response-id (integer)
- * \arg \b port-path (string) - Full path of port to send the value of \n\n
- * \li Reply will be sent to client registered with the source address of this message.</p>\n\n
- */
-int
-OSCEngineReceiver::_request_port_value_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg)
-{
- const char* port_path = &argv[1]->s;
-
- request_port_value(port_path);
- return 0;
-}
-
-
-/** \page engine_osc_namespace
* <p> \b /ingen/request_plugins - Requests the engine send a list of all known plugins.
* \arg \b response-id (integer) \n\n
* \li Reply will be sent to client registered with the source address of this message.</p>\n\n
diff --git a/src/engine/OSCEngineReceiver.hpp b/src/engine/OSCEngineReceiver.hpp
index b684d2c0..816d9542 100644
--- a/src/engine/OSCEngineReceiver.hpp
+++ b/src/engine/OSCEngineReceiver.hpp
@@ -110,7 +110,6 @@ private:
LO_HANDLER(property_set);
LO_HANDLER(request_plugin);
LO_HANDLER(request_object);
- LO_HANDLER(request_port_value);
LO_HANDLER(request_variable);
LO_HANDLER(request_plugins);
LO_HANDLER(request_all_objects);
diff --git a/src/engine/QueuedEngineInterface.cpp b/src/engine/QueuedEngineInterface.cpp
index e475f1a6..5f4082fa 100644
--- a/src/engine/QueuedEngineInterface.cpp
+++ b/src/engine/QueuedEngineInterface.cpp
@@ -307,13 +307,6 @@ QueuedEngineInterface::request_object(const Path& path)
void
-QueuedEngineInterface::request_port_value(const Path& port_path)
-{
- push_queued(new RequestPortValueEvent(_engine, _responder, now(), port_path));
-}
-
-
-void
QueuedEngineInterface::request_variable(const Path& object_path, const URI& key)
{
push_queued(new RequestMetadataEvent(_engine, _responder, now(), false, object_path, key));
diff --git a/src/engine/QueuedEngineInterface.hpp b/src/engine/QueuedEngineInterface.hpp
index 1482cf2e..91fb14b0 100644
--- a/src/engine/QueuedEngineInterface.hpp
+++ b/src/engine/QueuedEngineInterface.hpp
@@ -127,7 +127,6 @@ public:
virtual void ping();
virtual void request_plugin(const Raul::URI& uri);
virtual void request_object(const Raul::Path& path);
- virtual void request_port_value(const Raul::Path& port_path);
virtual void request_variable(const Raul::Path& object_path, const Raul::URI& key);
virtual void request_property(const Raul::Path& object_path, const Raul::URI& key);
virtual void request_plugins();
diff --git a/src/engine/events.hpp b/src/engine/events.hpp
index b5dcdbc0..b8a344de 100644
--- a/src/engine/events.hpp
+++ b/src/engine/events.hpp
@@ -41,7 +41,6 @@
#include "events/RequestObjectEvent.hpp"
#include "events/RequestPluginEvent.hpp"
#include "events/RequestPluginsEvent.hpp"
-#include "events/RequestPortValueEvent.hpp"
#include "events/SetMetadataEvent.hpp"
#include "events/SetPortValueEvent.hpp"
#include "events/UnregisterClientEvent.hpp"
diff --git a/src/engine/events/RequestMetadataEvent.cpp b/src/engine/events/RequestMetadataEvent.cpp
index 685108f4..cf8a127a 100644
--- a/src/engine/events/RequestMetadataEvent.cpp
+++ b/src/engine/events/RequestMetadataEvent.cpp
@@ -22,12 +22,16 @@
#include "GraphObjectImpl.hpp"
#include "EngineStore.hpp"
#include "ClientBroadcaster.hpp"
+#include "PortImpl.hpp"
+#include "AudioBuffer.hpp"
using namespace std;
using namespace Raul;
namespace Ingen {
+using namespace Shared;
+
RequestMetadataEvent::RequestMetadataEvent(Engine& engine,
SharedPtr<Responder> responder,
@@ -36,6 +40,7 @@ RequestMetadataEvent::RequestMetadataEvent(Engine& engine,
const Path& node_path,
const URI& key)
: QueuedEvent(engine, responder, timestamp)
+ , _special_type(NONE)
, _path(node_path)
, _property(property)
, _key(key)
@@ -55,7 +60,9 @@ RequestMetadataEvent::pre_process()
}
}
- if (_property)
+ if (_key.str() == "ingen:value")
+ _special_type = PORT_VALUE;
+ else if (_property)
_value = _object->get_property(_key);
else
_value = _object->get_variable(_key);
@@ -65,10 +72,34 @@ RequestMetadataEvent::pre_process()
void
+RequestMetadataEvent::execute(ProcessContext& context)
+{
+ QueuedEvent::execute(context);
+ if (_special_type == PORT_VALUE) {
+ PortImpl* port = dynamic_cast<PortImpl*>(_object);
+ if (port) {
+ if (port->type() == DataType::CONTROL || port->type() == DataType::AUDIO)
+ _value = ((AudioBuffer*)port->buffer(0))->value_at(0); // TODO: offset
+ } else {
+ _object = 0;
+ }
+ }
+}
+
+
+void
RequestMetadataEvent::post_process()
{
if (_responder->client()) {
- if (!_object) {
+ if (_special_type == PORT_VALUE) {
+ if (_object) {
+ _responder->respond_ok();
+ _responder->client()->set_port_value(_path, _value);
+ } else {
+ const string msg = "Get value for non-port " + _path.str();
+ _responder->respond_error(msg);
+ }
+ } else if (!_object) {
const string msg = "Unable to find variable subject " + _path.str();
_responder->respond_error(msg);
} else {
diff --git a/src/engine/events/RequestMetadataEvent.hpp b/src/engine/events/RequestMetadataEvent.hpp
index d3480b7c..5b163500 100644
--- a/src/engine/events/RequestMetadataEvent.hpp
+++ b/src/engine/events/RequestMetadataEvent.hpp
@@ -42,9 +42,15 @@ public:
const Raul::URI& key);
void pre_process();
+ void execute(ProcessContext& context);
void post_process();
private:
+ enum {
+ NONE,
+ PORT_VALUE
+ } _special_type;
+
Raul::Path _path;
bool _property;
Raul::URI _key;
diff --git a/src/engine/events/RequestPortValueEvent.cpp b/src/engine/events/RequestPortValueEvent.cpp
deleted file mode 100644
index 5f3a33a7..00000000
--- a/src/engine/events/RequestPortValueEvent.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-/* This file is part of Ingen.
- * Copyright (C) 2007 Dave Robillard <http://drobilla.net>
- *
- * Ingen is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later
- * version.
- *
- * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "RequestPortValueEvent.hpp"
-#include "interface/ClientInterface.hpp"
-#include "Responder.hpp"
-#include "Engine.hpp"
-#include "PortImpl.hpp"
-#include "EngineStore.hpp"
-#include "ClientBroadcaster.hpp"
-#include "AudioBuffer.hpp"
-#include "ProcessContext.hpp"
-
-using namespace std;
-using namespace Raul;
-
-namespace Ingen {
-
-using namespace Shared;
-
-
-RequestPortValueEvent::RequestPortValueEvent(Engine& engine, SharedPtr<Responder> responder, SampleCount timestamp, const Path& port_path)
- : QueuedEvent(engine, responder, timestamp)
- , _port_path(port_path)
- , _port(NULL)
- , _value(0.0)
-{
-}
-
-
-void
-RequestPortValueEvent::pre_process()
-{
- _port = _engine.engine_store()->find_port(_port_path);
-
- QueuedEvent::pre_process();
-}
-
-
-void
-RequestPortValueEvent::execute(ProcessContext& context)
-{
- QueuedEvent::execute(context);
- assert(_time >= context.start() && _time <= context.end());
-
- if (_port != NULL && (_port->type() == DataType::CONTROL || _port->type() == DataType::AUDIO))
- _value = ((AudioBuffer*)_port->buffer(0))->value_at(0/*_time - start*/);
- else
- _port = NULL; // triggers error response
-}
-
-
-void
-RequestPortValueEvent::post_process()
-{
- string msg;
- if (!_port) {
- _responder->respond_error("Unable to find port for get_value responder.");
- } else if (_responder->client()) {
- _responder->respond_ok();
- _responder->client()->set_port_value(_port_path, _value);
- } else {
- _responder->respond_error("Unable to find client to send port value");
- }
-}
-
-
-} // namespace Ingen
-
diff --git a/src/engine/events/RequestPortValueEvent.hpp b/src/engine/events/RequestPortValueEvent.hpp
deleted file mode 100644
index 79ca4bfe..00000000
--- a/src/engine/events/RequestPortValueEvent.hpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/* This file is part of Ingen.
- * Copyright (C) 2007 Dave Robillard <http://drobilla.net>
- *
- * Ingen is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later
- * version.
- *
- * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef REQUESTPORTVALUEEVENT_H
-#define REQUESTPORTVALUEEVENT_H
-
-#include "QueuedEvent.hpp"
-#include "types.hpp"
-
-namespace Ingen {
-
-class PortImpl;
-
-
-/** A request from a client to send the value of a port.
- *
- * \ingroup engine
- */
-class RequestPortValueEvent : public QueuedEvent
-{
-public:
- RequestPortValueEvent(Engine& engine, SharedPtr<Responder> responder, SampleCount timestamp, const Raul::Path& port_path);
-
- void pre_process();
- void execute(ProcessContext& context);
- void post_process();
-
-private:
- const Raul::Path _port_path;
- PortImpl* _port;
- Sample _value;
-};
-
-
-} // namespace Ingen
-
-#endif // REQUESTPORTVALUEEVENT_H
diff --git a/src/engine/wscript b/src/engine/wscript
index 66d6f29e..4365cfa9 100644
--- a/src/engine/wscript
+++ b/src/engine/wscript
@@ -76,7 +76,6 @@ def build(bld):
events/RequestObjectEvent.cpp
events/RequestPluginEvent.cpp
events/RequestPluginsEvent.cpp
- events/RequestPortValueEvent.cpp
events/SetMetadataEvent.cpp
events/UnregisterClientEvent.cpp
'''
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-05 20:33:01 +0000