diff options
| author | Ben Loftis <ben@harrisonconsoles.com> | 2019-12-06 13:25:44 -0600 |
|---|---|---|
| committer | Ben Loftis <ben@harrisonconsoles.com> | 2019-12-09 16:49:15 -0600 |
| commit | 7457fd2e27b4b10e3d5cd8fa0d5d1d45abbeae48 (patch) | |
| tree | e9196c2cb0a14bebb56d6865383c53f3c71c1efc /gtk2_ardour | |
| parent | 941aa2014888d6a501656b06454c00598ddf4581 (diff) | |
Autostart must {try to} use the session sample-rate. There is no ambiguity here.
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/startup_fsm.cc | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/gtk2_ardour/startup_fsm.cc b/gtk2_ardour/startup_fsm.cc index 7d05ca051a..e901e9311a 100644 --- a/gtk2_ardour/startup_fsm.cc +++ b/gtk2_ardour/startup_fsm.cc @@ -426,21 +426,9 @@ StartupFSM::start_audio_midi_setup () if (setup_required) { - /* Note: if autostart is enabled, and starting the engine is - * successful, but the session SR differs, there will be no - * chance to reset it. - * - * We could change this trivially with a call to - * AudioEngine::set_sample_rate(), but that opens a can of - * worms about policy, UX, GUI and more, because it isn't clear - * whether that's the correct thing to do. So for now (Nov - * 2019) we simply try the autostart if the user asked for it, - * and if necessary a session SR mismatch dialog will appear - * during loading. - */ - if (!session_is_new && (Config->get_try_autostart_engine () || g_getenv ("ARDOUR_TRY_AUTOSTART_ENGINE"))) { + AudioEngine::instance()->set_sample_rate(session_existing_sample_rate); if (!AudioEngine::instance()->start ()) { if (ARDOUR::AudioEngine::instance()->running()) { DEBUG_TRACE (DEBUG::GuiStartup, "autostart successful, audio/MIDI setup dialog not required\n"); |