diff options
| author | David Robillard <d@drobilla.net> | 2006-07-20 04:15:03 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-07-20 04:15:03 +0000 |
| commit | b5b6dba0480b3dcec4b130ea606d63f4a3854920 (patch) | |
| tree | 22e3c06d815da7b33f6061253c94cf3621b37265 /src/libs/engine/events/DisconnectionEvent.cpp | |
| parent | 767b10d6fa3313b2bd4e1dcc0d96dda3409c4944 (diff) | |
| download | ingen-b5b6dba0480b3dcec4b130ea606d63f4a3854920.tar.gz ingen-b5b6dba0480b3dcec4b130ea606d63f4a3854920.tar.bz2 ingen-b5b6dba0480b3dcec4b130ea606d63f4a3854920.zip | |
Renamed Engine class to "Engine" (from "Ingen") to avoid confusion with namespace Ingen
git-svn-id: http://svn.drobilla.net/lad/ingen@99 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/libs/engine/events/DisconnectionEvent.cpp')
| -rw-r--r-- | src/libs/engine/events/DisconnectionEvent.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/libs/engine/events/DisconnectionEvent.cpp b/src/libs/engine/events/DisconnectionEvent.cpp index 4afdf2c4..431061a2 100644 --- a/src/libs/engine/events/DisconnectionEvent.cpp +++ b/src/libs/engine/events/DisconnectionEvent.cpp @@ -17,7 +17,7 @@ #include "DisconnectionEvent.h" #include <string> #include "Responder.h" -#include "Ingen.h" +#include "Engine.h" #include "TypedConnection.h" #include "InputPort.h" #include "OutputPort.h" @@ -85,7 +85,7 @@ DisconnectionEvent::pre_process() return; } - /*m_patch = Ingen::instance().object_store()->find_patch(m_src_port_path.parent().parent()); + /*m_patch = Engine::instance().object_store()->find_patch(m_src_port_path.parent().parent()); if (m_patch == NULL) { m_error = PORT_NOT_FOUND; @@ -93,8 +93,8 @@ DisconnectionEvent::pre_process() return; }*/ - m_src_port = Ingen::instance().object_store()->find_port(m_src_port_path); - m_dst_port = Ingen::instance().object_store()->find_port(m_dst_port_path); + m_src_port = Engine::instance().object_store()->find_port(m_src_port_path); + m_dst_port = Engine::instance().object_store()->find_port(m_dst_port_path); } if (m_src_port == NULL || m_dst_port == NULL) { @@ -248,12 +248,12 @@ TypedDisconnectionEvent<T>::execute(SampleCount offset) assert((Connection*)port_connection->elem() == patch_connection->elem()); // Clean up both the list node and the connection itself... - Ingen::instance().maid()->push(port_connection); - Ingen::instance().maid()->push(patch_connection); - Ingen::instance().maid()->push(port_connection->elem()); + Engine::instance().maid()->push(port_connection); + Engine::instance().maid()->push(patch_connection); + Engine::instance().maid()->push(port_connection->elem()); if (m_patch->process_order() != NULL) - Ingen::instance().maid()->push(m_patch->process_order()); + Engine::instance().maid()->push(m_patch->process_order()); m_patch->process_order(m_process_order); } else { m_succeeded = false; // Ports weren't connected @@ -271,7 +271,7 @@ TypedDisconnectionEvent<T>::post_process() _responder->respond_ok(); - Ingen::instance().client_broadcaster()->send_disconnection(m_src_port->path(), m_dst_port->path()); + Engine::instance().client_broadcaster()->send_disconnection(m_src_port->path(), m_dst_port->path()); } else { _responder->respond_error("Unable to disconnect ports."); } |