diff options
| author | David Robillard <d@drobilla.net> | 2006-07-14 22:24:00 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-07-14 22:24:00 +0000 |
| commit | 5dc6649496e938b32a5fe9f341de6cce962d3731 (patch) | |
| tree | c4b1832581c32b867b653afd0a7bd4bb05883b36 /src/libs/engine/events/DisconnectNodeEvent.cpp | |
| parent | 7e013dc6986fa9d6dc8616d494d9de5d192c4c69 (diff) | |
| download | ingen-5dc6649496e938b32a5fe9f341de6cce962d3731.tar.gz ingen-5dc6649496e938b32a5fe9f341de6cce962d3731.tar.bz2 ingen-5dc6649496e938b32a5fe9f341de6cce962d3731.zip | |
Enforced OSC path restrictions on Path for spec conformance (since GraphObject
paths will soon be part of OSC paths)
git-svn-id: http://svn.drobilla.net/lad/ingen@88 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/libs/engine/events/DisconnectNodeEvent.cpp')
| -rw-r--r-- | src/libs/engine/events/DisconnectNodeEvent.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/libs/engine/events/DisconnectNodeEvent.cpp b/src/libs/engine/events/DisconnectNodeEvent.cpp index 22c2459e..5f2a483a 100644 --- a/src/libs/engine/events/DisconnectNodeEvent.cpp +++ b/src/libs/engine/events/DisconnectNodeEvent.cpp @@ -39,8 +39,8 @@ using std::cerr; using std::endl; namespace Om { -DisconnectNodeEvent::DisconnectNodeEvent(CountedPtr<Responder> responder, const string& node_path) -: QueuedEvent(responder), +DisconnectNodeEvent::DisconnectNodeEvent(CountedPtr<Responder> responder, samplecount timestamp, const string& node_path) +: QueuedEvent(responder, timestamp), m_node_path(node_path), m_patch(NULL), m_node(NULL), @@ -99,7 +99,8 @@ DisconnectNodeEvent::pre_process() for (ConnectionListIterator i = m_patch->connections().begin(); i != m_patch->connections().end(); ++i) { c = (*i); if ((c->src_port()->parent_node() == m_node || c->dst_port()->parent_node() == m_node) && !c->pending_disconnection()) { - DisconnectionEvent* ev = new DisconnectionEvent(CountedPtr<Responder>(new Responder()), c->src_port(), c->dst_port()); + DisconnectionEvent* ev = new DisconnectionEvent(CountedPtr<Responder>(new Responder()), _time_stamp, + c->src_port(), c->dst_port()); ev->pre_process(); m_disconnection_events.push_back(new ListNode<DisconnectionEvent*>(ev)); c->pending_disconnection(true); @@ -127,13 +128,13 @@ void DisconnectNodeEvent::post_process() { if (m_succeeded) { - if (m_responder) - m_responder->respond_ok(); + if (_responder) + _responder->respond_ok(); for (List<DisconnectionEvent*>::iterator i = m_disconnection_events.begin(); i != m_disconnection_events.end(); ++i) (*i)->post_process(); } else { - if (m_responder) - m_responder->respond_error("Unable to disconnect all ports."); + if (_responder) + _responder->respond_error("Unable to disconnect all ports."); } } |