X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fengine_dialog.cc;h=92a85a3a2a4c0600b6ffc795200876940cc21214;hb=cb51c4c5aa1717d1e37f370b3610e4f8f7b1e0bf;hp=31738bed15cc892ca63e891026c77113020c8248;hpb=8bed793b487255918d44564a2169a68296374213;p=ardour.git diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc index 31738bed15..92a85a3a2a 100644 --- a/gtk2_ardour/engine_dialog.cc +++ b/gtk2_ardour/engine_dialog.cc @@ -27,6 +27,7 @@ #include #include "pbd/error.h" +#include "pbd/locale_guard.h" #include "pbd/xml++.h" #include "pbd/unwind.h" #include "pbd/failed_constructor.h" @@ -63,6 +64,7 @@ using namespace Gtk; using namespace Gtkmm2ext; using namespace PBD; using namespace Glib; +using namespace ArdourWidgets; using namespace ARDOUR_UI_UTILS; #define DEBUG_ECONTROL(msg) DEBUG_TRACE (PBD::DEBUG::EngineControl, string_compose ("%1: %2\n", __LINE__, msg)); @@ -400,8 +402,8 @@ EngineControl::unblock_changed_signals () EngineControl::SignalBlocker::SignalBlocker (EngineControl& engine_control, const std::string& reason) - : ec (engine_control) - , m_reason (reason) + : ec (engine_control) + , m_reason (reason) { DEBUG_ECONTROL (string_compose ("SignalBlocker: %1", m_reason)); ec.block_changed_signals (); @@ -417,9 +419,6 @@ void EngineControl::on_show () { ArdourDialog::on_show (); - if (Splash::instance()) { - Splash::instance()->hide (); - } if (!ARDOUR::AudioEngine::instance()->current_backend() || !ARDOUR::AudioEngine::instance()->running()) { // re-check _have_control (jackd running) see #6041 backend_changed (); @@ -804,22 +803,10 @@ EngineControl::update_sensitivity () if (get_popdown_string_count (buffer_size_combo) > 0) { if (!engine_running) { buffer_size_combo.set_sensitive (valid); - } else if (backend->can_change_sample_rate_when_running()) { + } else if (backend->can_change_buffer_size_when_running ()) { buffer_size_combo.set_sensitive (valid || !_have_control); } else { -#if 1 - /* TODO - * Currently there is no way to manually stop the - * engine in order to re-configure it. - * This needs to remain sensitive for now. - * - * (it's also handy to implicily - * re-start the engine) - */ - buffer_size_combo.set_sensitive (true); -#else buffer_size_combo.set_sensitive (false); -#endif } } else { buffer_size_combo.set_sensitive (false); @@ -1045,6 +1032,7 @@ EngineControl::backend_changed () if (!_have_control) { // set settings from backend that we do have control over + set_buffersize_popdown_strings (); set_active_text_if_present (buffer_size_combo, bufsize_as_string (backend->buffer_size())); } @@ -1052,9 +1040,14 @@ EngineControl::backend_changed () // set driver & devices State state = get_matching_state (backend_combo.get_active_text()); if (state) { + DEBUG_ECONTROL ("backend-changed(): found prior state for backend"); PBD::Unwinder protect_ignore_changes (ignore_changes, ignore_changes + 1); set_current_state (state); + } else { + DEBUG_ECONTROL ("backend-changed(): no prior state for backend"); } + } else { + DEBUG_ECONTROL (string_compose ("backend-changed(): _have_control=%1 ignore_changes=%2", _have_control, ignore_changes)); } if (!ignore_changes) { @@ -1439,7 +1432,7 @@ EngineControl::set_buffersize_popdown_strings () s.push_back (bufsize_as_string (*x)); } - uint32_t previous_size = 0; + uint32_t previous_size = backend->buffer_size (); if (!buffer_size_combo.get_active_text().empty()) { previous_size = get_buffer_size (); } @@ -1485,13 +1478,13 @@ EngineControl::set_nperiods_popdown_strings () } for (vector::const_iterator x = np.begin(); x != np.end(); ++x) { - s.push_back (nperiods_as_string (*x)); + s.push_back (to_string (*x)); } set_popdown_strings (nperiods_combo, s); if (!s.empty()) { - set_active_text_if_present (nperiods_combo, nperiods_as_string (backend->period_size())); // XXX + set_active_text_if_present (nperiods_combo, to_string (backend->period_size())); // XXX } update_sensitivity (); @@ -1611,18 +1604,9 @@ EngineControl::output_device_changed () string EngineControl::bufsize_as_string (uint32_t sz) { - return string_compose (P_("%1 sample", "%1 samples", sz), sz); -} - -string -EngineControl::nperiods_as_string (uint32_t np) -{ - char buf[8]; - snprintf (buf, sizeof (buf), "%u", np); - return buf; + return string_compose (P_("%1 sample", "%1 samples", sz), to_string(sz)); } - void EngineControl::sample_rate_changed () { @@ -1639,6 +1623,12 @@ void EngineControl::buffer_size_changed () { DEBUG_ECONTROL ("buffer_size_changed"); + if (ARDOUR::AudioEngine::instance()->running()) { + boost::shared_ptr backend = ARDOUR::AudioEngine::instance()->current_backend(); + if (backend && backend->can_change_buffer_size_when_running ()) { + backend->set_buffer_size (get_buffer_size()); + } + } show_buffer_duration (); } @@ -1803,6 +1793,7 @@ bool EngineControl::equivalent_states (const EngineControl::State& state1, return false; } +// sort active first, then most recently used to the beginning of the list bool EngineControl::state_sort_cmp (const State &a, const State &b) { if (a->active) { @@ -1812,7 +1803,7 @@ EngineControl::state_sort_cmp (const State &a, const State &b) { return false; } else { - return a->lru < b->lru; + return a->lru > b->lru; } } @@ -1873,7 +1864,7 @@ EngineControl::store_state (State state) void EngineControl::maybe_display_saved_state () { - if (!_have_control) { + if (!_have_control || ARDOUR::AudioEngine::instance()->running ()) { return; } @@ -1888,7 +1879,7 @@ EngineControl::maybe_display_saved_state () } set_active_text_if_present (buffer_size_combo, bufsize_as_string (state->buffer_size)); - set_active_text_if_present (nperiods_combo, nperiods_as_string (state->n_periods)); + set_active_text_if_present (nperiods_combo, to_string(state->n_periods)); /* call this explicitly because we're ignoring changes to the controls at this point. */ @@ -1922,30 +1913,31 @@ EngineControl::get_state () XMLNode* node = new XMLNode ("State"); - node->add_property ("backend", (*i)->backend); - node->add_property ("driver", (*i)->driver); - node->add_property ("device", (*i)->device); - node->add_property ("input-device", (*i)->input_device); - node->add_property ("output-device", (*i)->output_device); - node->add_property ("sample-rate", (*i)->sample_rate); - node->add_property ("buffer-size", (*i)->buffer_size); - node->add_property ("n-periods", (*i)->n_periods); - node->add_property ("input-latency", (*i)->input_latency); - node->add_property ("output-latency", (*i)->output_latency); - node->add_property ("input-channels", (*i)->input_channels); - node->add_property ("output-channels", (*i)->output_channels); - node->add_property ("active", (*i)->active ? "yes" : "no"); - node->add_property ("use-buffered-io", (*i)->use_buffered_io ? "yes" : "no"); - node->add_property ("midi-option", (*i)->midi_option); - node->add_property ("lru", (*i)->active ? time (NULL) : (*i)->lru); + node->set_property ("backend", (*i)->backend); + node->set_property ("driver", (*i)->driver); + node->set_property ("device", (*i)->device); + node->set_property ("input-device", (*i)->input_device); + node->set_property ("output-device", (*i)->output_device); + node->set_property ("sample-rate", (*i)->sample_rate); + node->set_property ("buffer-size", (*i)->buffer_size); + node->set_property ("n-periods", (*i)->n_periods); + node->set_property ("input-latency", (*i)->input_latency); + node->set_property ("output-latency", (*i)->output_latency); + node->set_property ("input-channels", (*i)->input_channels); + node->set_property ("output-channels", (*i)->output_channels); + node->set_property ("active", (*i)->active); + node->set_property ("use-buffered-io", (*i)->use_buffered_io); + node->set_property ("midi-option", (*i)->midi_option); + int32_t lru_val = (*i)->active ? time (NULL) : (*i)->lru; + node->set_property ("lru", lru_val ); XMLNode* midi_devices = new XMLNode ("MIDIDevices"); for (std::vector::const_iterator p = (*i)->midi_devices.begin(); p != (*i)->midi_devices.end(); ++p) { XMLNode* midi_device_stuff = new XMLNode ("MIDIDevice"); - midi_device_stuff->add_property (X_("name"), (*p)->name); - midi_device_stuff->add_property (X_("enabled"), (*p)->enabled); - midi_device_stuff->add_property (X_("input-latency"), (*p)->input_latency); - midi_device_stuff->add_property (X_("output-latency"), (*p)->output_latency); + midi_device_stuff->set_property (X_("name"), (*p)->name); + midi_device_stuff->set_property (X_("enabled"), (*p)->enabled); + midi_device_stuff->set_property (X_("input-latency"), (*p)->input_latency); + midi_device_stuff->set_property (X_("output-latency"), (*p)->output_latency); midi_devices->add_child_nocopy (*midi_device_stuff); } node->add_child_nocopy (*midi_devices); @@ -1982,7 +1974,6 @@ EngineControl::set_state (const XMLNode& root) XMLNodeConstIterator citer, cciter; XMLNode const * child; XMLNode const * grandchild; - XMLProperty const * prop = NULL; if (root.name() != "AudioMIDISetup") { return false; @@ -2011,132 +2002,68 @@ EngineControl::set_state (const XMLNode& root) continue; } - if ((prop = grandchild->property ("backend")) == 0) { - continue; - } - state->backend = prop->value (); - - if ((prop = grandchild->property ("driver")) == 0) { - continue; - } - state->driver = prop->value (); - - if ((prop = grandchild->property ("device")) == 0) { - continue; - } - state->device = prop->value (); - - if ((prop = grandchild->property ("input-device")) == 0) { - continue; - } - state->input_device = prop->value (); - - if ((prop = grandchild->property ("output-device")) == 0) { + if (!grandchild->get_property ("backend", state->backend)) { continue; } - state->output_device = prop->value (); - if ((prop = grandchild->property ("sample-rate")) == 0) { + // If any of the required properties are not found in the state node + // then continue/skip to the next engine state + if (!grandchild->get_property ("driver", state->driver) || + !grandchild->get_property ("device", state->device) || + !grandchild->get_property ("input-device", state->input_device) || + !grandchild->get_property ("output-device", state->output_device) || + !grandchild->get_property ("sample-rate", state->sample_rate) || + !grandchild->get_property ("buffer-size", state->buffer_size) || + !grandchild->get_property ("input-latency", state->input_latency) || + !grandchild->get_property ("output-latency", state->output_latency) || + !grandchild->get_property ("input-channels", state->input_channels) || + !grandchild->get_property ("output-channels", state->output_channels) || + !grandchild->get_property ("active", state->active) || + !grandchild->get_property ("use-buffered-io", state->use_buffered_io) || + !grandchild->get_property ("midi-option", state->midi_option)) { continue; } - state->sample_rate = atof (prop->value ()); - if ((prop = grandchild->property ("buffer-size")) == 0) { - continue; - } - state->buffer_size = atoi (prop->value ()); - - if ((prop = grandchild->property ("n-periods")) == 0) { + if (!grandchild->get_property ("n-periods", state->n_periods)) { // optional (new value in 4.5) state->n_periods = 0; - } else { - state->n_periods = atoi (prop->value ()); } - if ((prop = grandchild->property ("input-latency")) == 0) { - continue; - } - state->input_latency = atoi (prop->value ()); - - if ((prop = grandchild->property ("output-latency")) == 0) { - continue; - } - state->output_latency = atoi (prop->value ()); - - if ((prop = grandchild->property ("input-channels")) == 0) { - continue; - } - state->input_channels = atoi (prop->value ()); - - if ((prop = grandchild->property ("output-channels")) == 0) { - continue; - } - state->output_channels = atoi (prop->value ()); - - if ((prop = grandchild->property ("active")) == 0) { - continue; - } - state->active = string_is_affirmative (prop->value ()); - - if ((prop = grandchild->property ("use-buffered-io")) == 0) { - continue; - } - state->use_buffered_io = string_is_affirmative (prop->value ()); - - if ((prop = grandchild->property ("midi-option")) == 0) { - continue; - } - state->midi_option = prop->value (); - state->midi_devices.clear(); XMLNode* midinode; if ((midinode = ARDOUR::find_named_node (*grandchild, "MIDIDevices")) != 0) { const XMLNodeList mnc = midinode->children(); for (XMLNodeList::const_iterator n = mnc.begin(); n != mnc.end(); ++n) { - if ((*n)->property (X_("name")) == 0 - || (*n)->property (X_("enabled")) == 0 - || (*n)->property (X_("input-latency")) == 0 - || (*n)->property (X_("output-latency")) == 0 - ) { + std::string name; + bool enabled; + uint32_t input_latency; + uint32_t output_latency; + + if (!(*n)->get_property (X_("name"), name) || + !(*n)->get_property (X_("enabled"), enabled) || + !(*n)->get_property (X_("input-latency"), input_latency) || + !(*n)->get_property (X_("output-latency"), output_latency)) { continue; } - MidiDeviceSettings ptr (new MidiDeviceSetting( - (*n)->property (X_("name"))->value (), - string_is_affirmative ((*n)->property (X_("enabled"))->value ()), - atoi ((*n)->property (X_("input-latency"))->value ()), - atoi ((*n)->property (X_("output-latency"))->value ()) - )); + MidiDeviceSettings ptr ( + new MidiDeviceSetting (name, enabled, input_latency, output_latency)); state->midi_devices.push_back (ptr); } } - if ((prop = grandchild->property ("lru"))) { - state->lru = atoi (prop->value ()); + int32_t lru_val; + if (grandchild->get_property ("lru", lru_val)) { + state->lru = lru_val; } -#if 1 - /* remove accumulated duplicates (due to bug in ealier version) - * this can be removed again before release - */ - for (StateList::iterator i = states.begin(); i != states.end();) { - if ((*i)->backend == state->backend && - (*i)->driver == state->driver && - (*i)->device == state->device) { - i = states.erase(i); - } else { - ++i; - } - } -#endif - states.push_back (state); } } /* now see if there was an active state and switch the setup to it */ - // purge states of backend that are not available in this built + /* purge states of backend that are not available in this built */ vector backends = ARDOUR::AudioEngine::instance()->available_backends(); vector backend_names; @@ -2153,6 +2080,28 @@ EngineControl::set_state (const XMLNode& root) states.sort (state_sort_cmp); + /* purge old states referring to the same backend */ + const time_t now = time (NULL); + for (vector::const_iterator bi = backend_names.begin(); bi != backend_names.end(); ++bi) { + bool first = true; + for (StateList::iterator i = states.begin(); i != states.end();) { + if ((*i)->backend != *bi) { + ++i; continue; + } + // keep at latest one for every audio-system + if (first) { + first = false; + ++i; continue; + } + // also keep states used in the last 90 days. + if ((now - (*i)->lru) < 86400 * 90) { + ++i; continue; + } + assert (!(*i)->active); + i = states.erase(i); + } + } + for (StateList::const_iterator i = states.begin(); i != states.end(); ++i) { if ((*i)->active) { @@ -2254,7 +2203,7 @@ EngineControl::set_current_state (const State& state) sample_rate_combo.set_active_text (rate_as_string (state->sample_rate)); } set_active_text_if_present (buffer_size_combo, bufsize_as_string (state->buffer_size)); - set_active_text_if_present (nperiods_combo, nperiods_as_string (state->n_periods)); + set_active_text_if_present (nperiods_combo, to_string (state->n_periods)); input_latency.set_value (state->input_latency); output_latency.set_value (state->output_latency); midi_option_combo.set_active_text (state->midi_option); @@ -2730,14 +2679,13 @@ EngineControl::start_stop_button_clicked () ARDOUR::AudioEngine::instance()->stop (); } else { if (!ARDOUR_UI::instance()->session_loaded) { + pop_splash (); hide (); + ARDOUR::GUIIdle (); } start_engine (); if (!ARDOUR_UI::instance()->session_loaded) { ArdourDialog::on_response (RESPONSE_OK); - if (Splash::instance()) { - Splash::instance()->pop_front (); - } } } } @@ -2885,7 +2833,7 @@ EngineControl::check_audio_latency_measurement () } char buf[256]; - ARDOUR::framecnt_t const sample_rate = ARDOUR::AudioEngine::instance()->sample_rate(); + ARDOUR::samplecnt_t const sample_rate = ARDOUR::AudioEngine::instance()->sample_rate(); if (sample_rate == 0) { lm_results.set_markup (string_compose (results_markup, _("Disconnected from audio engine"))); @@ -2893,12 +2841,12 @@ EngineControl::check_audio_latency_measurement () return false; } - int frames_total = mtdm->del(); - int extra = frames_total - ARDOUR::AudioEngine::instance()->latency_signal_delay(); + int samples_total = mtdm->del(); + int extra = samples_total - ARDOUR::AudioEngine::instance()->latency_signal_delay(); snprintf (buf, sizeof (buf), "%s%d samples (%.3lf ms)\n%s%d samples (%.3lf ms)", _("Detected roundtrip latency: "), - frames_total, frames_total * 1000.0f/sample_rate, + samples_total, samples_total * 1000.0f/sample_rate, _("Systemic latency: "), extra, extra * 1000.0f/sample_rate); @@ -2939,7 +2887,7 @@ EngineControl::check_midi_latency_measurement () } char buf[256]; - ARDOUR::framecnt_t const sample_rate = ARDOUR::AudioEngine::instance()->sample_rate(); + ARDOUR::samplecnt_t const sample_rate = ARDOUR::AudioEngine::instance()->sample_rate(); if (sample_rate == 0) { lm_results.set_markup (string_compose (results_markup, _("Disconnected from audio engine"))); @@ -2947,11 +2895,11 @@ EngineControl::check_midi_latency_measurement () return false; } - ARDOUR::framecnt_t frames_total = mididm->latency(); - ARDOUR::framecnt_t extra = frames_total - ARDOUR::AudioEngine::instance()->latency_signal_delay(); + ARDOUR::samplecnt_t samples_total = mididm->latency(); + ARDOUR::samplecnt_t extra = samples_total - ARDOUR::AudioEngine::instance()->latency_signal_delay(); snprintf (buf, sizeof (buf), "%s%" PRId64" samples (%.1lf ms) dev: %.2f[spl]\n%s%" PRId64" samples (%.1lf ms)", _("Detected roundtrip latency: "), - frames_total, frames_total * 1000.0f / sample_rate, mididm->deviation (), + samples_total, samples_total * 1000.0f / sample_rate, mididm->deviation (), _("Systemic latency: "), extra, extra * 1000.0f / sample_rate); @@ -3039,23 +2987,28 @@ EngineControl::latency_button_clicked () void EngineControl::latency_back_button_clicked () { - ARDOUR::AudioEngine::instance()->stop(true); + ARDOUR::AudioEngine::instance()->stop_latency_detection (); notebook.set_current_page(0); } void EngineControl::use_latency_button_clicked () { + boost::shared_ptr backend = ARDOUR::AudioEngine::instance()->current_backend(); if (_measure_midi) { ARDOUR::MIDIDM* mididm = ARDOUR::AudioEngine::instance()->mididm (); if (!mididm) { return; } - ARDOUR::framecnt_t frames_total = mididm->latency(); - ARDOUR::framecnt_t extra = frames_total - ARDOUR::AudioEngine::instance()->latency_signal_delay(); - uint32_t one_way = max ((ARDOUR::framecnt_t) 0, extra / 2); + ARDOUR::samplecnt_t samples_total = mididm->latency(); + ARDOUR::samplecnt_t extra = samples_total - ARDOUR::AudioEngine::instance()->latency_signal_delay(); + uint32_t one_way = max ((ARDOUR::samplecnt_t) 0, extra / 2); _measure_midi->input_latency = one_way; _measure_midi->output_latency = one_way; + 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); + } notebook.set_current_page (midi_tab); } else { MTDM* mtdm = ARDOUR::AudioEngine::instance()->mtdm (); @@ -3069,6 +3022,10 @@ EngineControl::use_latency_button_clicked () input_latency_adjustment.set_value (one_way); output_latency_adjustment.set_value (one_way); + if (backend->can_change_systemic_latency_when_running ()) { + backend->set_systemic_input_latency (one_way); + backend->set_systemic_output_latency (one_way); + } /* back to settings page */ notebook.set_current_page (0); @@ -3095,7 +3052,7 @@ EngineControl::engine_running () sample_rate_combo.set_active_text (rate_as_string (backend->sample_rate())); if (backend->can_set_period_size ()) { - set_active_text_if_present (nperiods_combo, nperiods_as_string (backend->period_size())); + set_active_text_if_present (nperiods_combo, to_string (backend->period_size())); } connect_disconnect_button.set_label (string_compose (_("Disconnect from %1"), backend->name())); @@ -3146,14 +3103,13 @@ EngineControl::connect_disconnect_click() stop_engine (); } else { if (!ARDOUR_UI::instance()->session_loaded) { + pop_splash (); hide (); + ARDOUR::GUIIdle (); } start_engine (); if (!ARDOUR_UI::instance()->session_loaded) { ArdourDialog::on_response (RESPONSE_OK); - if (Splash::instance()) { - Splash::instance()->pop_front (); - } } } }