From 2dbd0cd81dff72aea42344188d20f7d7f6d20e1a Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 18 Jul 2006 05:46:24 +0000 Subject: Removed globals (Om.h) git-svn-id: http://svn.drobilla.net/lad/ingen@96 a436a847-0d15-0410-975c-d299462d15a1 --- src/libs/engine/events/DSSIControlEvent.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/libs/engine/events/DSSIControlEvent.cpp') diff --git a/src/libs/engine/events/DSSIControlEvent.cpp b/src/libs/engine/events/DSSIControlEvent.cpp index 534c5c0a..568ef573 100644 --- a/src/libs/engine/events/DSSIControlEvent.cpp +++ b/src/libs/engine/events/DSSIControlEvent.cpp @@ -15,8 +15,7 @@ */ #include "DSSIControlEvent.h" -#include "Om.h" -#include "OmApp.h" +#include "Ingen.h" #include "Node.h" #include "Plugin.h" #include "ObjectStore.h" @@ -24,7 +23,7 @@ namespace Om { -DSSIControlEvent::DSSIControlEvent(CountedPtr responder, samplecount timestamp, const string& node_path, int port_num, sample val) +DSSIControlEvent::DSSIControlEvent(CountedPtr responder, SampleCount timestamp, const string& node_path, int port_num, Sample val) : QueuedEvent(responder, timestamp), m_node_path(node_path), m_port_num(port_num), @@ -37,7 +36,7 @@ DSSIControlEvent::DSSIControlEvent(CountedPtr responder, samplecount void DSSIControlEvent::pre_process() { - Node* node = om->object_store()->find_node(m_node_path); + Node* node = Ingen::instance().object_store()->find_node(m_node_path); if (node->plugin()->type() != Plugin::DSSI) m_node = NULL; @@ -49,7 +48,7 @@ DSSIControlEvent::pre_process() void -DSSIControlEvent::execute(samplecount offset) +DSSIControlEvent::execute(SampleCount offset) { if (m_node != NULL) m_node->set_control(m_port_num, m_val); -- cgit v1.2.1