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/DisconnectPortEvent.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/DisconnectPortEvent.cpp')
-rw-r--r-- | src/libs/engine/events/DisconnectPortEvent.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/libs/engine/events/DisconnectPortEvent.cpp b/src/libs/engine/events/DisconnectPortEvent.cpp index 2126dffd..41ceff8b 100644 --- a/src/libs/engine/events/DisconnectPortEvent.cpp +++ b/src/libs/engine/events/DisconnectPortEvent.cpp @@ -38,8 +38,8 @@ using std::cerr; using std::endl; namespace Ingen { -DisconnectPortEvent::DisconnectPortEvent(CountedPtr<Responder> responder, SampleCount timestamp, const string& port_path) -: QueuedEvent(responder, timestamp), +DisconnectPortEvent::DisconnectPortEvent(Engine& engine, CountedPtr<Responder> responder, SampleCount timestamp, const string& port_path) +: QueuedEvent(engine, responder, timestamp), m_port_path(port_path), m_patch(NULL), m_port(NULL), @@ -50,8 +50,8 @@ DisconnectPortEvent::DisconnectPortEvent(CountedPtr<Responder> responder, Sample } -DisconnectPortEvent::DisconnectPortEvent(Port* port) -: QueuedEvent(), +DisconnectPortEvent::DisconnectPortEvent(Engine& engine, Port* port) +: QueuedEvent(engine), m_port_path(""), m_patch((port->parent_node() == NULL) ? NULL : port->parent_node()->parent_patch()), m_port(port), @@ -59,7 +59,7 @@ DisconnectPortEvent::DisconnectPortEvent(Port* port) m_succeeded(true), m_lookup(false) { - //cerr << "DisconnectPortEvent()\n"; + //cerr << "DisconnectPortEvent(Engine& engine, )\n"; } @@ -76,7 +76,7 @@ DisconnectPortEvent::pre_process() // cerr << "Preparing disconnection event...\n"; if (m_lookup) { - m_patch = Engine::instance().object_store()->find_patch(m_port_path.parent().parent()); + m_patch = _engine.object_store()->find_patch(m_port_path.parent().parent()); if (m_patch == NULL) { m_succeeded = false; @@ -84,7 +84,7 @@ DisconnectPortEvent::pre_process() return; } - m_port = Engine::instance().object_store()->find_port(m_port_path); + m_port = _engine.object_store()->find_port(m_port_path); if (m_port == NULL) { m_succeeded = false; @@ -103,7 +103,7 @@ DisconnectPortEvent::pre_process() for (List<Connection*>::const_iterator i = m_patch->connections().begin(); i != m_patch->connections().end(); ++i) { c = (*i); if ((c->src_port() == m_port || c->dst_port() == m_port) && !c->pending_disconnection()) { - DisconnectionEvent* ev = new DisconnectionEvent(CountedPtr<Responder>(new Responder()), _time_stamp, + DisconnectionEvent* ev = new DisconnectionEvent(_engine, CountedPtr<Responder>(new Responder()), _time, c->src_port(), c->dst_port()); ev->pre_process(); m_disconnection_events.push_back(new ListNode<DisconnectionEvent*>(ev)); @@ -117,14 +117,14 @@ DisconnectPortEvent::pre_process() void -DisconnectPortEvent::execute(SampleCount offset) +DisconnectPortEvent::execute(SampleCount nframes, FrameTime start, FrameTime end) { if (m_succeeded) { for (List<DisconnectionEvent*>::iterator i = m_disconnection_events.begin(); i != m_disconnection_events.end(); ++i) - (*i)->execute(offset); + (*i)->execute(nframes, start, end); } - QueuedEvent::execute(offset); + QueuedEvent::execute(nframes, start, end); } |