diff options
| author | David Robillard <d@drobilla.net> | 2009-05-13 20:49:12 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2009-05-13 20:49:12 +0000 |
| commit | ced834b9c6e9492f26b5cc80795951e2cd374adc (patch) | |
| tree | ef8601d6ec5a67ea11cab524afcafb851ad88c7d | |
| parent | 57381ee6b93ad6a991329c2a7aae0b2d84a3e7dd (diff) | |
| download | ingen-ced834b9c6e9492f26b5cc80795951e2cd374adc.tar.gz ingen-ced834b9c6e9492f26b5cc80795951e2cd374adc.tar.bz2 ingen-ced834b9c6e9492f26b5cc80795951e2cd374adc.zip | |
Clean up Jack shutdown semantics.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2003 a436a847-0d15-0410-975c-d299462d15a1
| -rw-r--r-- | src/engine/Engine.cpp | 2 | ||||
| -rw-r--r-- | src/engine/JackAudioDriver.cpp | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/engine/Engine.cpp b/src/engine/Engine.cpp index ba514382..3ebe383c 100644 --- a/src/engine/Engine.cpp +++ b/src/engine/Engine.cpp @@ -52,7 +52,7 @@ using namespace Shared; Engine::Engine(Ingen::Shared::World* world) - : _world(world) + : _world(world) , _midi_driver(NULL) , _osc_driver(NULL) , _maid(new Raul::Maid(maid_queue_size)) diff --git a/src/engine/JackAudioDriver.cpp b/src/engine/JackAudioDriver.cpp index 7a059139..68646434 100644 --- a/src/engine/JackAudioDriver.cpp +++ b/src/engine/JackAudioDriver.cpp @@ -396,8 +396,10 @@ void JackAudioDriver::_shutdown_cb() { cout << "[JackAudioDriver] Jack shutdown. Exiting." << endl; - _engine.quit(); + _is_activated = false; + delete _jack_thread; _jack_thread = NULL; + _client = NULL; } |