diff options
| author | Robin Gareus <robin@gareus.org> | 2020-05-21 22:06:43 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2020-05-21 22:06:43 +0200 |
| commit | 08da389acc428c91a5f44831448dac5d78b7abac (patch) | |
| tree | 9a605cd4d4ef0e8970b617d76d230f593a350c43 | |
| parent | 08d4350ddfb827b79418638ab525ec1ef5565c31 (diff) | |
Remove unused condition (MIDI calibration starts engine)
MIDI latency calibration is now only possible when the engine
is running (since 4c8f562053e2).
This reverts part of e6febe040af3c305a71b0ffdc10e9f9cd9a98e6b
and a2f7abc70b52b53ddeda985b7941e944e7bfec12
| -rw-r--r-- | gtk2_ardour/engine_dialog.cc | 16 | ||||
| -rw-r--r-- | gtk2_ardour/engine_dialog.h | 1 |
2 files changed, 0 insertions, 17 deletions
diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc index cdb2bdfbd1..f29b7fb89a 100644 --- a/gtk2_ardour/engine_dialog.cc +++ b/gtk2_ardour/engine_dialog.cc @@ -115,7 +115,6 @@ EngineControl::EngineControl () , queue_device_changed (false) , _have_control (true) , block_signals(0) - , _was_calibrating_midi (false) { using namespace Notebook_Helpers; vector<string> backend_names; @@ -3000,20 +2999,6 @@ EngineControl::on_switch_page (GtkNotebookPage*, guint page_num) 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) { - if (_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); - } - } - _was_calibrating_midi = false; - } } /* latency measurement */ @@ -3228,7 +3213,6 @@ EngineControl::use_latency_button_clicked () if (backend->can_change_systemic_latency_when_running ()) { backend->set_systemic_midi_input_latency (_measure_midi->name, one_way); backend->set_systemic_midi_output_latency (_measure_midi->name, one_way); - _was_calibrating_midi = true; } notebook.set_current_page (midi_tab); } else { diff --git a/gtk2_ardour/engine_dialog.h b/gtk2_ardour/engine_dialog.h index 57ae462745..e4b4f2c8e2 100644 --- a/gtk2_ardour/engine_dialog.h +++ b/gtk2_ardour/engine_dialog.h @@ -377,7 +377,6 @@ private: void midi_latency_adjustment_changed(Gtk::Adjustment *, MidiDeviceSettings, bool); void midi_device_enabled_toggled(ArdourWidgets::ArdourButton *, MidiDeviceSettings); sigc::connection lm_back_button_signal; - bool _was_calibrating_midi; }; #endif /* __gtk2_ardour_engine_dialog_h__ */ |