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/DSSIProgramEvent.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/DSSIProgramEvent.cpp')
| -rw-r--r-- | src/libs/engine/events/DSSIProgramEvent.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/libs/engine/events/DSSIProgramEvent.cpp b/src/libs/engine/events/DSSIProgramEvent.cpp index 9b5a85dd..a9f82b33 100644 --- a/src/libs/engine/events/DSSIProgramEvent.cpp +++ b/src/libs/engine/events/DSSIProgramEvent.cpp @@ -17,8 +17,7 @@ #include "DSSIProgramEvent.h" #include <cstdio> #include <iostream> -#include "Om.h" -#include "OmApp.h" +#include "Ingen.h" #include "Node.h" #include "ClientBroadcaster.h" #include "Plugin.h" @@ -29,7 +28,7 @@ using std::cout; using std::cerr; using std::endl; namespace Om { -DSSIProgramEvent::DSSIProgramEvent(CountedPtr<Responder> responder, samplecount timestamp, const string& node_path, int bank, int program) +DSSIProgramEvent::DSSIProgramEvent(CountedPtr<Responder> responder, SampleCount timestamp, const string& node_path, int bank, int program) : QueuedEvent(responder, timestamp), m_node_path(node_path), m_bank(bank), @@ -42,7 +41,7 @@ DSSIProgramEvent::DSSIProgramEvent(CountedPtr<Responder> responder, samplecount void DSSIProgramEvent::pre_process() { - Node* node = om->object_store()->find_node(m_node_path); + Node* node = Ingen::instance().object_store()->find_node(m_node_path); if (node != NULL && node->plugin()->type() == Plugin::DSSI) m_node = (DSSINode*)node; @@ -52,7 +51,7 @@ DSSIProgramEvent::pre_process() void -DSSIProgramEvent::execute(samplecount offset) +DSSIProgramEvent::execute(SampleCount offset) { if (m_node != NULL) m_node->program(m_bank, m_program); @@ -68,7 +67,7 @@ DSSIProgramEvent::post_process() // sends program as metadata in the form bank/program char* temp_buf = new char[16]; snprintf(temp_buf, 16, "%d/%d", m_bank, m_program); - om->client_broadcaster()->send_metadata_update(m_node_path, "dssi-program", temp_buf); + Ingen::instance().client_broadcaster()->send_metadata_update(m_node_path, "dssi-program", temp_buf); } } |