diff options
| author | David Robillard <d@drobilla.net> | 2012-05-14 05:11:04 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2012-05-14 05:11:04 +0000 |
| commit | bf7116520bc723980edb1120eaa66455a4c66ca5 (patch) | |
| tree | db8320d389e5ecdecbf7df8efbb3962f5a851648 /src/server/JackDriver.cpp | |
| parent | 1952ad39639b620a8ce43b0b0edf5c1283e5e8c5 (diff) | |
| download | ingen-bf7116520bc723980edb1120eaa66455a4c66ca5.tar.gz ingen-bf7116520bc723980edb1120eaa66455a4c66ca5.tar.bz2 ingen-bf7116520bc723980edb1120eaa66455a4c66ca5.zip | |
Tidy.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4410 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/server/JackDriver.cpp')
| -rw-r--r-- | src/server/JackDriver.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/server/JackDriver.cpp b/src/server/JackDriver.cpp index 20bb89da..0c810f73 100644 --- a/src/server/JackDriver.cpp +++ b/src/server/JackDriver.cpp @@ -76,13 +76,13 @@ void JackPort::create() { _jack_port = jack_port_register( - _driver->jack_client(), - ingen_jack_port_name(_patch_port->path()).c_str(), - (_patch_port->is_a(PortType::AUDIO)) - ? JACK_DEFAULT_AUDIO_TYPE : JACK_DEFAULT_MIDI_TYPE, - (_patch_port->is_input()) - ? JackPortIsInput : JackPortIsOutput, - 0); + _driver->jack_client(), + ingen_jack_port_name(_patch_port->path()).c_str(), + (_patch_port->is_a(PortType::AUDIO)) + ? JACK_DEFAULT_AUDIO_TYPE : JACK_DEFAULT_MIDI_TYPE, + (_patch_port->is_input()) + ? JackPortIsInput : JackPortIsOutput, + 0); if (_jack_port == NULL) { LOG(Raul::error)(Raul::fmt("Failed to register port %1%\n") @@ -203,7 +203,7 @@ JackDriver::attach(const std::string& server_name, { assert(!_client); if (!jack_client) { - #ifdef INGEN_JACK_SESSION +#ifdef INGEN_JACK_SESSION const std::string uuid = _engine.world()->jack_uuid(); if (!uuid.empty()) { _client = jack_client_open(client_name.c_str(), @@ -212,15 +212,15 @@ JackDriver::attach(const std::string& server_name, LOG(Raul::info)(Raul::fmt("Connected to JACK as `%1%' (UUID `%2%')\n") % client_name.c_str() % uuid); } - #endif +#endif // Try supplied server name if (!_client && !server_name.empty()) { if ((_client = jack_client_open(client_name.c_str(), - JackServerName, NULL, + JackServerName, NULL, server_name.c_str()))) { LOG(Raul::info)(Raul::fmt("Connected to JACK server `%1%'\n") - % server_name); + % server_name); } } |