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/MidiLearnEvent.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/libs/engine/events/MidiLearnEvent.cpp') diff --git a/src/libs/engine/events/MidiLearnEvent.cpp b/src/libs/engine/events/MidiLearnEvent.cpp index b1cfb69d..be0597f1 100644 --- a/src/libs/engine/events/MidiLearnEvent.cpp +++ b/src/libs/engine/events/MidiLearnEvent.cpp @@ -16,8 +16,7 @@ #include "MidiLearnEvent.h" #include "Responder.h" -#include "Om.h" -#include "OmApp.h" +#include "Ingen.h" #include "ObjectStore.h" #include "Node.h" #include "MidiControlNode.h" @@ -31,14 +30,14 @@ namespace Om { void MidiLearnResponseEvent::post_process() { - om->client_broadcaster()->send_control_change(m_port_path, m_value); + Ingen::instance().client_broadcaster()->send_control_change(m_port_path, m_value); } // MidiLearnEvent -MidiLearnEvent::MidiLearnEvent(CountedPtr responder, samplecount timestamp, const string& node_path) +MidiLearnEvent::MidiLearnEvent(CountedPtr responder, SampleCount timestamp, const string& node_path) : QueuedEvent(responder, timestamp), m_node_path(node_path), m_node(NULL), @@ -50,7 +49,7 @@ MidiLearnEvent::MidiLearnEvent(CountedPtr responder, samplecount time void MidiLearnEvent::pre_process() { - m_node = om->object_store()->find_node(m_node_path); + m_node = Ingen::instance().object_store()->find_node(m_node_path); m_response_event = new MidiLearnResponseEvent(m_node_path + "/Controller_Number", _time_stamp); QueuedEvent::pre_process(); @@ -58,7 +57,7 @@ MidiLearnEvent::pre_process() void -MidiLearnEvent::execute(samplecount offset) +MidiLearnEvent::execute(SampleCount offset) { QueuedEvent::execute(offset); -- cgit v1.2.1