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/MidiLearnEvent.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 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 814ecdb5..822573e0 100644 --- a/src/libs/engine/events/MidiLearnEvent.cpp +++ b/src/libs/engine/events/MidiLearnEvent.cpp @@ -30,15 +30,15 @@ namespace Ingen { void MidiLearnResponseEvent::post_process() { - Engine::instance().client_broadcaster()->send_control_change(m_port_path, m_value); + _engine.client_broadcaster()->send_control_change(m_port_path, m_value); } // MidiLearnEvent -MidiLearnEvent::MidiLearnEvent(CountedPtr responder, SampleCount timestamp, const string& node_path) -: QueuedEvent(responder, timestamp), +MidiLearnEvent::MidiLearnEvent(Engine& engine, CountedPtr responder, SampleCount timestamp, const string& node_path) +: QueuedEvent(engine, responder, timestamp), m_node_path(node_path), m_node(NULL), m_response_event(NULL) @@ -49,17 +49,17 @@ MidiLearnEvent::MidiLearnEvent(CountedPtr responder, SampleCount time void MidiLearnEvent::pre_process() { - m_node = Engine::instance().object_store()->find_node(m_node_path); - m_response_event = new MidiLearnResponseEvent(m_node_path + "/Controller_Number", _time_stamp); + m_node = _engine.object_store()->find_node(m_node_path); + m_response_event = new MidiLearnResponseEvent(_engine, m_node_path + "/Controller_Number", _time); QueuedEvent::pre_process(); } void -MidiLearnEvent::execute(SampleCount offset) +MidiLearnEvent::execute(SampleCount nframes, FrameTime start, FrameTime end) { - QueuedEvent::execute(offset); + QueuedEvent::execute(nframes, start, end); // FIXME: this isn't very good at all. if (m_node != NULL && m_node->plugin()->type() == Plugin::Internal -- cgit v1.2.1