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/DSSIConfigureEvent.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/libs/engine/events/DSSIConfigureEvent.cpp') diff --git a/src/libs/engine/events/DSSIConfigureEvent.cpp b/src/libs/engine/events/DSSIConfigureEvent.cpp index f8514631..290d177a 100644 --- a/src/libs/engine/events/DSSIConfigureEvent.cpp +++ b/src/libs/engine/events/DSSIConfigureEvent.cpp @@ -15,8 +15,7 @@ */ #include "DSSIConfigureEvent.h" -#include "Om.h" -#include "OmApp.h" +#include "Ingen.h" #include "Node.h" #include "ClientBroadcaster.h" #include "Plugin.h" @@ -25,7 +24,7 @@ namespace Om { -DSSIConfigureEvent::DSSIConfigureEvent(CountedPtr responder, samplecount timestamp, const string& node_path, const string& key, const string& val) +DSSIConfigureEvent::DSSIConfigureEvent(CountedPtr responder, SampleCount timestamp, const string& node_path, const string& key, const string& val) : QueuedEvent(responder, timestamp), m_node_path(node_path), m_key(key), @@ -38,7 +37,7 @@ DSSIConfigureEvent::DSSIConfigureEvent(CountedPtr responder, sampleco void DSSIConfigureEvent::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 != NULL && node->plugin()->type() == Plugin::DSSI) { m_node = (DSSINode*)node; @@ -50,7 +49,7 @@ DSSIConfigureEvent::pre_process() void -DSSIConfigureEvent::execute(samplecount offset) +DSSIConfigureEvent::execute(SampleCount offset) { // Nothing. } @@ -64,7 +63,7 @@ DSSIConfigureEvent::post_process() } else { string key = "dssi-configure--"; key += m_key; - om->client_broadcaster()->send_metadata_update(m_node_path, key, m_val); + Ingen::instance().client_broadcaster()->send_metadata_update(m_node_path, key, m_val); } } -- cgit v1.2.1