Update GPL boilerplate and (C)
[ardour.git] / gtk2_ardour / engine_dialog.cc
index 8b93cbf799eefd3b8fbfbce90ad8476d6e80a4c0..d7566efca739d5b7ef52e4bc5c0b5505ebb985ac 100644 (file)
@@ -1,21 +1,26 @@
 /*
-    Copyright (C) 2010 Paul Davis
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
+ * Copyright (C) 2007-2012 Carl Hetherington <carl@carlh.net>
+ * Copyright (C) 2007-2017 Paul Davis <paul@linuxaudiosystems.com>
+ * Copyright (C) 2008-2012 David Robillard <d@drobilla.net>
+ * Copyright (C) 2013-2014 Colin Fletcher <colin.m.fletcher@googlemail.com>
+ * Copyright (C) 2013-2019 Robin Gareus <robin@gareus.org>
+ * Copyright (C) 2015-2016 Tim Mayberry <mojofunk@gmail.com>
+ * Copyright (C) 2015 Ben Loftis <ben@harrisonconsoles.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 #include <exception>
 #include <vector>
@@ -27,6 +32,7 @@
 #include <gtkmm/messagedialog.h>
 
 #include "pbd/error.h"
+#include "pbd/locale_guard.h"
 #include "pbd/xml++.h"
 #include "pbd/unwind.h"
 #include "pbd/failed_constructor.h"
@@ -63,6 +69,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));
@@ -171,17 +178,25 @@ EngineControl::EngineControl ()
        lm_table.attach (*preamble, 0, 3, row, row+1, AttachOptions(FILL|EXPAND), (AttachOptions) 0);
        row++;
 
-       label = manage (new Label (_("Output channel")));
+       label = manage (new Label (_("Output channel:")));
        lm_table.attach (*label, 0, 1, row, row+1, xopt, (AttachOptions) 0);
 
+       lm_output_channel_list = Gtk::ListStore::create (lm_output_channel_cols);
+       lm_output_channel_combo.set_model (lm_output_channel_list);
+       lm_output_channel_combo.pack_start (lm_output_channel_cols.pretty_name);
+
        Gtk::Alignment* misc_align = manage (new Alignment (0.0, 0.5));
        misc_align->add (lm_output_channel_combo);
        lm_table.attach (*misc_align, 1, 3, row, row+1, xopt, (AttachOptions) 0);
        ++row;
 
-       label = manage (new Label (_("Input channel")));
+       label = manage (new Label (_("Input channel:")));
        lm_table.attach (*label, 0, 1, row, row+1, xopt, (AttachOptions) 0);
 
+       lm_input_channel_list = Gtk::ListStore::create (lm_input_channel_cols);
+       lm_input_channel_combo.set_model (lm_input_channel_list);
+       lm_input_channel_combo.pack_start (lm_input_channel_cols.pretty_name);
+
        misc_align = manage (new Alignment (0.0, 0.5));
        misc_align->add (lm_input_channel_combo);
        lm_table.attach (*misc_align, 1, 3, row, row+1, FILL, (AttachOptions) 0);
@@ -400,8 +415,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 +432,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 ();
@@ -431,7 +443,7 @@ EngineControl::on_show ()
 void
 EngineControl::on_map ()
 {
-       if (!ARDOUR_UI::instance()->session_loaded && !PublicEditor::_instance) {
+       if (!ARDOUR_UI::instance()->the_session () && !PublicEditor::_instance) {
                set_type_hint (Gdk::WINDOW_TYPE_HINT_NORMAL);
        } else if (UIConfiguration::instance().get_all_floating_windows_are_dialogs()) {
                set_type_hint (Gdk::WINDOW_TYPE_HINT_DIALOG);
@@ -596,7 +608,7 @@ EngineControl::build_full_control_notebook ()
        output_channels.set_editable (true);
 
        if (!ARDOUR::Profile->get_mixbus()) {
-               label = manage (left_aligned_label (_("Input Channels:")));
+               label = manage (left_aligned_label (_("Input channels:")));
                basic_packer.attach (*label, 0, 1, row, row+1, xopt, (AttachOptions) 0);
                basic_packer.attach (input_channels, 1, 2, row, row+1, xopt, (AttachOptions) 0);
                ++row;
@@ -609,7 +621,7 @@ EngineControl::build_full_control_notebook ()
        output_channels.set_editable (true);
 
        if (!ARDOUR::Profile->get_mixbus()) {
-               label = manage (left_aligned_label (_("Output Channels:")));
+               label = manage (left_aligned_label (_("Output channels:")));
                basic_packer.attach (*label, 0, 1, row, row+1, xopt, (AttachOptions) 0);
                basic_packer.attach (output_channels, 1, 2, row, row+1, xopt, (AttachOptions) 0);
                ++row;
@@ -698,9 +710,8 @@ EngineControl::~EngineControl ()
 void
 EngineControl::disable_latency_tab ()
 {
-       vector<string> empty;
-       set_popdown_strings (lm_output_channel_combo, empty);
-       set_popdown_strings (lm_input_channel_combo, empty);
+       lm_input_channel_list->clear ();
+       lm_output_channel_list->clear ();
        lm_measure_button.set_sensitive (false);
        lm_use_button.set_sensitive (false);
 }
@@ -738,12 +749,24 @@ EngineControl::enable_latency_tab ()
                lm_preamble.show ();
        }
 
-       set_popdown_strings (lm_output_channel_combo, outputs);
-       lm_output_channel_combo.set_active_text (outputs.front());
+       lm_output_channel_list->clear ();
+       for (vector<string>::const_iterator i = outputs.begin(); i != outputs.end(); ++i) {
+               Gtk::TreeModel::iterator iter = lm_output_channel_list->append ();
+               Gtk::TreeModel::Row row = *iter;
+                row[lm_output_channel_cols.port_name] = *i;
+                row[lm_output_channel_cols.pretty_name] = ARDOUR::AudioEngine::instance()->get_pretty_name_by_name (*i);
+       }
+       lm_output_channel_combo.set_active (0);
        lm_output_channel_combo.set_sensitive (true);
 
-       set_popdown_strings (lm_input_channel_combo, inputs);
-       lm_input_channel_combo.set_active_text (inputs.front());
+       lm_input_channel_list->clear ();
+       for (vector<string>::const_iterator i = inputs.begin(); i != inputs.end(); ++i) {
+               Gtk::TreeModel::iterator iter = lm_input_channel_list->append ();
+               Gtk::TreeModel::Row row = *iter;
+                row[lm_input_channel_cols.port_name] = *i;
+                row[lm_input_channel_cols.pretty_name] = ARDOUR::AudioEngine::instance()->get_pretty_name_by_name (*i);
+       }
+       lm_input_channel_combo.set_active (0);
        lm_input_channel_combo.set_sensitive (true);
 
        lm_measure_button.set_sensitive (true);
@@ -804,22 +827,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);
@@ -829,7 +840,7 @@ EngineControl::update_sensitivity ()
        if (get_popdown_string_count (sample_rate_combo) > 0) {
                bool allow_to_set_rate = false;
                if (!engine_running) {
-                       if (!ARDOUR_UI::instance()->session_loaded) {
+                       if (!ARDOUR_UI::instance()->the_session ()) {
                                // engine is not running, no session loaded -> anything goes.
                                allow_to_set_rate = true;
                        } else if (_desired_sample_rate > 0 && get_rate () != _desired_sample_rate) {
@@ -915,6 +926,18 @@ EngineControl::midi_latency_adjustment_changed (Gtk::Adjustment *a, MidiDeviceSe
        } else {
                device->output_latency = a->get_value();
        }
+
+       if (ARDOUR::AudioEngine::instance()->running() && !_measure_midi) {
+               boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance()->current_backend();
+               assert (backend);
+               if (backend->can_change_systemic_latency_when_running () && device->enabled) {
+                       if (for_input) {
+                               backend->set_systemic_midi_input_latency (device->name, device->input_latency);
+                       } else {
+                               backend->set_systemic_midi_output_latency (device->name, device->output_latency);
+                       }
+               }
+       }
 }
 
 void
@@ -922,6 +945,16 @@ EngineControl::midi_device_enabled_toggled (ArdourButton *b, MidiDeviceSettings
        b->set_active (!b->get_active());
        device->enabled = b->get_active();
        refresh_midi_display(device->name);
+
+       if (ARDOUR::AudioEngine::instance()->running()) {
+               boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance()->current_backend();
+               assert (backend);
+               backend->set_midi_device_enabled (device->name, device->enabled);
+               if (backend->can_change_systemic_latency_when_running () && device->enabled) {
+                       backend->set_systemic_midi_input_latency (device->name, device->input_latency);
+                       backend->set_systemic_midi_output_latency (device->name, device->output_latency);
+               }
+       }
 }
 
 void
@@ -947,7 +980,7 @@ EngineControl::refresh_midi_display (std::string focus)
 
        l = manage (new Label (_("Device"))); l->show (); l->set_alignment (0.5, 0.5);
        midi_device_table.attach (*l, 0, 1, row, row + 2, xopt, AttachOptions (0));
-       l = manage (new Label (_("Hardware Latencies"))); l->show (); l->set_alignment (0.5, 0.5);
+       l = manage (new Label (_("Systemic Latency [samples]"))); l->show (); l->set_alignment (0.5, 0.5);
        midi_device_table.attach (*l, 1, 3, row, row + 1, xopt, AttachOptions (0));
        row++;
        l = manage (new Label (_("Input"))); l->show (); l->set_alignment (0.5, 0.5);
@@ -1045,6 +1078,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 +1086,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<uint32_t> 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) {
@@ -1070,6 +1109,7 @@ EngineControl::update_midi_options ()
 
        if (midi_options.size() == 1) {
                /* only contains the "none" option */
+               set_popdown_strings (midi_option_combo, midi_options);
                midi_option_combo.set_sensitive (false);
        } else {
                if (_have_control) {
@@ -1371,8 +1411,15 @@ EngineControl::set_samplerate_popdown_strings ()
        if (!s.empty()) {
                if (ARDOUR::AudioEngine::instance()->running()) {
                        sample_rate_combo.set_active_text (rate_as_string (backend->sample_rate()));
-               }
-               else if (desired.empty ()) {
+               } else if (ARDOUR_UI::instance()->the_session ()) {
+                       float active_sr = ARDOUR_UI::instance()->the_session()->nominal_sample_rate ();
+
+                       if (std::find (sr.begin (), sr.end (), active_sr) == sr.end ()) {
+                               active_sr = sr.front ();
+                       }
+
+                       sample_rate_combo.set_active_text (rate_as_string (active_sr));
+               } else if (desired.empty ()) {
                        float new_active_sr = backend->default_sample_rate ();
 
                        if (std::find (sr.begin (), sr.end (), new_active_sr) == sr.end ()) {
@@ -1383,7 +1430,6 @@ EngineControl::set_samplerate_popdown_strings ()
                } else {
                        sample_rate_combo.set_active_text (desired);
                }
-
        }
        update_sensitivity ();
 }
@@ -1439,7 +1485,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 +1531,13 @@ EngineControl::set_nperiods_popdown_strings ()
        }
 
        for (vector<uint32_t>::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 +1657,9 @@ EngineControl::output_device_changed ()
 string
 EngineControl::bufsize_as_string (uint32_t sz)
 {
-       return string_compose (P_("%1 sample", "%1 samples", sz), sz);
+       return string_compose (P_("%1 sample", "%1 samples", sz), to_string(sz));
 }
 
-string
-EngineControl::nperiods_as_string (uint32_t np)
-{
-       char buf[8];
-       snprintf (buf, sizeof (buf), "%u", np);
-       return buf;
-}
-
-
 void
 EngineControl::sample_rate_changed ()
 {
@@ -1639,6 +1676,12 @@ void
 EngineControl::buffer_size_changed ()
 {
        DEBUG_ECONTROL ("buffer_size_changed");
+       if (ARDOUR::AudioEngine::instance()->running()) {
+               boost::shared_ptr<ARDOUR::AudioBackend> 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 ();
 }
 
@@ -1689,7 +1732,6 @@ EngineControl::midi_option_changed ()
 
        vector<ARDOUR::AudioBackend::DeviceStatus> midi_devices = backend->enumerate_midi_devices();
 
-       //_midi_devices.clear(); // TODO merge with state-saved settings..
        _can_set_midi_latencies = backend->can_set_systemic_midi_latencies();
        std::vector<MidiDeviceSettings> new_devices;
 
@@ -1874,7 +1916,7 @@ EngineControl::store_state (State state)
 void
 EngineControl::maybe_display_saved_state ()
 {
-       if (!_have_control) {
+       if (!_have_control || ARDOUR::AudioEngine::instance()->running ()) {
                return;
        }
 
@@ -1884,12 +1926,12 @@ EngineControl::maybe_display_saved_state ()
                DEBUG_ECONTROL ("Restoring saved state");
                PBD::Unwinder<uint32_t> protect_ignore_changes (ignore_changes, ignore_changes + 1);
 
-               if (!_desired_sample_rate) {
+               if (0 == _desired_sample_rate && sample_rate_combo.get_sensitive ()) {
                        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));
                /* call this explicitly because we're ignoring changes to
                   the controls at this point.
                 */
@@ -1902,6 +1944,7 @@ EngineControl::maybe_display_saved_state ()
                if (!state->midi_option.empty()) {
                        midi_option_combo.set_active_text (state->midi_option);
                        _midi_devices = state->midi_devices;
+                       midi_option_changed ();
                }
        } else {
                DEBUG_ECONTROL ("Unable to find saved state for backend and devices");
@@ -1923,30 +1966,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<MidiDeviceSettings>::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);
@@ -1983,7 +2027,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;
@@ -2012,132 +2055,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) {
-                               continue;
-                       }
-                       state->output_device = prop->value ();
-
-                       if ((prop = grandchild->property ("sample-rate")) == 0) {
+                       if (!grandchild->get_property ("backend", state->backend)) {
                                continue;
                        }
-                       state->sample_rate = atof (prop->value ());
 
-                       if ((prop = grandchild->property ("buffer-size")) == 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->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<const ARDOUR::AudioBackendInfo*> backends = ARDOUR::AudioEngine::instance()->available_backends();
        vector<std::string> backend_names;
 
@@ -2154,6 +2133,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<std::string>::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) {
@@ -2251,11 +2252,11 @@ EngineControl::set_current_state (const State& state)
        device_combo.set_active_text (state->device);
        input_device_combo.set_active_text (state->input_device);
        output_device_combo.set_active_text (state->output_device);
-       if (!_desired_sample_rate) {
+       if (0 == _desired_sample_rate && sample_rate_combo.get_sensitive ()) {
                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);
@@ -2521,15 +2522,13 @@ EngineControl::push_state_to_backend (bool start)
        if (1 /* TODO */) {
                for (vector<MidiDeviceSettings>::const_iterator p = _midi_devices.begin(); p != _midi_devices.end(); ++p) {
                        if (_measure_midi) {
+                               /* Disable other MIDI devices while measuring.
+                                * This is a hack to only show ports from the selected device */
                                if (*p == _measure_midi) {
                                        backend->set_midi_device_enabled ((*p)->name, true);
                                } else {
                                        backend->set_midi_device_enabled ((*p)->name, false);
                                }
-                               if (backend->can_change_systemic_latency_when_running ()) {
-                                       backend->set_systemic_midi_input_latency ((*p)->name, 0);
-                                       backend->set_systemic_midi_output_latency ((*p)->name, 0);
-                               }
                                continue;
                        }
                        backend->set_midi_device_enabled ((*p)->name, (*p)->enabled);
@@ -2730,15 +2729,14 @@ EngineControl::start_stop_button_clicked ()
        if (ARDOUR::AudioEngine::instance()->running()) {
                ARDOUR::AudioEngine::instance()->stop ();
        } else {
-               if (!ARDOUR_UI::instance()->session_loaded) {
+               if (!ARDOUR_UI::instance()->the_session ()) {
+                       pop_splash ();
                        hide ();
+                       ARDOUR::GUIIdle ();
                }
                start_engine ();
-               if (!ARDOUR_UI::instance()->session_loaded) {
+               if (!ARDOUR_UI::instance()->the_session ()) {
                        ArdourDialog::on_response (RESPONSE_OK);
-                       if (Splash::instance()) {
-                               Splash::instance()->pop_front ();
-                       }
                }
        }
 }
@@ -2811,6 +2809,17 @@ EngineControl::on_switch_page (GtkNotebookPage*, guint page_num)
        if (page_num == midi_tab) {
                /* MIDI tab */
                refresh_midi_display ();
+
+               /* undo special case from push_state_to_backend() when measuring midi latency */
+               if (_measure_midi && ARDOUR::AudioEngine::instance()->running ()) {
+                       boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance()->current_backend();
+                       if (backend->can_change_systemic_latency_when_running ()) {
+                               for (vector<MidiDeviceSettings>::const_iterator p = _midi_devices.begin(); p != _midi_devices.end(); ++p) {
+                                       backend->set_midi_device_enabled ((*p)->name, (*p)->enabled);
+                               }
+                       }
+               }
+               _measure_midi.reset();
        }
 
        if (page_num == latency_tab) {
@@ -2856,7 +2865,6 @@ EngineControl::on_switch_page (GtkNotebookPage*, guint page_num)
        } else {
                if (lm_running) {
                        end_latency_detection ();
-                       ARDOUR::AudioEngine::instance()->stop_latency_detection();
                }
        }
 }
@@ -2886,7 +2894,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")));
@@ -2894,12 +2902,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);
 
@@ -2940,7 +2948,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")));
@@ -2948,11 +2956,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);
 
@@ -2994,8 +3002,8 @@ EngineControl::check_midi_latency_measurement ()
 void
 EngineControl::start_latency_detection ()
 {
-       ARDOUR::AudioEngine::instance()->set_latency_input_port (lm_input_channel_combo.get_active_text());
-       ARDOUR::AudioEngine::instance()->set_latency_output_port (lm_output_channel_combo.get_active_text());
+       ARDOUR::AudioEngine::instance()->set_latency_input_port (lm_input_channel_combo.get_active ()->get_value (lm_input_channel_cols.port_name));
+       ARDOUR::AudioEngine::instance()->set_latency_output_port (lm_output_channel_combo.get_active ()->get_value (lm_output_channel_cols.port_name));
 
        if (ARDOUR::AudioEngine::instance()->start_latency_detection (_measure_midi ? true : false) == 0) {
                lm_results.set_markup (string_compose (results_markup, _("Detecting ...")));
@@ -3040,23 +3048,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<ARDOUR::AudioBackend> 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 ();
@@ -3070,6 +3083,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);
@@ -3096,7 +3113,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()));
@@ -3136,8 +3153,19 @@ EngineControl::device_list_changed ()
                return;
        }
        PBD::Unwinder<uint32_t> protect_ignore_changes (ignore_changes, ignore_changes + 1); // ??
-       list_devices ();
+       if (!ARDOUR::AudioEngine::instance()->running()) {
+               list_devices ();
+       }
+
        midi_option_changed();
+
+       if (notebook.get_current_page() == midi_tab) {
+               if (_midi_devices.empty ()) {
+                       notebook.set_current_page (0);
+               } else {
+                       refresh_midi_display ();
+               }
+       }
 }
 
 void
@@ -3146,15 +3174,14 @@ EngineControl::connect_disconnect_click()
        if (ARDOUR::AudioEngine::instance()->running()) {
                stop_engine ();
        } else {
-               if (!ARDOUR_UI::instance()->session_loaded) {
+               if (!ARDOUR_UI::instance()->the_session ()) {
+                       pop_splash ();
                        hide ();
+                       ARDOUR::GUIIdle ();
                }
                start_engine ();
-               if (!ARDOUR_UI::instance()->session_loaded) {
+               if (!ARDOUR_UI::instance()->the_session ()) {
                        ArdourDialog::on_response (RESPONSE_OK);
-                       if (Splash::instance()) {
-                               Splash::instance()->pop_front ();
-                       }
                }
        }
 }