Don't hide Audio Setup dialog when clicking 'OK' if engine fails to start
[ardour.git] / gtk2_ardour / engine_dialog.cc
index 29aa448faf5d58953efdb922cad315322fde7d1f..8799d6aa8ff2f411a68c9936d73b1efd35e70276 100644 (file)
@@ -49,6 +49,7 @@
 #include "pbd/error.h"
 
 #include "opts.h"
+#include "debug.h"
 #include "ardour_ui.h"
 #include "engine_dialog.h"
 #include "gui_thread.h"
@@ -62,6 +63,8 @@ using namespace PBD;
 using namespace Glib;
 using namespace ARDOUR_UI_UTILS;
 
+#define DEBUG_ECONTROL(msg) DEBUG_TRACE (PBD::DEBUG::EngineControl, string_compose ("%1: %2\n", __LINE__, msg));
+
 static const unsigned int midi_tab = 2;
 static const unsigned int latency_tab = 1; /* zero-based, page zero is the main setup page */
 
@@ -83,6 +86,8 @@ EngineControl::EngineControl ()
        , ports_spinner (ports_adjustment)
        , control_app_button (_("Device Control Panel"))
        , midi_devices_button (_("Midi Device Setup"))
+       , start_stop_button (_("Stop"))
+       , update_devices_button (_("Refresh Devices"))
        , lm_measure_label (_("Measure"))
        , lm_use_button (_("Use results"))
        , lm_back_button (_("Back to settings ... (ignore results)"))
@@ -95,6 +100,8 @@ EngineControl::EngineControl ()
        , _desired_sample_rate (0)
        , started_at_least_once (false)
        , queue_device_changed (false)
+       , _have_control (true)
+       , block_signals(0)
 {
        using namespace Notebook_Helpers;
        vector<string> backend_names;
@@ -119,7 +126,6 @@ EngineControl::EngineControl ()
        }
 
        set_popdown_strings (backend_combo, backend_names);
-       backend_combo.signal_changed().connect (sigc::mem_fun (*this, &EngineControl::backend_changed));
 
        /* setup basic packing characteristics for the table used on the main
         * tab of the notebook
@@ -177,8 +183,6 @@ EngineControl::EngineControl ()
        lm_table.attach (*misc_align, 1, 3, row, row+1, FILL, (AttachOptions) 0);
        ++row;
 
-       xopt = AttachOptions(0);
-
        lm_measure_label.set_padding (10, 10);
        lm_measure_button.add (lm_measure_label);
        lm_measure_button.signal_clicked().connect (sigc::mem_fun (*this, &EngineControl::latency_button_clicked));
@@ -250,9 +254,6 @@ EngineControl::EngineControl ()
        get_vbox()->set_border_width (12);
        get_vbox()->pack_start (notebook);
 
-       get_action_area()->pack_start (engine_status);
-       engine_status.show();
-
        /* need a special function to print "all available channels" when the
         * channel counts hit zero.
         */
@@ -265,11 +266,22 @@ EngineControl::EngineControl ()
        midi_devices_button.set_name ("generic button");
        midi_devices_button.set_can_focus(true);
 
-       control_app_button.signal_clicked().connect (mem_fun (*this, &EngineControl::control_app_button_clicked));
+       control_app_button.signal_clicked.connect (mem_fun (*this, &EngineControl::control_app_button_clicked));
+       control_app_button.set_name ("generic button");
+       control_app_button.set_can_focus(true);
        manage_control_app_sensitivity ();
 
+       start_stop_button.signal_clicked.connect (mem_fun (*this, &EngineControl::start_stop_button_clicked));
+       start_stop_button.set_sensitive (false);
+       start_stop_button.set_name ("generic button");
+       start_stop_button.set_can_focus(true);
+
+       update_devices_button.signal_clicked.connect (mem_fun (*this, &EngineControl::update_devices_button_clicked));
+       update_devices_button.set_sensitive (false);
+       update_devices_button.set_name ("generic button");
+       update_devices_button.set_can_focus(true);
+
        cancel_button = add_button (Gtk::Stock::CLOSE, Gtk::RESPONSE_CANCEL);
-       apply_button = add_button (Gtk::Stock::APPLY, Gtk::RESPONSE_APPLY);
        ok_button = add_button (Gtk::Stock::OK, Gtk::RESPONSE_OK);
 
        /* Pick up any existing audio setup configuration, if appropriate */
@@ -282,46 +294,106 @@ EngineControl::EngineControl ()
        ARDOUR::AudioEngine::instance()->DeviceListChanged.connect (devicelist_connection, MISSING_INVALIDATOR, boost::bind (&EngineControl::device_list_changed, this), gui_context());
 
        if (audio_setup) {
-               set_state (*audio_setup);
-       }
-
-       if (backend_combo.get_active_text().empty()) {
-               PBD::Unwinder<uint32_t> protect_ignore_changes (ignore_changes, ignore_changes + 1);
-               backend_combo.set_active_text (backend_names.front());
+               if (!set_state (*audio_setup)) {
+                       set_default_state ();
+               }
+       } else {
+               set_default_state ();
        }
 
-       backend_changed ();
-
-       /* in case the setting the backend failed, e.g. stale config, from set_state(), try again */
-       if (0 == ARDOUR::AudioEngine::instance()->current_backend()) {
-               backend_combo.set_active_text (backend_names.back());
-               /* ignore: don't save state */
-               PBD::Unwinder<uint32_t> protect_ignore_changes (ignore_changes, ignore_changes + 1);
-               backend_changed ();
-       }
+       connect_changed_signals ();
 
+       notebook.signal_switch_page().connect (sigc::mem_fun (*this, &EngineControl::on_switch_page));
 
-       /* Connect to signals */
+       connect_disconnect_button.signal_clicked().connect (sigc::mem_fun (*this, &EngineControl::connect_disconnect_click));
+       connect_disconnect_button.set_no_show_all();
 
-       driver_combo.signal_changed().connect (sigc::mem_fun (*this, &EngineControl::driver_changed));
-       sample_rate_combo.signal_changed().connect (sigc::mem_fun (*this, &EngineControl::sample_rate_changed));
-       buffer_size_combo.signal_changed().connect (sigc::mem_fun (*this, &EngineControl::buffer_size_changed));
-       device_combo.signal_changed().connect (sigc::mem_fun (*this, &EngineControl::device_changed));
-       midi_option_combo.signal_changed().connect (sigc::mem_fun (*this, &EngineControl::midi_option_changed));
+}
 
-       input_device_combo.signal_changed().connect (sigc::mem_fun (*this, &EngineControl::input_device_changed));
-       output_device_combo.signal_changed().connect (sigc::mem_fun (*this, &EngineControl::output_device_changed));
+void
+EngineControl::connect_changed_signals ()
+{
+       backend_combo_connection = backend_combo.signal_changed ().connect (
+           sigc::mem_fun (*this, &EngineControl::backend_changed));
+       driver_combo_connection = driver_combo.signal_changed ().connect (
+           sigc::mem_fun (*this, &EngineControl::driver_changed));
+       sample_rate_combo_connection = sample_rate_combo.signal_changed ().connect (
+           sigc::mem_fun (*this, &EngineControl::sample_rate_changed));
+       buffer_size_combo_connection = buffer_size_combo.signal_changed ().connect (
+           sigc::mem_fun (*this, &EngineControl::buffer_size_changed));
+       device_combo_connection = device_combo.signal_changed ().connect (
+           sigc::mem_fun (*this, &EngineControl::device_changed));
+       midi_option_combo_connection = midi_option_combo.signal_changed ().connect (
+           sigc::mem_fun (*this, &EngineControl::midi_option_changed));
+
+       input_device_combo_connection = input_device_combo.signal_changed ().connect (
+           sigc::mem_fun (*this, &EngineControl::input_device_changed));
+       output_device_combo_connection = output_device_combo.signal_changed ().connect (
+           sigc::mem_fun (*this, &EngineControl::output_device_changed));
+
+       input_latency_connection = input_latency.signal_changed ().connect (
+           sigc::mem_fun (*this, &EngineControl::parameter_changed));
+       output_latency_connection = output_latency.signal_changed ().connect (
+           sigc::mem_fun (*this, &EngineControl::parameter_changed));
+       input_channels_connection = input_channels.signal_changed ().connect (
+           sigc::mem_fun (*this, &EngineControl::parameter_changed));
+       output_channels_connection = output_channels.signal_changed ().connect (
+           sigc::mem_fun (*this, &EngineControl::parameter_changed));
+}
 
-       input_latency.signal_changed().connect (sigc::mem_fun (*this, &EngineControl::parameter_changed));
-       output_latency.signal_changed().connect (sigc::mem_fun (*this, &EngineControl::parameter_changed));
-       input_channels.signal_changed().connect (sigc::mem_fun (*this, &EngineControl::parameter_changed));
-       output_channels.signal_changed().connect (sigc::mem_fun (*this, &EngineControl::parameter_changed));
+void
+EngineControl::block_changed_signals ()
+{
+       if (block_signals++ == 0) {
+               DEBUG_ECONTROL ("Blocking changed signals");
+               backend_combo_connection.block ();
+               driver_combo_connection.block ();
+               sample_rate_combo_connection.block ();
+               buffer_size_combo_connection.block ();
+               device_combo_connection.block ();
+               input_device_combo_connection.block ();
+               output_device_combo_connection.block ();
+               midi_option_combo_connection.block ();
+               input_latency_connection.block ();
+               output_latency_connection.block ();
+               input_channels_connection.block ();
+               output_channels_connection.block ();
+       }
+}
 
-       notebook.signal_switch_page().connect (sigc::mem_fun (*this, &EngineControl::on_switch_page));
+void
+EngineControl::unblock_changed_signals ()
+{
+       if (--block_signals == 0) {
+               DEBUG_ECONTROL ("Unblocking changed signals");
+               backend_combo_connection.unblock ();
+               driver_combo_connection.unblock ();
+               sample_rate_combo_connection.unblock ();
+               buffer_size_combo_connection.unblock ();
+               device_combo_connection.unblock ();
+               input_device_combo_connection.unblock ();
+               output_device_combo_connection.unblock ();
+               midi_option_combo_connection.unblock ();
+               input_latency_connection.unblock ();
+               output_latency_connection.unblock ();
+               input_channels_connection.unblock ();
+               output_channels_connection.unblock ();
+       }
+}
 
-       connect_disconnect_button.signal_clicked().connect (sigc::mem_fun (*this, &EngineControl::connect_disconnect_click));
-       connect_disconnect_button.set_no_show_all();
+EngineControl::SignalBlocker::SignalBlocker (EngineControl& engine_control,
+                                             const std::string& reason)
+    : ec (engine_control)
+    , m_reason (reason)
+{
+       DEBUG_ECONTROL (string_compose ("SignalBlocker: %1", m_reason));
+       ec.block_changed_signals ();
+}
 
+EngineControl::SignalBlocker::~SignalBlocker ()
+{
+       DEBUG_ECONTROL (string_compose ("~SignalBlocker: %1", m_reason));
+       ec.unblock_changed_signals ();
 }
 
 void
@@ -333,8 +405,6 @@ EngineControl::on_show ()
                backend_changed ();
        }
        device_changed ();
-       input_device_changed ();
-       output_device_changed ();
        ok_button->grab_focus();
 }
 
@@ -344,14 +414,13 @@ EngineControl::on_response (int response_id)
        ArdourDialog::on_response (response_id);
 
        switch (response_id) {
-               case RESPONSE_APPLY:
-                       push_state_to_backend (true);
-                       break;
                case RESPONSE_OK:
+                       if (push_state_to_backend (true) != 0) {
+                               return;
+                       } else {
+                               hide ();
+                       }
 #ifdef PLATFORM_WINDOWS
-                       // For some reason we don't understand, 'hide()'
-                       // needs to get called first in Windows
-                       hide ();
 
                        // But if there's no session open, this can produce
                        // a long gap when nothing appears to be happening.
@@ -363,13 +432,8 @@ EngineControl::on_response (int response_id)
                                        }
                                }
                        }
-                       push_state_to_backend (true);
-                       break;
-#else
-                       push_state_to_backend (true);
-                       hide ();
-                       break;
 #endif
+                       break;
                case RESPONSE_DELETE_EVENT:
                        {
                                GdkEventButton ev;
@@ -402,6 +466,12 @@ EngineControl::build_notebook ()
        basic_packer.attach (*label, 0, 1, 0, 1, xopt, (AttachOptions) 0);
        basic_packer.attach (backend_combo, 1, 2, 0, 1, xopt, (AttachOptions) 0);
 
+       basic_packer.attach (engine_status, 2, 3, 0, 1, xopt, (AttachOptions) 0);
+       engine_status.show();
+
+       basic_packer.attach (start_stop_button, 3, 4, 0, 1, xopt, xopt);
+       basic_packer.attach (update_devices_button, 3, 4, 1, 2, xopt, xopt);
+
        lm_button_audio.signal_clicked.connect (sigc::mem_fun (*this, &EngineControl::calibrate_audio_latency));
        lm_button_audio.set_name ("generic button");
        lm_button_audio.set_can_focus(true);
@@ -538,7 +608,13 @@ EngineControl::build_full_control_notebook ()
        label = manage (left_aligned_label (_("MIDI System:")));
        basic_packer.attach (*label, 0, 1, row, row + 1, xopt, (AttachOptions) 0);
        basic_packer.attach (midi_option_combo, 1, 2, row, row + 1, SHRINK, (AttachOptions) 0);
+#if ! defined __APPLE__  && ! defined PLATFORM_WINDOWS // => linux, YAY
+       /* Currently the only backend with dedicated Midi setup is ALSA.
+        * lot of people complain that this is greyed out
+        * "I can't use MIDI, the setup is greyed out"
+        */
        basic_packer.attach (midi_devices_button, 3, 4, row, row+1, xopt, xopt);
+#endif
        row++;
 }
 
@@ -553,7 +629,7 @@ EngineControl::build_no_control_notebook ()
        vector<string> strings;
        AttachOptions xopt = AttachOptions (FILL|EXPAND);
        int row = 1; // row zero == backend combo
-       const string msg = string_compose (_("The %1 audio backend was configured and started externally.\nThis limits your control over it."), backend->name());
+       const string msg = string_compose (_("%1 is already running. %2 will connect to it and use the existing settings."), backend->name(), PROGRAM_NAME);
 
        label = manage (new Label);
        label->set_markup (string_compose ("<span weight=\"bold\" foreground=\"red\">%1</span>", msg));
@@ -657,6 +733,120 @@ EngineControl::setup_midi_tab_for_backend ()
        midi_vbox.show_all ();
 }
 
+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;
+
+       if (backend->use_separate_input_and_output_devices ()) {
+               devices_available += get_popdown_string_count (input_device_combo);
+               devices_available += get_popdown_string_count (output_device_combo);
+       } else {
+               devices_available += get_popdown_string_count (device_combo);
+       }
+
+       if (devices_available == 0) {
+               valid = false;
+               input_latency.set_sensitive (false);
+               output_latency.set_sensitive (false);
+               input_channels.set_sensitive (false);
+               output_channels.set_sensitive (false);
+       } else {
+               input_latency.set_sensitive (true);
+               output_latency.set_sensitive (true);
+               input_channels.set_sensitive (true);
+               output_channels.set_sensitive (true);
+       }
+
+       if (get_popdown_string_count (buffer_size_combo) > 0) {
+               if (!ARDOUR::AudioEngine::instance()->running()) {
+                       buffer_size_combo.set_sensitive (valid);
+               } else if (backend->can_change_sample_rate_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);
+               valid = false;
+       }
+
+       if (get_popdown_string_count (sample_rate_combo) > 0) {
+               if (!ARDOUR::AudioEngine::instance()->running()) {
+                       sample_rate_combo.set_sensitive (true);
+               } else {
+                       sample_rate_combo.set_sensitive (false);
+               }
+       } else {
+               sample_rate_combo.set_sensitive (false);
+               valid = false;
+       }
+
+       if (_have_control) {
+               start_stop_button.set_sensitive(true);
+               start_stop_button.show();
+               if (ARDOUR::AudioEngine::instance()->running()) {
+                       start_stop_button.set_text("Stop");
+                       update_devices_button.set_sensitive(false);
+               } else {
+                       if (backend->can_request_update_devices()) {
+                               update_devices_button.show();
+                       } else {
+                               update_devices_button.hide();
+                       }
+                       start_stop_button.set_text("Start");
+                       update_devices_button.set_sensitive(true);
+               }
+       } else {
+               update_devices_button.set_sensitive(false);
+               update_devices_button.hide();
+               start_stop_button.set_sensitive(false);
+               start_stop_button.hide();
+       }
+
+       if (ARDOUR::AudioEngine::instance()->running() && _have_control) {
+               input_device_combo.set_sensitive (false);
+               output_device_combo.set_sensitive (false);
+               device_combo.set_sensitive (false);
+               driver_combo.set_sensitive (false);
+       } else {
+               input_device_combo.set_sensitive (true);
+               output_device_combo.set_sensitive (true);
+               device_combo.set_sensitive (true);
+               if (backend->requires_driver_selection() && get_popdown_string_count(driver_combo) > 0) {
+                       driver_combo.set_sensitive (true);
+               } else {
+                       driver_combo.set_sensitive (false);
+               }
+       }
+
+       if (valid || !_have_control) {
+               ok_button->set_sensitive (true);
+       } else {
+               ok_button->set_sensitive (false);
+       }
+}
+
 void
 EngineControl::setup_midi_tab_for_jack ()
 {
@@ -751,23 +941,21 @@ EngineControl::refresh_midi_display (std::string focus)
        }
 }
 
-void
-EngineControl::update_sensitivity ()
-{
-}
-
 void
 EngineControl::backend_changed ()
 {
+       SignalBlocker blocker (*this, "backend_changed");
        string backend_name = backend_combo.get_active_text();
        boost::shared_ptr<ARDOUR::AudioBackend> backend;
 
-       if (!(backend = ARDOUR::AudioEngine::instance()->set_backend (backend_name, "ardour", ""))) {
+       if (!(backend = ARDOUR::AudioEngine::instance()->set_backend (backend_name, downcase (std::string(PROGRAM_NAME)), ""))) {
                /* eh? setting the backend failed... how ? */
                /* A: stale config contains a backend that does not exist in current build */
                return;
        }
 
+       DEBUG_ECONTROL (string_compose ("Backend name: %1", backend_name));
+
        _have_control = ARDOUR::AudioEngine::instance()->setup_required ();
 
        build_notebook ();
@@ -775,38 +963,39 @@ EngineControl::backend_changed ()
        _midi_devices.clear();
 
        if (backend->requires_driver_selection()) {
-               vector<string> drivers = backend->enumerate_drivers();
-               driver_combo.set_sensitive (true);
-
-               if (!drivers.empty()) {
-                       {
-                               string current_driver;
-                               current_driver = backend->driver_name ();
-
-                               // driver might not have been set yet
-                               if (current_driver == "") {
-                                       current_driver = driver_combo.get_active_text ();
-                                       if (current_driver == "")
-                                               // driver has never been set, make sure it's not blank
-                                               current_driver = drivers.front ();
-                               }
-
-                               PBD::Unwinder<uint32_t> protect_ignore_changes (ignore_changes, ignore_changes + 1);
-                               set_popdown_strings (driver_combo, drivers);
-                               driver_combo.set_active_text (current_driver);
-                       }
-
+               if (set_driver_popdown_strings ()) {
                        driver_changed ();
                }
-
        } else {
-               driver_combo.set_sensitive (false);
                /* this will change the device text which will cause a call to
                 * device changed which will set up parameters
                 */
                list_devices ();
        }
 
+       update_midi_options ();
+
+       connect_disconnect_button.hide();
+
+       midi_option_changed();
+
+       started_at_least_once = false;
+
+       /* changing the backend implies stopping the engine
+        * ARDOUR::AudioEngine() may or may not emit this signal
+        * depending on previous engine state
+        */
+       engine_stopped (); // set "active/inactive"
+
+       if (!ignore_changes) {
+               maybe_display_saved_state ();
+       }
+}
+
+void
+EngineControl::update_midi_options ()
+{
+       boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance()->current_backend();
        vector<string> midi_options = backend->enumerate_midi_options();
 
        if (midi_options.size() == 1) {
@@ -821,16 +1010,6 @@ EngineControl::backend_changed ()
                        midi_option_combo.set_sensitive (false);
                }
        }
-
-       connect_disconnect_button.hide();
-
-       midi_option_changed();
-
-       started_at_least_once = false;
-
-       if (!ignore_changes) {
-               maybe_display_saved_state ();
-       }
 }
 
 bool
@@ -851,10 +1030,81 @@ EngineControl::print_channel_count (Gtk::SpinButton* sb)
        return true;
 }
 
+// @return true if there are drivers available
+bool
+EngineControl::set_driver_popdown_strings ()
+{
+       DEBUG_ECONTROL ("set_driver_popdown_strings");
+       boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance()->current_backend();
+       vector<string> drivers = backend->enumerate_drivers();
+
+       if (drivers.empty ()) {
+               // This is an error...?
+               return false;
+       }
+
+       string current_driver = backend->driver_name ();
+
+       DEBUG_ECONTROL (string_compose ("backend->driver_name: %1", current_driver));
+
+       if (std::find (drivers.begin (), drivers.end (), current_driver) ==
+           drivers.end ()) {
+
+               current_driver = drivers.front ();
+       }
+
+       set_popdown_strings (driver_combo, drivers);
+       DEBUG_ECONTROL (
+           string_compose ("driver_combo.set_active_text: %1", current_driver));
+       driver_combo.set_active_text (current_driver);
+       return true;
+}
+
+std::string
+EngineControl::get_default_device(const string& current_device_name,
+                                  const vector<string>& available_devices)
+{
+       // If the current device is available, use it as default
+       if (std::find (available_devices.begin (),
+                      available_devices.end (),
+                      current_device_name) != available_devices.end ()) {
+
+               return current_device_name;
+       }
+
+       using namespace ARDOUR;
+
+       string default_device_name =
+           AudioBackend::get_standard_device_name(AudioBackend::DeviceDefault);
+
+       vector<string>::const_iterator i;
+
+       // If there is a "Default" device available, use it
+       for (i = available_devices.begin(); i != available_devices.end(); ++i) {
+               if (*i == default_device_name) {
+                       return *i;
+               }
+       }
+
+       string none_device_name =
+           AudioBackend::get_standard_device_name(AudioBackend::DeviceNone);
+
+       // Use the first device that isn't "None"
+       for (i = available_devices.begin(); i != available_devices.end(); ++i) {
+               if (*i != none_device_name) {
+                       return *i;
+               }
+       }
+
+       // Use "None" if there are no other available
+       return available_devices.front();
+}
+
 // @return true if there are devices available
 bool
 EngineControl::set_device_popdown_strings ()
 {
+       DEBUG_ECONTROL ("set_device_popdown_strings");
        boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance()->current_backend();
        vector<ARDOUR::AudioBackend::DeviceStatus> all_devices = backend->enumerate_devices ();
 
@@ -873,44 +1123,27 @@ EngineControl::set_device_popdown_strings ()
                available_devices.push_back (i->name);
        }
 
+       if (available_devices.empty ()) {
+               return false;
+       }
 
-       if (!available_devices.empty()) {
-               update_sensitivity ();
-
-               {
-                       string current_device, found_device;
-                       current_device = device_combo.get_active_text ();
-                       if (current_device == "") {
-                               current_device = backend->device_name ();
-                       }
-
-                       // Make sure that the active text is still relevant for this
-                       // device (it might only be relevant to the previous device!!)
-                       for (vector<string>::const_iterator i = available_devices.begin(); i != available_devices.end(); ++i) {
-                               if (*i == current_device)
-                                       found_device = current_device;
-                       }
-                       if (found_device == "")
-                               // device has never been set (or was not relevant
-                               // for this backend) Let's make sure it's not blank
-                               current_device = available_devices.front ();
+       set_popdown_strings (device_combo, available_devices);
 
-                       PBD::Unwinder<uint32_t> protect_ignore_changes (ignore_changes, ignore_changes + 1);
-                       set_popdown_strings (device_combo, available_devices);
+       std::string default_device =
+           get_default_device(backend->device_name(), available_devices);
 
-                       device_combo.set_active_text (current_device);
-               }
+       DEBUG_ECONTROL (
+           string_compose ("set device_combo active text: %1", default_device));
 
-               device_changed ();
-               return true;
-       }
-       return false;
+       device_combo.set_active_text(default_device);
+       return true;
 }
 
 // @return true if there are input devices available
 bool
 EngineControl::set_input_device_popdown_strings ()
 {
+       DEBUG_ECONTROL ("set_input_device_popdown_strings");
        boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance()->current_backend();
        vector<ARDOUR::AudioBackend::DeviceStatus> all_devices = backend->enumerate_input_devices ();
 
@@ -920,44 +1153,26 @@ EngineControl::set_input_device_popdown_strings ()
                available_devices.push_back (i->name);
        }
 
-       if (!available_devices.empty()) {
-               update_sensitivity ();
-
-               {
-                       string current_device, found_device;
-                       current_device = input_device_combo.get_active_text ();
-                       if (current_device == "") {
-                               current_device = backend->input_device_name ();
-                       }
-
-                       // Make sure that the active text is still relevant for this
-                       // device (it might only be relevant to the previous device!!)
-                       for (vector<string>::const_iterator i = available_devices.begin(); i != available_devices.end(); ++i) {
-                               if (*i == current_device)
-                                       found_device = current_device;
-                       }
-                       if (found_device == "")
-                               // device has never been set (or was not relevant
-                               // for this backend) Let's make sure it's not blank
-                               current_device = available_devices.front ();
-
-                       PBD::Unwinder<uint32_t> protect_ignore_changes (ignore_changes, ignore_changes + 1);
-                       set_popdown_strings (input_device_combo, available_devices);
+       if (available_devices.empty()) {
+               return false;
+       }
 
-                       input_device_combo.set_active_text (current_device);
-               }
+       set_popdown_strings (input_device_combo, available_devices);
 
-               input_device_changed ();
-               return true;
-       }
+       std::string default_device =
+           get_default_device(backend->input_device_name(), available_devices);
 
-       return false;
+       DEBUG_ECONTROL (
+           string_compose ("set input_device_combo active text: %1", default_device));
+       input_device_combo.set_active_text(default_device);
+       return true;
 }
 
 // @return true if there are output devices available
 bool
 EngineControl::set_output_device_popdown_strings ()
 {
+       DEBUG_ECONTROL ("set_output_device_popdown_strings");
        boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance()->current_backend();
        vector<ARDOUR::AudioBackend::DeviceStatus> all_devices = backend->enumerate_output_devices ();
 
@@ -967,43 +1182,25 @@ EngineControl::set_output_device_popdown_strings ()
                available_devices.push_back (i->name);
        }
 
-       if (!available_devices.empty()) {
-               update_sensitivity ();
-
-               {
-                       string current_device, found_device;
-                       current_device = output_device_combo.get_active_text ();
-                       if (current_device == "") {
-                               current_device = backend->output_device_name ();
-                       }
-
-                       // Make sure that the active text is still relevant for this
-                       // device (it might only be relevant to the previous device!!)
-                       for (vector<string>::const_iterator i = available_devices.begin(); i != available_devices.end(); ++i) {
-                               if (*i == current_device)
-                                       found_device = current_device;
-                       }
-                       if (found_device == "")
-                               // device has never been set (or was not relevant
-                               // for this backend) Let's make sure it's not blank
-                               current_device = available_devices.front ();
-
-                       PBD::Unwinder<uint32_t> protect_ignore_changes (ignore_changes, ignore_changes + 1);
-                       set_popdown_strings (output_device_combo, available_devices);
+       if (available_devices.empty()) {
+               return false;
+       }
 
-                       output_device_combo.set_active_text (current_device);
-               }
+       set_popdown_strings (output_device_combo, available_devices);
 
-               output_device_changed ();
-               return true;
-       }
+       std::string default_device =
+           get_default_device(backend->output_device_name(), available_devices);
 
-       return false;
+       DEBUG_ECONTROL (
+           string_compose ("set output_device_combo active text: %1", default_device));
+       output_device_combo.set_active_text(default_device);
+       return true;
 }
 
 void
 EngineControl::list_devices ()
 {
+       DEBUG_ECONTROL ("list_devices");
        boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance()->current_backend();
        assert (backend);
 
@@ -1020,44 +1217,19 @@ EngineControl::list_devices ()
        }
 
        if (devices_available) {
-               input_latency.set_sensitive (true);
-               output_latency.set_sensitive (true);
-               input_channels.set_sensitive (true);
-               output_channels.set_sensitive (true);
-
-               ok_button->set_sensitive (true);
-               apply_button->set_sensitive (true);
-
+               device_changed ();
        } else {
                device_combo.clear();
                input_device_combo.clear();
                output_device_combo.clear();
-               sample_rate_combo.set_sensitive (false);
-               buffer_size_combo.set_sensitive (false);
-               input_latency.set_sensitive (false);
-               output_latency.set_sensitive (false);
-               input_channels.set_sensitive (false);
-               output_channels.set_sensitive (false);
-               if (_have_control) {
-                       ok_button->set_sensitive (false);
-                       apply_button->set_sensitive (false);
-               } else {
-                       ok_button->set_sensitive (true);
-                       apply_button->set_sensitive (true);
-                       if (backend->can_change_sample_rate_when_running() && sample_rate_combo.get_children().size() > 0) {
-                               sample_rate_combo.set_sensitive (true);
-                       }
-                       if (backend->can_change_buffer_size_when_running() && buffer_size_combo.get_children().size() > 0) {
-                               buffer_size_combo.set_sensitive (true);
-                       }
-
-               }
        }
+       update_sensitivity ();
 }
 
 void
 EngineControl::driver_changed ()
 {
+       SignalBlocker blocker (*this, "driver_changed");
        boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance()->current_backend();
        assert (backend);
 
@@ -1069,27 +1241,50 @@ EngineControl::driver_changed ()
        }
 }
 
+vector<float>
+EngineControl::get_sample_rates_for_all_devices ()
+{
+       boost::shared_ptr<ARDOUR::AudioBackend> backend =
+           ARDOUR::AudioEngine::instance ()->current_backend ();
+       vector<float> all_rates;
+
+       if (backend->use_separate_input_and_output_devices ()) {
+               all_rates = backend->available_sample_rates2 (get_input_device_name (), get_output_device_name ());
+       } else {
+               all_rates = backend->available_sample_rates (get_device_name ());
+       }
+       return all_rates;
+}
+
+vector<float>
+EngineControl::get_default_sample_rates ()
+{
+       vector<float> rates;
+       rates.push_back (8000.0f);
+       rates.push_back (16000.0f);
+       rates.push_back (32000.0f);
+       rates.push_back (44100.0f);
+       rates.push_back (48000.0f);
+       rates.push_back (88200.0f);
+       rates.push_back (96000.0f);
+       rates.push_back (192000.0f);
+       rates.push_back (384000.0f);
+       return rates;
+}
+
 void
-EngineControl::set_samplerate_popdown_strings (const std::string& device_name)
+EngineControl::set_samplerate_popdown_strings ()
 {
+       DEBUG_ECONTROL ("set_samplerate_popdown_strings");
        boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance()->current_backend();
        string desired;
        vector<float> sr;
        vector<string> s;
 
        if (_have_control) {
-               sr = backend->available_sample_rates (device_name);
+               sr = get_sample_rates_for_all_devices ();
        } else {
-
-               sr.push_back (8000.0f);
-               sr.push_back (16000.0f);
-               sr.push_back (32000.0f);
-               sr.push_back (44100.0f);
-               sr.push_back (48000.0f);
-               sr.push_back (88200.0f);
-               sr.push_back (96000.0f);
-               sr.push_back (192000.0f);
-               sr.push_back (384000.0f);
+               sr = get_default_sample_rates ();
        }
 
        for (vector<float>::const_iterator x = sr.begin(); x != sr.end(); ++x) {
@@ -1099,93 +1294,159 @@ EngineControl::set_samplerate_popdown_strings (const std::string& device_name)
                }
        }
 
+       set_popdown_strings (sample_rate_combo, s);
+
        if (!s.empty()) {
-               sample_rate_combo.set_sensitive (true);
-               set_popdown_strings (sample_rate_combo, s);
+               if (desired.empty ()) {
+                       float new_active_sr = backend->default_sample_rate ();
+
+                       if (std::find (sr.begin (), sr.end (), new_active_sr) == sr.end ()) {
+                               new_active_sr = sr.front ();
+                       }
 
-               if (desired.empty()) {
-                       sample_rate_combo.set_active_text (rate_as_string (backend->default_sample_rate()));
+                       sample_rate_combo.set_active_text (rate_as_string (new_active_sr));
                } else {
                        sample_rate_combo.set_active_text (desired);
                }
 
+       }
+       update_sensitivity ();
+}
+
+vector<uint32_t>
+EngineControl::get_buffer_sizes_for_all_devices ()
+{
+       boost::shared_ptr<ARDOUR::AudioBackend> backend =
+           ARDOUR::AudioEngine::instance ()->current_backend ();
+       vector<uint32_t> all_sizes;
+
+       if (backend->use_separate_input_and_output_devices ()) {
+               all_sizes = backend->available_buffer_sizes2 (get_input_device_name (), get_output_device_name ());
        } else {
-               sample_rate_combo.set_sensitive (false);
+               all_sizes = backend->available_buffer_sizes (get_device_name ());
        }
+       return all_sizes;
+}
+
+vector<uint32_t>
+EngineControl::get_default_buffer_sizes ()
+{
+       vector<uint32_t> sizes;
+       sizes.push_back (8);
+       sizes.push_back (16);
+       sizes.push_back (32);
+       sizes.push_back (64);
+       sizes.push_back (128);
+       sizes.push_back (256);
+       sizes.push_back (512);
+       sizes.push_back (1024);
+       sizes.push_back (2048);
+       sizes.push_back (4096);
+       sizes.push_back (8192);
+       return sizes;
 }
 
 void
-EngineControl::set_buffersize_popdown_strings (const std::string& device_name)
+EngineControl::set_buffersize_popdown_strings ()
 {
+       DEBUG_ECONTROL ("set_buffersize_popdown_strings");
        boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance()->current_backend();
        vector<uint32_t> bs;
        vector<string> s;
 
        if (_have_control) {
-               bs = backend->available_buffer_sizes (device_name);
+               bs = get_buffer_sizes_for_all_devices ();
        } else if (backend->can_change_buffer_size_when_running()) {
-               bs.push_back (8);
-               bs.push_back (16);
-               bs.push_back (32);
-               bs.push_back (64);
-               bs.push_back (128);
-               bs.push_back (256);
-               bs.push_back (512);
-               bs.push_back (1024);
-               bs.push_back (2048);
-               bs.push_back (4096);
-               bs.push_back (8192);
-       }
-       s.clear ();
+               bs = get_default_buffer_sizes ();
+       }
+
        for (vector<uint32_t>::const_iterator x = bs.begin(); x != bs.end(); ++x) {
                s.push_back (bufsize_as_string (*x));
        }
 
+       uint32_t previous_size = 0;
+       if (!buffer_size_combo.get_active_text().empty()) {
+               previous_size = get_buffer_size ();
+       }
+
+       set_popdown_strings (buffer_size_combo, s);
+
        if (!s.empty()) {
-               buffer_size_combo.set_sensitive (true);
-               set_popdown_strings (buffer_size_combo, s);
 
-               uint32_t period = backend->buffer_size();
-               if (0 == period) {
-                       period = backend->default_buffer_size(device_name);
+               if (std::find(bs.begin(), bs.end(), previous_size) != bs.end()) {
+                       buffer_size_combo.set_active_text(bufsize_as_string(previous_size));
+               } else {
+
+                       buffer_size_combo.set_active_text(s.front());
+
+                       uint32_t period = backend->buffer_size();
+                       if (0 == period && backend->use_separate_input_and_output_devices()) {
+                               period = backend->default_buffer_size(get_input_device_name());
+                       }
+                       if (0 == period && backend->use_separate_input_and_output_devices()) {
+                               period = backend->default_buffer_size(get_output_device_name());
+                       }
+                       if (0 == period && !backend->use_separate_input_and_output_devices()) {
+                               period = backend->default_buffer_size(get_device_name());
+                       }
+
+                       set_active_text_if_present(buffer_size_combo, bufsize_as_string(period));
                }
-               set_active_text_if_present (buffer_size_combo, bufsize_as_string (period));
                show_buffer_duration ();
-       } else {
-               buffer_size_combo.set_sensitive (false);
        }
+       update_sensitivity ();
 }
 
 void
 EngineControl::device_changed ()
 {
+       SignalBlocker blocker (*this, "device_changed");
        boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance()->current_backend();
        assert (backend);
-       string device_name = device_combo.get_active_text ();
 
-       if (device_name != backend->device_name()) {
-               /* we set the backend-device to query various device related intormation.
-                * This has the side effect that backend->device_name() will match
-                * the device_name and  'change_device' will never be true.
-                * so work around this by setting...
-                */
-               queue_device_changed = true;
+       string device_name_in;
+       string device_name_out; // only used if backend support separate I/O devices
+
+       if (backend->use_separate_input_and_output_devices()) {
+               device_name_in  = get_input_device_name ();
+               device_name_out = get_output_device_name ();
+       } else {
+               device_name_in = get_device_name ();
+       }
+
+       /* we set the backend-device to query various device related intormation.
+        * This has the side effect that backend->device_name() will match
+        * the device_name and  'change_device' will never be true.
+        * so work around this by setting...
+        */
+       if (backend->use_separate_input_and_output_devices()) {
+               if (device_name_in != backend->input_device_name() || device_name_out != backend->output_device_name ()) {
+                       queue_device_changed = true;
+               }
+       } else {
+               if (device_name_in != backend->device_name()) {
+                       queue_device_changed = true;
+               }
        }
        
        //the device name must be set FIRST so ASIO can populate buffersizes and the control panel button
-       backend->set_device_name(device_name);
+       if (backend->use_separate_input_and_output_devices()) {
+               backend->set_input_device_name (device_name_in);
+               backend->set_output_device_name (device_name_out);
+       } else {
+               backend->set_device_name(device_name_in);
+       }
 
        {
-               PBD::Unwinder<uint32_t> protect_ignore_changes (ignore_changes, ignore_changes + 1);
-
                /* don't allow programmatic change to combos to cause a
                   recursive call to this method.
                 */
+               PBD::Unwinder<uint32_t> protect_ignore_changes (ignore_changes, ignore_changes + 1);
+
+               set_samplerate_popdown_strings ();
+               set_buffersize_popdown_strings ();
 
-               set_samplerate_popdown_strings (device_name);
-               set_buffersize_popdown_strings (device_name);
-               /* XXX theoretically need to set min + max channel counts here
-               */
+               /* TODO set min + max channel counts here */
 
                manage_control_app_sensitivity ();
        }
@@ -1200,63 +1461,15 @@ EngineControl::device_changed ()
 void
 EngineControl::input_device_changed ()
 {
-       boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance()->current_backend();
-       assert (backend);
-       string input_device_name = input_device_combo.get_active_text ();
-
-       if (input_device_name != backend->input_device_name()) {
-               queue_device_changed = true;
-       }
-
-       backend->set_input_device_name(input_device_name);
-
-       {
-               PBD::Unwinder<uint32_t> protect_ignore_changes (ignore_changes, ignore_changes + 1);
-
-               set_samplerate_popdown_strings (input_device_name);
-               set_buffersize_popdown_strings (input_device_name);
-               /* XXX theoretically need to set min + max channel counts here
-               */
-
-               manage_control_app_sensitivity ();
-       }
-
-       /* pick up any saved state for this device */
-
-       if (!ignore_changes) {
-               maybe_display_saved_state ();
-       }
+       DEBUG_ECONTROL ("input_device_changed");
+       device_changed ();
 }
 
 void
 EngineControl::output_device_changed ()
 {
-       boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance()->current_backend();
-       assert (backend);
-       string output_device_name = output_device_combo.get_active_text ();
-
-       if (output_device_name != backend->output_device_name()) {
-               queue_device_changed = true;
-       }
-
-       backend->set_output_device_name(output_device_name);
-
-       {
-               PBD::Unwinder<uint32_t> protect_ignore_changes (ignore_changes, ignore_changes + 1);
-
-               set_samplerate_popdown_strings (output_device_name);
-               set_buffersize_popdown_strings (output_device_name);
-               /* XXX theoretically need to set min + max channel counts here
-               */
-
-               manage_control_app_sensitivity ();
-       }
-
-       /* pick up any saved state for this device */
-
-       if (!ignore_changes) {
-               maybe_display_saved_state ();
-       }
+       DEBUG_ECONTROL ("output_device_changed");
+       device_changed ();
 }
 
 string
@@ -1273,6 +1486,7 @@ EngineControl::bufsize_as_string (uint32_t sz)
 void
 EngineControl::sample_rate_changed ()
 {
+       DEBUG_ECONTROL ("sample_rate_changed");
        /* reset the strings for buffer size to show the correct msec value
           (reflecting the new sample rate).
         */
@@ -1284,13 +1498,14 @@ EngineControl::sample_rate_changed ()
 void
 EngineControl::buffer_size_changed ()
 {
+       DEBUG_ECONTROL ("buffer_size_changed");
        show_buffer_duration ();
 }
 
 void
 EngineControl::show_buffer_duration ()
 {
-
+       DEBUG_ECONTROL ("show_buffer_duration");
        /* buffer sizes  - convert from just samples to samples + msecs for
         * the displayed string
         */
@@ -1324,6 +1539,7 @@ EngineControl::show_buffer_duration ()
 void
 EngineControl::midi_option_changed ()
 {
+       DEBUG_ECONTROL ("midi_option_changed");
        boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance()->current_backend();
        assert (backend);
 
@@ -1492,6 +1708,7 @@ EngineControl::maybe_display_saved_state ()
        State state = get_saved_state_for_currently_displayed_backend_and_device ();
 
        if (state) {
+               DEBUG_ECONTROL ("Restoring saved state");
                PBD::Unwinder<uint32_t> protect_ignore_changes (ignore_changes, ignore_changes + 1);
 
                if (!_desired_sample_rate) {
@@ -1509,12 +1726,16 @@ EngineControl::maybe_display_saved_state ()
                        midi_option_combo.set_active_text (state->midi_option);
                        _midi_devices = state->midi_devices;
                }
+       } else {
+               DEBUG_ECONTROL ("Unable to find saved state for backend and devices");
        }
 }
 
 XMLNode&
 EngineControl::get_state ()
 {
+       LocaleGuard lg (X_("C"));
+
        XMLNode* root = new XMLNode ("AudioMIDISetup");
        std::string path;
 
@@ -1560,6 +1781,22 @@ EngineControl::get_state ()
 }
 
 void
+EngineControl::set_default_state ()
+{
+       vector<string> backend_names;
+       vector<const ARDOUR::AudioBackendInfo*> backends = ARDOUR::AudioEngine::instance()->available_backends();
+
+       for (vector<const ARDOUR::AudioBackendInfo*>::const_iterator b = backends.begin(); b != backends.end(); ++b) {
+               backend_names.push_back ((*b)->name);
+       }
+       backend_combo.set_active_text (backend_names.front());
+
+       // We could set default backends per platform etc here
+
+       backend_changed ();
+}
+
+bool
 EngineControl::set_state (const XMLNode& root)
 {
        XMLNodeList          clist, cclist;
@@ -1571,7 +1808,7 @@ EngineControl::set_state (const XMLNode& root)
        fprintf (stderr, "EngineControl::set_state\n");
 
        if (root.name() != "AudioMIDISetup") {
-               return;
+               return false;
        }
 
        clist = root.children();
@@ -1724,27 +1961,105 @@ EngineControl::set_state (const XMLNode& root)
        for (StateList::const_iterator i = states.begin(); i != states.end(); ++i) {
 
                if ((*i)->active) {
-                       PBD::Unwinder<uint32_t> protect_ignore_changes (ignore_changes, ignore_changes + 1);
-                       backend_combo.set_active_text ((*i)->backend);
-                       driver_combo.set_active_text ((*i)->driver);
-                       device_combo.set_active_text ((*i)->device);
-                       fprintf (stderr, "setting input device to: %s ", (*i)->input_device.c_str());
-                       input_device_combo.set_active_text ((*i)->input_device);
-                       fprintf (stderr, "setting output device to: %s ", (*i)->output_device.c_str());
-                       output_device_combo.set_active_text ((*i)->output_device);
-                       sample_rate_combo.set_active_text (rate_as_string ((*i)->sample_rate));
-                       set_active_text_if_present (buffer_size_combo, bufsize_as_string ((*i)->buffer_size));
-                       input_latency.set_value ((*i)->input_latency);
-                       output_latency.set_value ((*i)->output_latency);
-                       midi_option_combo.set_active_text ((*i)->midi_option);
-                       break;
+                       return set_current_state (*i);
+               }
+       }
+       return false;
+}
+
+bool
+EngineControl::set_current_state (const State& state)
+{
+       DEBUG_ECONTROL ("set_current_state");
+
+       boost::shared_ptr<ARDOUR::AudioBackend> backend;
+
+       if (!(backend = ARDOUR::AudioEngine::instance ()->set_backend (
+                 state->backend, downcase (std::string(PROGRAM_NAME)), ""))) {
+               DEBUG_ECONTROL (string_compose ("Unable to set backend to %1", state->backend));
+               // this shouldn't happen as the invalid backend names should have been
+               // removed from the list of states.
+               return false;
+       }
+
+       // now reflect the change in the backend in the GUI so backend_changed will
+       // do the right thing
+       backend_combo.set_active_text (state->backend);
+
+       if (!state->driver.empty ()) {
+               if (!backend->requires_driver_selection ()) {
+                       DEBUG_ECONTROL ("Backend should require driver selection");
+                       // A backend has changed from having driver selection to not having
+                       // it or someone has been manually editing a config file and messed
+                       // it up
+                       return false;
+               }
+
+               if (backend->set_driver (state->driver) != 0) {
+                       DEBUG_ECONTROL (string_compose ("Unable to set driver %1", state->driver));
+                       // Driver names for a backend have changed and the name in the
+                       // config file is now invalid or support for driver is no longer
+                       // included in the backend
+                       return false;
                }
+               // no need to set the driver_combo as backend_changed will use
+               // backend->driver_name to set the active driver
        }
+
+       if (!state->device.empty ()) {
+               if (backend->set_device_name (state->device) != 0) {
+                       DEBUG_ECONTROL (
+                           string_compose ("Unable to set device name %1", state->device));
+                       // device is no longer available on the system
+                       return false;
+               }
+               // no need to set active device as it will be picked up in
+               // via backend_changed ()/set_device_popdown_strings
+
+       } else {
+               // backend supports separate input/output devices
+               if (backend->set_input_device_name (state->input_device) != 0) {
+                       DEBUG_ECONTROL (string_compose ("Unable to set input device name %1",
+                                                       state->input_device));
+                       // input device is no longer available on the system
+                       return false;
+               }
+
+               if (backend->set_output_device_name (state->output_device) != 0) {
+                       DEBUG_ECONTROL (string_compose ("Unable to set output device name %1",
+                                                       state->input_device));
+                       // output device is no longer available on the system
+                       return false;
+               }
+               // no need to set active devices as it will be picked up in via
+               // backend_changed ()/set_*_device_popdown_strings
+       }
+
+       backend_changed ();
+
+       // Now restore the state of the rest of the controls
+
+       // We don't use a SignalBlocker as set_current_state is currently only
+       // called from set_state before any signals are connected. If at some point
+       // a more general named state mechanism is implemented and
+       // set_current_state is called while signals are connected then a
+       // SignalBlocker will need to be instantiated before setting these.
+
+       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);
+       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));
+       input_latency.set_value (state->input_latency);
+       output_latency.set_value (state->output_latency);
+       midi_option_combo.set_active_text (state->midi_option);
+       return true;
 }
 
 int
 EngineControl::push_state_to_backend (bool start)
 {
+       DEBUG_ECONTROL ("push_state_to_backend");
        boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance()->current_backend();
 
        if (!backend) {
@@ -2134,7 +2449,7 @@ EngineControl::get_backend () const
 string
 EngineControl::get_driver () const
 {
-       if (driver_combo.get_sensitive() && driver_combo.get_parent()) {
+       if (driver_combo.get_parent()) {
                return driver_combo.get_active_text ();
        } else {
                return "";
@@ -2171,6 +2486,36 @@ EngineControl::control_app_button_clicked ()
        backend->launch_control_app ();
 }
 
+void
+EngineControl::start_stop_button_clicked ()
+{
+       boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance()->current_backend();
+
+       if (!backend) {
+               return;
+       }
+
+       if (ARDOUR::AudioEngine::instance()->running()) {
+               ARDOUR::AudioEngine::instance()->stop ();
+       } else {
+               push_state_to_backend (true);
+       }
+}
+
+void
+EngineControl::update_devices_button_clicked ()
+{
+       boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance()->current_backend();
+
+       if (!backend) {
+               return;
+       }
+
+       if (backend->update_devices()) {
+               device_list_changed ();
+       }
+}
+
 void
 EngineControl::manage_control_app_sensitivity ()
 {
@@ -2194,8 +2539,6 @@ EngineControl::set_desired_sample_rate (uint32_t sr)
 {
        _desired_sample_rate = sr;
        device_changed ();
-       input_device_changed ();
-       output_device_changed ();
 }
 
 void
@@ -2203,13 +2546,11 @@ EngineControl::on_switch_page (GtkNotebookPage*, guint page_num)
 {
        if (page_num == 0) {
                cancel_button->set_sensitive (true);
-               ok_button->set_sensitive (true);
-               apply_button->set_sensitive (true);
                _measure_midi.reset();
+               update_sensitivity ();
        } else {
                cancel_button->set_sensitive (false);
                ok_button->set_sensitive (false);
-               apply_button->set_sensitive (false);
        }
 
        if (page_num == midi_tab) {
@@ -2487,14 +2828,16 @@ EngineControl::engine_running ()
        set_active_text_if_present (buffer_size_combo, bufsize_as_string (backend->buffer_size()));
        sample_rate_combo.set_active_text (rate_as_string (backend->sample_rate()));
 
-       buffer_size_combo.set_sensitive (true);
-       sample_rate_combo.set_sensitive (true);
-
        connect_disconnect_button.set_label (string_compose (_("Disconnect from %1"), backend->name()));
        connect_disconnect_button.show();
 
        started_at_least_once = true;
-       engine_status.set_markup(string_compose ("<span foreground=\"green\">%1</span>", _("Active")));
+       if (_have_control) {
+               engine_status.set_markup(string_compose ("<span foreground=\"green\">%1</span>", _("Running")));
+       } else {
+               engine_status.set_markup(string_compose ("<span foreground=\"green\">%1</span>", _("Connected")));
+       }
+       update_sensitivity();
 }
 
 void
@@ -2503,13 +2846,16 @@ EngineControl::engine_stopped ()
        boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance()->current_backend();
        assert (backend);
 
-       buffer_size_combo.set_sensitive (false);
        connect_disconnect_button.set_label (string_compose (_("Connect to %1"), backend->name()));
        connect_disconnect_button.show();
 
-       sample_rate_combo.set_sensitive (true);
-       buffer_size_combo.set_sensitive (true);
-       engine_status.set_markup(string_compose ("<span foreground=\"red\">%1</span>", _("Inactive")));
+       if (_have_control) {
+               engine_status.set_markup(string_compose ("<span foreground=\"red\">%1</span>", _("Stopped")));
+       } else {
+               engine_status.set_markup(X_(""));
+       }
+
+       update_sensitivity();
 }
 
 void