summaryrefslogtreecommitdiffstats
path: root/src/libs/engine/events/RequestPortValueEvent.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/libs/engine/events/RequestPortValueEvent.cpp')
-rw-r--r--src/libs/engine/events/RequestPortValueEvent.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/libs/engine/events/RequestPortValueEvent.cpp b/src/libs/engine/events/RequestPortValueEvent.cpp
index ccdd9312..8cb401dc 100644
--- a/src/libs/engine/events/RequestPortValueEvent.cpp
+++ b/src/libs/engine/events/RequestPortValueEvent.cpp
@@ -17,8 +17,7 @@
#include "RequestPortValueEvent.h"
#include <string>
#include "Responder.h"
-#include "Om.h"
-#include "OmApp.h"
+#include "Ingen.h"
#include "interface/ClientInterface.h"
#include "TypedPort.h"
#include "ObjectStore.h"
@@ -29,7 +28,7 @@ using std::string;
namespace Om {
-RequestPortValueEvent::RequestPortValueEvent(CountedPtr<Responder> responder, samplecount timestamp, const string& port_path)
+RequestPortValueEvent::RequestPortValueEvent(CountedPtr<Responder> responder, SampleCount timestamp, const string& port_path)
: QueuedEvent(responder, timestamp),
m_port_path(port_path),
m_port(NULL),
@@ -43,17 +42,17 @@ void
RequestPortValueEvent::pre_process()
{
m_client = _responder->find_client();
- m_port = om->object_store()->find_port(m_port_path);
+ m_port = Ingen::instance().object_store()->find_port(m_port_path);
QueuedEvent::pre_process();
}
void
-RequestPortValueEvent::execute(samplecount offset)
+RequestPortValueEvent::execute(SampleCount offset)
{
if (m_port != NULL && m_port->type() == DataType::FLOAT)
- m_value = ((TypedPort<sample>*)m_port)->buffer(0)->value_at(offset);
+ m_value = ((TypedPort<Sample>*)m_port)->buffer(0)->value_at(offset);
else
m_port = NULL; // triggers error response