diff options
| author | David Robillard <d@drobilla.net> | 2006-09-08 06:23:25 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-09-08 06:23:25 +0000 |
| commit | 43d51948ccae71b8f0a1c1710e25cf36da8d7d7c (patch) | |
| tree | f81e18174cf0a798a908afb954f6595d6c0b72ab /src/libs/engine/Engine.cpp | |
| parent | 48f87f1f1649fb7e169fdaac2cd38370e8a4a1fa (diff) | |
| download | ingen-43d51948ccae71b8f0a1c1710e25cf36da8d7d7c.tar.gz ingen-43d51948ccae71b8f0a1c1710e25cf36da8d7d7c.tar.bz2 ingen-43d51948ccae71b8f0a1c1710e25cf36da8d7d7c.zip | |
Renamed communications classes for consistency.
Removed engine dependency on OSC (mostly).
git-svn-id: http://svn.drobilla.net/lad/ingen@120 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/libs/engine/Engine.cpp')
| -rw-r--r-- | src/libs/engine/Engine.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/libs/engine/Engine.cpp b/src/libs/engine/Engine.cpp index a98f4fbf..ebe8e4f7 100644 --- a/src/libs/engine/Engine.cpp +++ b/src/libs/engine/Engine.cpp @@ -24,7 +24,6 @@ #include "util/Queue.h" #include "JackAudioDriver.h" #include "NodeFactory.h" -#include "OSCReceiver.h" #include "ClientBroadcaster.h" #include "Patch.h" #include "ObjectStore.h" @@ -49,9 +48,9 @@ using std::cout; using std::cerr; using std::endl; namespace Ingen { -Engine::Engine(const char* listen_port, AudioDriver* audio_driver) -: m_audio_driver( (audio_driver) ? audio_driver : new JackAudioDriver(*this) ), - m_osc_receiver(new OSCReceiver(*this, pre_processor_queue_size, listen_port)), +Engine::Engine(AudioDriver* audio_driver) +: m_event_source(NULL), + m_audio_driver( (audio_driver) ? audio_driver : new JackAudioDriver(*this) ), #ifdef HAVE_JACK_MIDI m_midi_driver(new JackMidiDriver(((JackAudioDriver*)m_audio_driver)->jack_client())), #elif HAVE_ALSA_MIDI @@ -72,7 +71,6 @@ Engine::Engine(const char* listen_port, AudioDriver* audio_driver) m_quit_flag(false), m_activated(false) { - m_osc_receiver->activate(); } @@ -88,7 +86,6 @@ Engine::~Engine() delete m_object_store; delete m_client_broadcaster; - delete m_osc_receiver; delete m_node_factory; delete m_midi_driver; delete m_audio_driver; @@ -183,7 +180,6 @@ Engine::deactivate() if (m_midi_driver != NULL) m_midi_driver->deactivate(); - m_osc_receiver->deactivate(); m_audio_driver->deactivate(); // Finalize any lingering events (unlikely) |