Use PBD::to_string to convert period count in EngineControl class
[ardour.git] / gtk2_ardour / engine_dialog.cc
index ceece75dc4b3a5bd6107848aefc591d5815d7534..98463b783c93a0cd6505edd333027c5038419dc9 100644 (file)
 #include "ardour_ui.h"
 #include "engine_dialog.h"
 #include "gui_thread.h"
+#include "ui_config.h"
+#include "public_editor.h"
 #include "utils.h"
 #include "pbd/i18n.h"
+#include "splash.h"
 
 using namespace std;
 using namespace Gtk;
@@ -246,7 +249,7 @@ EngineControl::EngineControl ()
        notebook.pages().push_back (TabElem (midi_vbox, _("MIDI")));
        notebook.set_border_width (12);
 
-       //notebook.set_show_tabs (false);
+       notebook.set_show_tabs (false);
        notebook.show_all ();
 
        notebook.set_name ("SettingsNotebook");
@@ -276,6 +279,8 @@ EngineControl::EngineControl ()
        start_stop_button.set_sensitive (false);
        start_stop_button.set_name ("generic button");
        start_stop_button.set_can_focus(true);
+       start_stop_button.set_can_default(true);
+       start_stop_button.set_act_on_release (false);
 
        update_devices_button.signal_clicked.connect (mem_fun (*this, &EngineControl::update_devices_button_clicked));
        update_devices_button.set_sensitive (false);
@@ -287,9 +292,6 @@ EngineControl::EngineControl ()
        use_buffered_io_button.set_name ("generic button");
        use_buffered_io_button.set_can_focus(true);
 
-       cancel_button = add_button (Gtk::Stock::CLOSE, Gtk::RESPONSE_CANCEL);
-       ok_button = add_button (Gtk::Stock::OK, Gtk::RESPONSE_OK);
-
        /* Pick up any existing audio setup configuration, if appropriate */
 
        XMLNode* audio_setup = ARDOUR::Config->extra_xml ("AudioMIDISetup");
@@ -420,7 +422,20 @@ EngineControl::on_show ()
                backend_changed ();
        }
        device_changed ();
-       ok_button->grab_focus();
+       start_stop_button.grab_focus();
+}
+
+void
+EngineControl::on_map ()
+{
+       if (!ARDOUR_UI::instance()->session_loaded && !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);
+       } else {
+               set_type_hint (Gdk::WINDOW_TYPE_HINT_UTILITY);
+       }
+       ArdourDialog::on_map ();
 }
 
 bool
@@ -459,49 +474,6 @@ EngineControl::stop_engine (bool for_latency)
        return true;
 }
 
-void
-EngineControl::on_response (int response_id)
-{
-       ArdourDialog::on_response (response_id);
-
-       switch (response_id) {
-       case RESPONSE_OK:
-               if (!start_engine()) {
-                       return;
-               } else {
-                       hide();
-               }
-#ifdef PLATFORM_WINDOWS
-
-               // But if there's no session open, this can produce
-               // a long gap when nothing appears to be happening.
-               // Let's show the splash image while we're waiting.
-               if (!ARDOUR_COMMAND_LINE::no_splash) {
-                       if (ARDOUR_UI::instance()) {
-                               if (!ARDOUR_UI::instance()->session_loaded) {
-                                       ARDOUR_UI::instance()->show_splash();
-                               }
-                       }
-               }
-#endif
-               break;
-       case RESPONSE_DELETE_EVENT: {
-               GdkEventButton ev;
-               ev.type = GDK_BUTTON_PRESS;
-               ev.button = 1;
-               on_delete_event((GdkEventAny*)&ev);
-               break;
-       }
-       case RESPONSE_CANCEL:
-               if (ARDOUR_UI::instance() && ARDOUR_UI::instance()->session_loaded) {
-                       ARDOUR_UI::instance()->check_audioengine(*this);
-               }
-       // fall through
-       default:
-               hide();
-       }
-}
-
 void
 EngineControl::build_notebook ()
 {
@@ -777,174 +749,34 @@ EngineControl::enable_latency_tab ()
 void
 EngineControl::setup_midi_tab_for_backend ()
 {
+       string backend = backend_combo.get_active_text ();
+
        Gtkmm2ext::container_clear (midi_vbox);
 
        midi_vbox.set_border_width (12);
        midi_device_table.set_border_width (12);
 
-       midi_vbox.pack_start (midi_device_table, true, true);
-
-       pretty_name_column = midi_input_view.append_column (_("Pretty Name"), midi_port_columns.pretty_name) - 1;
-       use_column = midi_input_view.append_column (_("Use"), midi_port_columns.in_use) - 1;
-       music_column = midi_input_view.append_column (_("Use for Music"), midi_port_columns.music_data) - 1;
-       control_column = midi_input_view.append_column (_("Use for Control"), midi_port_columns.control_data) - 1;
-       selection_column = midi_input_view.append_column (_("Follow Selection"), midi_port_columns.control_data) - 1;
-
-       midi_output_view.append_column (_("Pretty Name"), midi_port_columns.pretty_name);
-       midi_output_view.append_column (_("Use"), midi_port_columns.in_use);
-       midi_output_view.append_column (_("Use for Music"), midi_port_columns.music_data);
-       midi_output_view.append_column (_("Use for Control"), midi_port_columns.control_data);
-       midi_output_view.append_column (_("Follow Selection"), midi_port_columns.control_data);
-
-       midi_input_view.get_selection()->set_mode (SELECTION_NONE);
-       midi_output_view.get_selection()->set_mode (SELECTION_NONE);
-
-       midi_vbox.pack_start (midi_input_view);
-       midi_vbox.pack_start (midi_output_view);
+       if (backend == "JACK") {
+               setup_midi_tab_for_jack ();
+       }
 
+       midi_vbox.pack_start (midi_device_table, true, true);
        midi_vbox.pack_start (midi_back_button, false, false);
        midi_vbox.show_all ();
 }
 
-void
-EngineControl::refill_midi_ports (bool for_input)
-{
-       using namespace ARDOUR;
-
-       std::vector<string> ports;
-
-       AudioEngine::instance()->get_ports (string(), DataType::MIDI, for_input ? IsInput : IsOutput, ports);
-
-       Glib::RefPtr<ListStore> model = Gtk::ListStore::create (midi_port_columns);
-
-       for (vector<string>::const_iterator s = ports.begin(); s != ports.end(); ++s) {
-
-               if (AudioEngine::instance()->port_is_mine (*s)) {
-                       continue;
-               }
-
-               TreeModel::Row row = *(model->append());
-
-               string pretty = AudioEngine::instance()->get_pretty_name_by_name (*s);
-               row[midi_port_columns.name] = *s;
-               row[midi_port_columns.pretty_name] = (pretty.empty() ? *s : pretty);
-               row[midi_port_columns.in_use] = true;
-               row[midi_port_columns.music_data] = true;
-               row[midi_port_columns.control_data] = true;
-       }
-
-       Gtk::TreeView& view (for_input ? midi_input_view : midi_output_view);
-
-       view.set_model (model);
-
-       CellRendererText* pretty_name_cell = dynamic_cast<CellRendererText*> (view.get_column_cell_renderer (pretty_name_column));
-       pretty_name_cell->property_editable() = true;
-       pretty_name_cell->signal_edited().connect (sigc::bind (sigc::mem_fun (*this, &EngineControl::pretty_name_edit), &view));
-
-       CellRendererToggle* toggle_cell;
-
-       toggle_cell = dynamic_cast<CellRendererToggle*> (view.get_column_cell_renderer (use_column));
-       toggle_cell->signal_toggled().connect (sigc::bind (sigc::mem_fun (*this, &EngineControl::midi_use_column_toggled), &view));
-
-       toggle_cell = dynamic_cast<CellRendererToggle*> (view.get_column_cell_renderer (music_column));
-       toggle_cell->signal_toggled().connect (sigc::bind (sigc::mem_fun (*this, &EngineControl::midi_music_column_toggled), &view));
-
-       toggle_cell = dynamic_cast<CellRendererToggle*> (view.get_column_cell_renderer (control_column));
-       toggle_cell->signal_toggled().connect (sigc::bind (sigc::mem_fun (*this, &EngineControl::midi_control_column_toggled), &view));
-
-       toggle_cell = dynamic_cast<CellRendererToggle*> (view.get_column_cell_renderer (selection_column));
-       toggle_cell->signal_toggled().connect (sigc::bind (sigc::mem_fun (*this, &EngineControl::midi_selection_column_toggled), &view));
-}
-
-void
-EngineControl::midi_use_column_toggled (string const & path, TreeView* view)
-{
-       TreeIter iter = view->get_model()->get_iter (path);
-
-       if (!iter) {
-               return;
-       }
-
-       bool value ((*iter)[midi_port_columns.in_use]);
-       (*iter)[midi_port_columns.in_use] = !value;
-
-}
-
-void
-EngineControl::midi_music_column_toggled (string const & path, TreeView* view)
-{
-       TreeIter iter = view->get_model()->get_iter (path);
-
-       if (!iter) {
-               return;
-       }
-
-       bool value ((*iter)[midi_port_columns.music_data]);
-       (*iter)[midi_port_columns.music_data] = !value;
-}
-
-void
-EngineControl::midi_control_column_toggled (string const & path, TreeView* view)
-{
-       TreeIter iter = view->get_model()->get_iter (path);
-
-       if (!iter) {
-               return;
-       }
-
-       bool value ((*iter)[midi_port_columns.control_data]);
-       (*iter)[midi_port_columns.control_data] = !value;
-
-       if (!value) {
-               // ARDOUR::AudioEngine::instance()->remove_port_purpose (PortFlags (ControlData));
-       } else {
-               // ARDOUR::AudioEngine::instance()->add_port_purpose (PortFlags (ControlData));
-       }
-}
-
-void
-EngineControl::midi_selection_column_toggled (string const & path, TreeView* view)
-{
-       TreeIter iter = view->get_model()->get_iter (path);
-
-       if (!iter) {
-               return;
-       }
-       bool value ((*iter)[midi_port_columns.selection]);
-       (*iter)[midi_port_columns.selection] = !value;
-}
-
-void
-EngineControl::pretty_name_edit (std::string const & path, string const & new_text, Gtk::TreeView* view)
-{
-       TreeIter iter = view->get_model()->get_iter (path);
-
-       if (!iter) {
-               return;
-       }
-
-       boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance()->current_backend();
-       if (backend) {
-               ARDOUR::PortEngine::PortHandle ph = backend->get_port_by_name ((*iter)[midi_port_columns.name]);
-               if (ph) {
-                       backend->set_port_property (ph, "http://jackaudio.org/metadata/pretty-name", new_text, "");
-                       (*iter)[midi_port_columns.pretty_name] = new_text;
-               }
-       }
-}
-
 void
 EngineControl::update_sensitivity ()
 {
        boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance()->current_backend();
        if (!backend) {
-               ok_button->set_sensitive (false);
                start_stop_button.set_sensitive (false);
                return;
        }
 
        bool valid = true;
        size_t devices_available = 0;
+       bool engine_running = ARDOUR::AudioEngine::instance()->running();
 
        if (backend->use_separate_input_and_output_devices ()) {
                devices_available += get_popdown_string_count (input_device_combo);
@@ -962,12 +794,12 @@ EngineControl::update_sensitivity ()
        } else {
                input_latency.set_sensitive (true);
                output_latency.set_sensitive (true);
-               input_channels.set_sensitive (true);
-               output_channels.set_sensitive (true);
+               input_channels.set_sensitive (!engine_running);
+               output_channels.set_sensitive (!engine_running);
        }
 
        if (get_popdown_string_count (buffer_size_combo) > 0) {
-               if (!ARDOUR::AudioEngine::instance()->running()) {
+               if (!engine_running) {
                        buffer_size_combo.set_sensitive (valid);
                } else if (backend->can_change_sample_rate_when_running()) {
                        buffer_size_combo.set_sensitive (valid || !_have_control);
@@ -993,7 +825,7 @@ EngineControl::update_sensitivity ()
 
        if (get_popdown_string_count (sample_rate_combo) > 0) {
                bool allow_to_set_rate = false;
-               if (!ARDOUR::AudioEngine::instance()->running()) {
+               if (!engine_running) {
                        if (!ARDOUR_UI::instance()->session_loaded) {
                                // engine is not running, no session loaded -> anything goes.
                                allow_to_set_rate = true;
@@ -1009,7 +841,7 @@ EngineControl::update_sensitivity ()
        }
 
        if (get_popdown_string_count (nperiods_combo) > 0) {
-               if (!ARDOUR::AudioEngine::instance()->running()) {
+               if (!engine_running) {
                        nperiods_combo.set_sensitive (true);
                } else {
                        nperiods_combo.set_sensitive (false);
@@ -1021,7 +853,7 @@ EngineControl::update_sensitivity ()
        if (_have_control) {
                start_stop_button.set_sensitive(true);
                start_stop_button.show();
-               if (ARDOUR::AudioEngine::instance()->running()) {
+               if (engine_running) {
                        start_stop_button.set_text("Stop");
                        update_devices_button.set_sensitive(false);
                        use_buffered_io_button.set_sensitive(false);
@@ -1049,7 +881,7 @@ EngineControl::update_sensitivity ()
                start_stop_button.hide();
        }
 
-       if (ARDOUR::AudioEngine::instance()->running() && _have_control) {
+       if (engine_running && _have_control) {
                input_device_combo.set_sensitive (false);
                output_device_combo.set_sensitive (false);
                device_combo.set_sensitive (false);
@@ -1065,11 +897,12 @@ EngineControl::update_sensitivity ()
                }
        }
 
-       if (valid || !_have_control) {
-               ok_button->set_sensitive (true);
-       } else {
-               ok_button->set_sensitive (false);
-       }
+       midi_option_combo.set_sensitive (!engine_running);
+}
+
+void
+EngineControl::setup_midi_tab_for_jack ()
+{
 }
 
 void
@@ -1649,13 +1482,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 ();
@@ -1727,6 +1560,24 @@ void
 EngineControl::input_device_changed ()
 {
        DEBUG_ECONTROL ("input_device_changed");
+
+       boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance()->current_backend();
+       if (backend && backend->match_input_output_devices_or_none ()) {
+               const std::string& dev_none = ARDOUR::AudioBackend::get_standard_device_name (ARDOUR::AudioBackend::DeviceNone);
+
+               if (get_output_device_name () != dev_none
+                               && get_input_device_name () != dev_none
+                               && get_input_device_name () != get_output_device_name ()) {
+                       block_changed_signals ();
+                       if (contains_value (output_device_combo, get_input_device_name ())) {
+                               output_device_combo.set_active_text (get_input_device_name ());
+                       } else {
+                               assert (contains_value (output_device_combo, dev_none));
+                               output_device_combo.set_active_text (dev_none);
+                       }
+                       unblock_changed_signals ();
+               }
+       }
        device_changed ();
 }
 
@@ -1734,24 +1585,32 @@ void
 EngineControl::output_device_changed ()
 {
        DEBUG_ECONTROL ("output_device_changed");
+       boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance()->current_backend();
+       if (backend && backend->match_input_output_devices_or_none ()) {
+               const std::string& dev_none = ARDOUR::AudioBackend::get_standard_device_name (ARDOUR::AudioBackend::DeviceNone);
+
+               if (get_input_device_name () != dev_none
+                               && get_input_device_name () != dev_none
+                               && get_input_device_name () != get_output_device_name ()) {
+                       block_changed_signals ();
+                       if (contains_value (input_device_combo, get_output_device_name ())) {
+                               input_device_combo.set_active_text (get_output_device_name ());
+                       } else {
+                               assert (contains_value (input_device_combo, dev_none));
+                               input_device_combo.set_active_text (dev_none);
+                       }
+                       unblock_changed_signals ();
+               }
+       }
        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 ()
 {
@@ -1932,6 +1791,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) {
@@ -1941,7 +1801,7 @@ EngineControl::state_sort_cmp (const State &a, const State &b) {
                return false;
        }
        else {
-               return a->lru < b->lru;
+               return a->lru > b->lru;
        }
 }
 
@@ -2017,7 +1877,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.
                 */
@@ -2051,30 +1911,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);
@@ -2111,7 +1972,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;
@@ -2140,108 +2000,59 @@ EngineControl::set_state (const XMLNode& root)
                                continue;
                        }
 
-                       if ((prop = grandchild->property ("backend")) == 0) {
+                       if (!grandchild->get_property ("backend", state->backend)) {
                                continue;
                        }
-                       state->backend = prop->value ();
 
-                       if ((prop = grandchild->property ("driver")) == 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->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) {
-                               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
@@ -2383,7 +2194,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);
@@ -2858,7 +2669,13 @@ EngineControl::start_stop_button_clicked ()
        if (ARDOUR::AudioEngine::instance()->running()) {
                ARDOUR::AudioEngine::instance()->stop ();
        } else {
+               if (!ARDOUR_UI::instance()->session_loaded) {
+                       hide ();
+               }
                start_engine ();
+               if (!ARDOUR_UI::instance()->session_loaded) {
+                       ArdourDialog::on_response (RESPONSE_OK);
+               }
        }
 }
 
@@ -2923,12 +2740,8 @@ void
 EngineControl::on_switch_page (GtkNotebookPage*, guint page_num)
 {
        if (page_num == 0) {
-               cancel_button->set_sensitive (true);
                _measure_midi.reset();
                update_sensitivity ();
-       } else {
-               cancel_button->set_sensitive (false);
-               ok_button->set_sensitive (false);
        }
 
        if (page_num == midi_tab) {
@@ -3219,7 +3032,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()));
@@ -3232,9 +3045,6 @@ EngineControl::engine_running ()
                engine_status.set_markup(string_compose ("<span foreground=\"green\">%1</span>", _("Connected")));
        }
        update_sensitivity();
-
-       refill_midi_ports (true);
-       refill_midi_ports (false);
 }
 
 void
@@ -3272,7 +3082,13 @@ EngineControl::connect_disconnect_click()
        if (ARDOUR::AudioEngine::instance()->running()) {
                stop_engine ();
        } else {
+               if (!ARDOUR_UI::instance()->session_loaded) {
+                       hide ();
+               }
                start_engine ();
+               if (!ARDOUR_UI::instance()->session_loaded) {
+                       ArdourDialog::on_response (RESPONSE_OK);
+               }
        }
 }