diff options
| author | David Robillard <d@drobilla.net> | 2006-07-18 05:46:24 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-07-18 05:46:24 +0000 |
| commit | 2dbd0cd81dff72aea42344188d20f7d7f6d20e1a (patch) | |
| tree | a3af76b4164c75b19d3973c88b05591be9e9d67d /src/libs/engine/events/DisconnectPortEvent.cpp | |
| parent | 1d81360a04e0e5c0a57b8be1708e29a3f2bde848 (diff) | |
| download | ingen-2dbd0cd81dff72aea42344188d20f7d7f6d20e1a.tar.gz ingen-2dbd0cd81dff72aea42344188d20f7d7f6d20e1a.tar.bz2 ingen-2dbd0cd81dff72aea42344188d20f7d7f6d20e1a.zip | |
Removed globals (Om.h)
git-svn-id: http://svn.drobilla.net/lad/ingen@96 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/libs/engine/events/DisconnectPortEvent.cpp')
| -rw-r--r-- | src/libs/engine/events/DisconnectPortEvent.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/libs/engine/events/DisconnectPortEvent.cpp b/src/libs/engine/events/DisconnectPortEvent.cpp index d62e3b2c..a3b93727 100644 --- a/src/libs/engine/events/DisconnectPortEvent.cpp +++ b/src/libs/engine/events/DisconnectPortEvent.cpp @@ -17,8 +17,7 @@ #include "DisconnectPortEvent.h" #include <iostream> #include "Responder.h" -#include "Om.h" -#include "OmApp.h" +#include "Ingen.h" #include "Maid.h" #include "List.h" #include "Node.h" @@ -39,7 +38,7 @@ using std::cerr; using std::endl; namespace Om { -DisconnectPortEvent::DisconnectPortEvent(CountedPtr<Responder> responder, samplecount timestamp, const string& port_path) +DisconnectPortEvent::DisconnectPortEvent(CountedPtr<Responder> responder, SampleCount timestamp, const string& port_path) : QueuedEvent(responder, timestamp), m_port_path(port_path), m_patch(NULL), @@ -77,7 +76,7 @@ DisconnectPortEvent::pre_process() // cerr << "Preparing disconnection event...\n"; if (m_lookup) { - m_patch = om->object_store()->find_patch(m_port_path.parent().parent()); + m_patch = Ingen::instance().object_store()->find_patch(m_port_path.parent().parent()); if (m_patch == NULL) { m_succeeded = false; @@ -85,7 +84,7 @@ DisconnectPortEvent::pre_process() return; } - m_port = om->object_store()->find_port(m_port_path); + m_port = Ingen::instance().object_store()->find_port(m_port_path); if (m_port == NULL) { m_succeeded = false; @@ -118,7 +117,7 @@ DisconnectPortEvent::pre_process() void -DisconnectPortEvent::execute(samplecount offset) +DisconnectPortEvent::execute(SampleCount offset) { if (m_succeeded) { for (List<DisconnectionEvent*>::iterator i = m_disconnection_events.begin(); i != m_disconnection_events.end(); ++i) |