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/NoteOffEvent.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/libs/engine/events/NoteOffEvent.cpp') diff --git a/src/libs/engine/events/NoteOffEvent.cpp b/src/libs/engine/events/NoteOffEvent.cpp index cd411d81..39b04f31 100644 --- a/src/libs/engine/events/NoteOffEvent.cpp +++ b/src/libs/engine/events/NoteOffEvent.cpp @@ -16,8 +16,7 @@ #include "NoteOffEvent.h" #include "Responder.h" -#include "Om.h" -#include "OmApp.h" +#include "Ingen.h" #include "ObjectStore.h" #include "Node.h" #include "MidiNoteNode.h" @@ -28,7 +27,7 @@ namespace Om { /** Note off with patch explicitly passed - triggered by MIDI. */ -NoteOffEvent::NoteOffEvent(CountedPtr responder, samplecount timestamp, Node* node, uchar note_num) +NoteOffEvent::NoteOffEvent(CountedPtr responder, SampleCount timestamp, Node* node, uchar note_num) : Event(responder, timestamp), m_node(node), m_note_num(note_num) @@ -38,7 +37,7 @@ NoteOffEvent::NoteOffEvent(CountedPtr responder, samplecount timestam /** Note off event with lookup - triggered by OSC. */ -NoteOffEvent::NoteOffEvent(CountedPtr responder, samplecount timestamp, const string& node_path, uchar note_num) +NoteOffEvent::NoteOffEvent(CountedPtr responder, SampleCount timestamp, const string& node_path, uchar note_num) : Event(responder, timestamp), m_node(NULL), m_node_path(node_path), @@ -48,10 +47,10 @@ NoteOffEvent::NoteOffEvent(CountedPtr responder, samplecount timestam void -NoteOffEvent::execute(samplecount offset) +NoteOffEvent::execute(SampleCount offset) { if (m_node == NULL && m_node_path != "") - m_node = om->object_store()->find_node(m_node_path); + m_node = Ingen::instance().object_store()->find_node(m_node_path); // FIXME: this isn't very good at all. if (m_node != NULL && m_node->plugin()->type() == Plugin::Internal) { -- cgit v1.2.1