diff options
| author | David Robillard <d@drobilla.net> | 2006-09-08 03:58:00 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-09-08 03:58:00 +0000 |
| commit | 48f87f1f1649fb7e169fdaac2cd38370e8a4a1fa (patch) | |
| tree | 9da4b4b075791ac1ec78b499dbcbec6101f54690 /src/libs/engine/events/NoteOffEvent.cpp | |
| parent | acbe9a26ec3ab689e430225d15e95e73a7378aa9 (diff) | |
| download | ingen-48f87f1f1649fb7e169fdaac2cd38370e8a4a1fa.tar.gz ingen-48f87f1f1649fb7e169fdaac2cd38370e8a4a1fa.tar.bz2 ingen-48f87f1f1649fb7e169fdaac2cd38370e8a4a1fa.zip | |
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
Diffstat (limited to 'src/libs/engine/events/NoteOffEvent.cpp')
| -rw-r--r-- | src/libs/engine/events/NoteOffEvent.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/libs/engine/events/NoteOffEvent.cpp b/src/libs/engine/events/NoteOffEvent.cpp index 027e9f1f..8145c208 100644 --- a/src/libs/engine/events/NoteOffEvent.cpp +++ b/src/libs/engine/events/NoteOffEvent.cpp @@ -27,8 +27,8 @@ namespace Ingen { /** Note off with patch explicitly passed - triggered by MIDI. */ -NoteOffEvent::NoteOffEvent(CountedPtr<Responder> responder, SampleCount timestamp, Node* node, uchar note_num) -: Event(responder, timestamp), +NoteOffEvent::NoteOffEvent(Engine& engine, CountedPtr<Responder> responder, SampleCount timestamp, Node* node, uchar note_num) +: Event(engine, responder, timestamp), m_node(node), m_note_num(note_num) { @@ -37,8 +37,8 @@ NoteOffEvent::NoteOffEvent(CountedPtr<Responder> responder, SampleCount timestam /** Note off event with lookup - triggered by OSC. */ -NoteOffEvent::NoteOffEvent(CountedPtr<Responder> responder, SampleCount timestamp, const string& node_path, uchar note_num) -: Event(responder, timestamp), +NoteOffEvent::NoteOffEvent(Engine& engine, CountedPtr<Responder> responder, SampleCount timestamp, const string& node_path, uchar note_num) +: Event(engine, responder, timestamp), m_node(NULL), m_node_path(node_path), m_note_num(note_num) @@ -47,17 +47,19 @@ NoteOffEvent::NoteOffEvent(CountedPtr<Responder> responder, SampleCount timestam void -NoteOffEvent::execute(SampleCount offset) +NoteOffEvent::execute(SampleCount nframes, FrameTime start, FrameTime end) { + assert(_time >= start && _time <= end); + if (m_node == NULL && m_node_path != "") - 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_off(m_note_num, offset); + ((MidiNoteNode*)m_node)->note_off(m_note_num, _time, nframes, start, end); else if (m_node->plugin()->plug_label() == "trigger_in") - ((MidiTriggerNode*)m_node)->note_off(m_note_num, offset); + ((MidiTriggerNode*)m_node)->note_off(m_note_num, _time, nframes, start, end); } } |