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

Remove unused condition (MIDI calibration starts engine)

Browse Source 
MIDI latency calibration is now only possible when the engine
is running (since 4c8f562053).

This reverts part of e6febe040a
and a2f7abc70b
This commit is contained in:
Robin Gareus 2020-05-21 22:06:43 +02:00
parent 08d4350ddf
commit 08da389acc
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
2 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gtk2_ardour/engine_dialog.cc
View File

@ -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 {

1
gtk2_ardour/engine_dialog.h
View File

@ -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__ */