summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2009-05-13 21:01:15 +0000
committerDavid Robillard <d@drobilla.net>2009-05-13 21:01:15 +0000
commit393d883eff2959cf4fcee6dc895e150355a3bd2f (patch)
tree7efbe26daa52a8a17af5890b09ea146d7615f4f9
parent6907b8c5d709e246eb2f1ab109a52af1158e8e17 (diff)
downloadingen-393d883eff2959cf4fcee6dc895e150355a3bd2f.tar.gz
ingen-393d883eff2959cf4fcee6dc895e150355a3bd2f.tar.bz2
ingen-393d883eff2959cf4fcee6dc895e150355a3bd2f.zip
Support re-attaching to Jack.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2005 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r--src/engine/Engine.cpp3
-rw-r--r--src/engine/HTTPEngineReceiver.cpp1
-rw-r--r--src/engine/OSCEngineReceiver.cpp1
3 files changed, 0 insertions, 5 deletions
diff --git a/src/engine/Engine.cpp b/src/engine/Engine.cpp
index 3ebe383c..5da8ca56 100644
--- a/src/engine/Engine.cpp
+++ b/src/engine/Engine.cpp
@@ -177,9 +177,6 @@ Engine::set_midi_driver(MidiDriver* driver)
bool
Engine::activate(size_t parallelism)
{
- if (_activated)
- return false;
-
assert(_audio_driver);
if (!_midi_driver)
diff --git a/src/engine/HTTPEngineReceiver.cpp b/src/engine/HTTPEngineReceiver.cpp
index b3b40b04..61d74ada 100644
--- a/src/engine/HTTPEngineReceiver.cpp
+++ b/src/engine/HTTPEngineReceiver.cpp
@@ -100,7 +100,6 @@ HTTPEngineReceiver::activate_source()
void
HTTPEngineReceiver::deactivate_source()
{
- cout << "[HTTPEngineReceiver] Stopped HTTP listening thread" << endl;
_receive_thread->stop();
QueuedEventSource::deactivate_source();
}
diff --git a/src/engine/OSCEngineReceiver.cpp b/src/engine/OSCEngineReceiver.cpp
index 506d7f8d..8fa92803 100644
--- a/src/engine/OSCEngineReceiver.cpp
+++ b/src/engine/OSCEngineReceiver.cpp
@@ -151,7 +151,6 @@ OSCEngineReceiver::activate_source()
void
OSCEngineReceiver::deactivate_source()
{
- cout << "[OSCEngineReceiver] Stopped OSC listening thread" << endl;
_receive_thread->stop();
QueuedEventSource::deactivate_source();
}