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

Prepare to allow engine reconfiguration when SR mismatches 

Rather than fail to load the session or load with mismatching
sample-rate, this will allow a user to reconfigure the engine
and retry.
This commit is contained in:
Robin Gareus 2022-08-06 22:32:02 +02:00
parent 7ee4f116f2
commit 93e6f5a882
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
2 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libs/ardour/session.cc
View File

@ -442,6 +442,9 @@ Session::Session (AudioEngine &eng,
case -5:
throw SessionException (string_compose (_("Cannot initialize session/engine: %1"), _("Port registration failed.")));
break;
case -6:
throw SessionException (string_compose (_("Cannot initialize session/engine: %1"), _("Audio/MIDI Engine is not running or sample-rate mismatches.")));
break;
default:
throw SessionException (string_compose (_("Cannot initialize session/engine: %1"), _("Unexpected exception during session setup, possibly invalid audio/midi engine parameters. Please see stdout/stderr for details")));
break;

39
libs/ardour/session_state.cc
View File

@ -282,9 +282,16 @@ Session::post_engine_init ()
if (state_tree) {
try {
if (set_state (*state_tree->root(), Stateful::loading_state_version)) {
error << _("Could not set session state from XML") << endmsg;
return -4;
switch (set_state (*state_tree->root(), Stateful::loading_state_version)) {
case 0:
/* OK */
break;
case -2:
/* SR mismatch */
return -6;
default:
error << _("Could not set session state from XML") << endmsg;
return -4;
}
} catch (PBD::unknown_enumeration& e) {
error << _("Session state: ") << e.what() << endmsg;
@ -1674,11 +1681,29 @@ Session::set_state (const XMLNode& node, int version)
_nominal_sample_rate = _base_sample_rate;
assert (AudioEngine::instance()->running ());
if (_base_sample_rate != AudioEngine::instance()->sample_rate ()) {
while (!AudioEngine::instance()->running () || _base_sample_rate != AudioEngine::instance()->sample_rate ()) {
boost::optional<int> r = AskAboutSampleRateMismatch (_base_sample_rate, _current_sample_rate);
if (r.value_or (0)) {
goto out;
switch (r.value_or (0)) {
case 0:
if (AudioEngine::instance()->running ()) {
/* continue with rate mismatch */
break;
}
/* fallthrough */
case -1:
if (AudioEngine::instance()->running ()) {
/* retry */
continue;
}
/* fallthrough */
default:
if (AudioEngine::instance()->running ()) {
error << _("Session: Load aborted due to sample-rate mismatch") << endmsg;
} else {
error << _("Session: Load aborted since engine if offline") << endmsg;
}
ret = -2;
goto out;
}
}
}