ardour/livetrax
13
0
Fork 0
Code

use AudioBackendInfo::already_configured() to correctly determine if backend requires setup

Browse Source 
Fixes issues when using JACK backend in combination with others, that prevented connecting to an existing JACK server.
This commit is contained in:
Paul Davis 2014-05-01 09:15:26 -04:00
parent 66559cd795
commit 392c3a6bef
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libs/ardour/audioengine.cc
View File

@ -594,7 +594,7 @@ AudioEngine::set_backend (const std::string& name, const std::string& arg1, cons
if (b->second->instantiate (arg1, arg2)) { if (b->second->instantiate (arg1, arg2)) {
throw failed_constructor (); throw failed_constructor ();
} }
_backend = b->second->factory (*this); _backend = b->second->factory (*this);
} catch (exception& e) { } catch (exception& e) {
@ -1016,17 +1016,15 @@ AudioEngine::halted_callback (const char* why)
bool bool
AudioEngine::setup_required () const AudioEngine::setup_required () const
{ {
/* If there is only a single backend and it claims to be configured if (_backend) {
* already there is no setup to be done. if (_backend->info().already_configured())
* return false;
* Primarily for a case where there is only a JACK backend and } else {
* JACK is already running. if (_backends.size() == 1 && _backends.begin()->second->already_configured()) {
*/ return false;
}
if (_backends.size() == 1 && _backends.begin()->second->already_configured()) {
return false;
} }
return true; return true;
} }