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/SetMetadataEvent.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/libs/engine/events/SetMetadataEvent.cpp') diff --git a/src/libs/engine/events/SetMetadataEvent.cpp b/src/libs/engine/events/SetMetadataEvent.cpp index 3ea38c4f..a2a02318 100644 --- a/src/libs/engine/events/SetMetadataEvent.cpp +++ b/src/libs/engine/events/SetMetadataEvent.cpp @@ -17,8 +17,7 @@ #include "SetMetadataEvent.h" #include #include "Responder.h" -#include "Om.h" -#include "OmApp.h" +#include "Ingen.h" #include "ClientBroadcaster.h" #include "GraphObject.h" #include "ObjectStore.h" @@ -28,7 +27,7 @@ using std::string; namespace Om { -SetMetadataEvent::SetMetadataEvent(CountedPtr responder, samplecount timestamp, const string& path, const string& key, const string& value) +SetMetadataEvent::SetMetadataEvent(CountedPtr responder, SampleCount timestamp, const string& path, const string& key, const string& value) : QueuedEvent(responder, timestamp), m_path(path), m_key(key), @@ -41,7 +40,7 @@ SetMetadataEvent::SetMetadataEvent(CountedPtr responder, samplecount void SetMetadataEvent::pre_process() { - m_object = om->object_store()->find(m_path); + m_object = Ingen::instance().object_store()->find(m_path); if (m_object == NULL) { QueuedEvent::pre_process(); return; @@ -54,7 +53,7 @@ SetMetadataEvent::pre_process() void -SetMetadataEvent::execute(samplecount offset) +SetMetadataEvent::execute(SampleCount offset) { // Do nothing @@ -71,7 +70,7 @@ SetMetadataEvent::post_process() _responder->respond_error(msg); } else { _responder->respond_ok(); - om->client_broadcaster()->send_metadata_update(m_path, m_key, m_value); + Ingen::instance().client_broadcaster()->send_metadata_update(m_path, m_key, m_value); } } -- cgit v1.2.1