ardour/livetrax
13
0
Fork 0
Code

Continue to load session after latency calibration #7998

Browse Source
This commit is contained in:
Robin Gareus 2020-04-09 23:31:15 +02:00
parent 661609f2c0
commit e6febe040a
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gtk2_ardour/engine_dialog.cc
View File

@ -2869,6 +2869,8 @@ EngineControl::set_desired_sample_rate (uint32_t sr)
void void
EngineControl::on_switch_page (GtkNotebookPage*, guint page_num) EngineControl::on_switch_page (GtkNotebookPage*, guint page_num)
{ {
bool was_calibrating_midi = _measure_midi != 0;
if (page_num == 0) { if (page_num == 0) {
_measure_midi.reset(); _measure_midi.reset();
update_sensitivity (); update_sensitivity ();
@ -2935,6 +2937,17 @@ EngineControl::on_switch_page (GtkNotebookPage*, guint page_num)
end_latency_detection (); end_latency_detection ();
} }
} }
/* after latency calibration the engine is running, continue to load session.
* RESPONSE_OK is a NO-OP when the dialog is displayed as Window
* from a running instance.
*/
if (page_num == 0 && _have_control && was_calibrating_midi && ARDOUR::AudioEngine::instance()->running()) {
boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance()->current_backend();
if (backend && backend->can_change_systemic_latency_when_running ()) {
response (RESPONSE_OK);
}
}
} }
/* latency measurement */ /* latency measurement */
@ -3166,6 +3179,14 @@ EngineControl::use_latency_button_clicked ()
if (backend->can_change_systemic_latency_when_running ()) { if (backend->can_change_systemic_latency_when_running ()) {
backend->set_systemic_input_latency (one_way); backend->set_systemic_input_latency (one_way);
backend->set_systemic_output_latency (one_way); backend->set_systemic_output_latency (one_way);
/* engine is running, continue to load session.
* RESPONSE_OK is a NO-OP when the dialog is displayed as Window
* from a running instance.
*/
notebook.set_current_page (0);
response (RESPONSE_OK);
return;
} }
/* back to settings page */ /* back to settings page */