ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

NSM: Use session's rate when starting JACK 

Also log if jackd cannot be started or reached instead of
silently terminating.
This commit is contained in:
Robin Gareus 2020-05-21 16:11:39 +02:00
parent 5d0867ec10
commit 08d4350ddf
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gtk2_ardour/ardour_ui_startup.cc
View File

@ -705,9 +705,26 @@ ARDOUR_UI::load_from_application_api (const std::string& path)
}
if (nsm) {
AudioEngine::instance()->set_backend("JACK", "", "");
if (!AudioEngine::instance()->set_backend("JACK", "", "")) {
error << _("NSM: The JACK backend is mandatory and can not be loaded.") << endmsg;
return;
}
if (!AudioEngine::instance()->running()) {
/* this auto-starts jackd with recent settings
* TODO: if Glib::file_test (path, Glib::FILE_TEST_IS_DIR)
* query sample-rate of the session and use it.
*/
if (Glib::file_test (path, Glib::FILE_TEST_IS_DIR)) {
float sr;
SampleFormat sf;
string pv;
if (0 == Session::get_info_from_path (Glib::build_filename (path, basename_nosuffix (path) + statefile_suffix), sr, sf, pv)) {
ARDOUR::AudioEngine::instance ()->set_sample_rate (sr);
}
}
if (AudioEngine::instance()->start()) {
error << string_compose (_("NSM: %1 cannot connect to the JACK server. Please start jackd first."), PROGRAM_NAME) << endmsg;
return;
}
}