From 48f87f1f1649fb7e169fdaac2cd38370e8a4a1fa Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 8 Sep 2006 03:58:00 +0000 Subject: De-singleton-ified Engine Slight rework of Responder/ClientKey/ClientInterface for Requests git-svn-id: http://svn.drobilla.net/lad/ingen@119 a436a847-0d15-0410-975c-d299462d15a1 --- src/libs/engine/events/NoteOnEvent.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'src/libs/engine/events/NoteOnEvent.cpp') diff --git a/src/libs/engine/events/NoteOnEvent.cpp b/src/libs/engine/events/NoteOnEvent.cpp index cbbc0e1d..7a98c58d 100644 --- a/src/libs/engine/events/NoteOnEvent.cpp +++ b/src/libs/engine/events/NoteOnEvent.cpp @@ -30,8 +30,8 @@ namespace Ingen { * * Used to be triggered by MIDI. Not used anymore. */ -NoteOnEvent::NoteOnEvent(CountedPtr responder, SampleCount timestamp, Node* patch, uchar note_num, uchar velocity) -: Event(responder, timestamp), +NoteOnEvent::NoteOnEvent(Engine& engine, CountedPtr responder, SampleCount timestamp, Node* patch, uchar note_num, uchar velocity) +: Event(engine, responder, timestamp), m_node(patch), m_note_num(note_num), m_velocity(velocity), @@ -44,8 +44,8 @@ NoteOnEvent::NoteOnEvent(CountedPtr responder, SampleCount timestamp, * * Triggered by OSC. */ -NoteOnEvent::NoteOnEvent(CountedPtr responder, SampleCount timestamp, const string& node_path, uchar note_num, uchar velocity) -: Event(responder, timestamp), +NoteOnEvent::NoteOnEvent(Engine& engine, CountedPtr responder, SampleCount timestamp, const string& node_path, uchar note_num, uchar velocity) +: Event(engine, responder, timestamp), m_node(NULL), m_node_path(node_path), m_note_num(note_num), @@ -56,18 +56,20 @@ NoteOnEvent::NoteOnEvent(CountedPtr responder, SampleCount timestamp, void -NoteOnEvent::execute(SampleCount offset) +NoteOnEvent::execute(SampleCount nframes, FrameTime start, FrameTime end) { + assert(_time >= start && _time <= end); + // Lookup if neccessary if (m_is_osc_triggered) - m_node = Engine::instance().object_store()->find_node(m_node_path); + m_node = _engine.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) { if (m_node->plugin()->plug_label() == "note_in") - ((MidiNoteNode*)m_node)->note_on(m_note_num, m_velocity, offset); + ((MidiNoteNode*)m_node)->note_on(m_note_num, m_velocity, _time, nframes, start, end); else if (m_node->plugin()->plug_label() == "trigger_in") - ((MidiTriggerNode*)m_node)->note_on(m_note_num, m_velocity, offset); + ((MidiTriggerNode*)m_node)->note_on(m_note_num, m_velocity, _time, nframes, start, end); } } -- cgit v1.2.1