summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/engine/QueuedEngineInterface.cpp2
-rw-r--r--src/engine/events.hpp4
-rw-r--r--src/engine/events/GetEvent.cpp (renamed from src/engine/events/RequestObjectEvent.cpp)10
-rw-r--r--src/engine/events/GetEvent.hpp (renamed from src/engine/events/RequestObjectEvent.hpp)4
-rw-r--r--src/engine/wscript2
5 files changed, 11 insertions, 11 deletions
diff --git a/src/engine/QueuedEngineInterface.cpp b/src/engine/QueuedEngineInterface.cpp
index 8dd31adc..7e824cae 100644
--- a/src/engine/QueuedEngineInterface.cpp
+++ b/src/engine/QueuedEngineInterface.cpp
@@ -270,7 +270,7 @@ QueuedEngineInterface::ping()
void
QueuedEngineInterface::request_object(const URI& uri)
{
- push_queued(new RequestObjectEvent(_engine, _responder, now(), uri));
+ push_queued(new GetEvent(_engine, _responder, now(), uri));
}
diff --git a/src/engine/events.hpp b/src/engine/events.hpp
index 78aea9ba..d9fb9362 100644
--- a/src/engine/events.hpp
+++ b/src/engine/events.hpp
@@ -30,15 +30,15 @@
#include "events/DeleteEvent.hpp"
#include "events/DisconnectAllEvent.hpp"
#include "events/DisconnectionEvent.hpp"
+#include "events/GetEvent.hpp"
#include "events/LoadPluginsEvent.hpp"
#include "events/MidiLearnEvent.hpp"
+#include "events/MoveEvent.hpp"
#include "events/NoteEvent.hpp"
#include "events/PingQueuedEvent.hpp"
#include "events/RegisterClientEvent.hpp"
-#include "events/MoveEvent.hpp"
#include "events/RequestAllObjectsEvent.hpp"
#include "events/RequestMetadataEvent.hpp"
-#include "events/RequestObjectEvent.hpp"
#include "events/RequestPluginsEvent.hpp"
#include "events/SetMetadataEvent.hpp"
#include "events/SetPortValueEvent.hpp"
diff --git a/src/engine/events/RequestObjectEvent.cpp b/src/engine/events/GetEvent.cpp
index a74f15d3..6479c94f 100644
--- a/src/engine/events/RequestObjectEvent.cpp
+++ b/src/engine/events/GetEvent.cpp
@@ -15,7 +15,7 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "RequestObjectEvent.hpp"
+#include "GetEvent.hpp"
#include "interface/ClientInterface.hpp"
#include "Responder.hpp"
#include "Engine.hpp"
@@ -32,7 +32,7 @@ using namespace Raul;
namespace Ingen {
-RequestObjectEvent::RequestObjectEvent(
+GetEvent::GetEvent(
Engine& engine,
SharedPtr<Responder> responder,
SampleCount timestamp,
@@ -46,7 +46,7 @@ RequestObjectEvent::RequestObjectEvent(
void
-RequestObjectEvent::pre_process()
+GetEvent::pre_process()
{
if (Path::is_valid(_uri.str()))
_object = _engine.engine_store()->find_object(Path(_uri.str()));
@@ -58,7 +58,7 @@ RequestObjectEvent::pre_process()
void
-RequestObjectEvent::execute(ProcessContext& context)
+GetEvent::execute(ProcessContext& context)
{
QueuedEvent::execute(context);
assert(_time >= context.start() && _time <= context.end());
@@ -66,7 +66,7 @@ RequestObjectEvent::execute(ProcessContext& context)
void
-RequestObjectEvent::post_process()
+GetEvent::post_process()
{
if (!_object && !_plugin) {
_responder->respond_error("Unable to find object requested.");
diff --git a/src/engine/events/RequestObjectEvent.hpp b/src/engine/events/GetEvent.hpp
index cd759224..d2413043 100644
--- a/src/engine/events/RequestObjectEvent.hpp
+++ b/src/engine/events/GetEvent.hpp
@@ -31,10 +31,10 @@ class PluginImpl;
*
* \ingroup engine
*/
-class RequestObjectEvent : public QueuedEvent
+class GetEvent : public QueuedEvent
{
public:
- RequestObjectEvent(
+ GetEvent(
Engine& engine,
SharedPtr<Responder> responder,
SampleCount timestamp,
diff --git a/src/engine/wscript b/src/engine/wscript
index bab84cf2..29189c59 100644
--- a/src/engine/wscript
+++ b/src/engine/wscript
@@ -65,6 +65,7 @@ def build(bld):
events/DeleteEvent.cpp
events/DisconnectAllEvent.cpp
events/DisconnectionEvent.cpp
+ events/GetEvent.cpp
events/LoadPluginsEvent.cpp
events/MidiLearnEvent.cpp
events/MoveEvent.cpp
@@ -72,7 +73,6 @@ def build(bld):
events/RegisterClientEvent.cpp
events/RequestAllObjectsEvent.cpp
events/RequestMetadataEvent.cpp
- events/RequestObjectEvent.cpp
events/RequestPluginsEvent.cpp
events/SetMetadataEvent.cpp
events/SetPortValueEvent.cpp