summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-02-19 16:38:38 +0000
committerDavid Robillard <d@drobilla.net>2011-02-19 16:38:38 +0000
commitee2d096d7160ea4426b060626392ce7a451e1d1e (patch)
tree81b37e3cab2068b637e98a47620777176e23a731
parenta69e10a438e6a5903abe5e3c0f435591a113237c (diff)
downloadingen-ee2d096d7160ea4426b060626392ce7a451e1d1e.tar.gz
ingen-ee2d096d7160ea4426b060626392ce7a451e1d1e.tar.bz2
ingen-ee2d096d7160ea4426b060626392ce7a451e1d1e.zip
Remove cruft, clean up Jack shutdown stuff.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3000 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r--src/engine/JackDriver.cpp10
-rw-r--r--src/engine/JackDriver.hpp1
2 files changed, 3 insertions, 8 deletions
diff --git a/src/engine/JackDriver.cpp b/src/engine/JackDriver.cpp
index d83c319f..5b1342cf 100644
--- a/src/engine/JackDriver.cpp
+++ b/src/engine/JackDriver.cpp
@@ -197,7 +197,6 @@ JackDriver::JackDriver(Engine& engine)
, _block_length(0)
, _sample_rate(0)
, _is_activated(false)
- , _local_client(true)
, _process_context(engine)
, _root_patch(NULL)
{
@@ -210,7 +209,7 @@ JackDriver::~JackDriver()
{
deactivate();
- if (_local_client)
+ if (_client)
jack_client_close(_client);
}
@@ -266,8 +265,6 @@ JackDriver::attach(const std::string& server_name,
_client = (jack_client_t*)jack_client;
}
- _local_client = (jack_client == NULL);
-
_block_length = jack_get_buffer_size(_client);
_sample_rate = jack_get_sample_rate(_client);
@@ -323,9 +320,8 @@ JackDriver::deactivate()
for (Raul::List<JackPort*>::iterator i = _ports.begin(); i != _ports.end(); ++i)
(*i)->destroy();
- jack_deactivate(_client);
-
- if (_local_client) {
+ if (_client) {
+ jack_deactivate(_client);
jack_client_close(_client);
_client = NULL;
}
diff --git a/src/engine/JackDriver.hpp b/src/engine/JackDriver.hpp
index b10efad1..278a5477 100644
--- a/src/engine/JackDriver.hpp
+++ b/src/engine/JackDriver.hpp
@@ -173,7 +173,6 @@ private:
jack_nframes_t _sample_rate;
uint32_t _midi_event_type;
bool _is_activated;
- bool _local_client; ///< Whether _client should be closed on destruction
jack_position_t _position;
jack_transport_state_t _transport_state;
Raul::List<JackPort*> _ports;