NOOP, remove trailing tabs/whitespace.
[ardour.git] / gtk2_ardour / engine_dialog.cc
index f4481e22f8c23f3efc902b83e8de2d02417beb79..61dbe22a7821e9a3e80e7cb8cb624175852e7fa1 100644 (file)
@@ -86,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)"))
@@ -98,6 +100,7 @@ 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;
@@ -251,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.
         */
@@ -266,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 */
@@ -403,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.
@@ -422,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;
@@ -437,6 +442,11 @@ EngineControl::on_response (int response_id)
                                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 ();
        }
@@ -461,6 +471,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);
@@ -550,7 +566,7 @@ EngineControl::build_full_control_notebook ()
                basic_packer.attach (input_channels, 1, 2, row, row+1, xopt, (AttachOptions) 0);
                ++row;
        }
-       
+
        output_channels.set_name ("OutputChannels");
        output_channels.set_flags (Gtk::CAN_FOCUS);
        output_channels.set_digits (0);
@@ -563,7 +579,7 @@ EngineControl::build_full_control_notebook ()
                basic_packer.attach (output_channels, 1, 2, row, row+1, xopt, (AttachOptions) 0);
                ++row;
        }
-       
+
        input_latency.set_name ("InputLatency");
        input_latency.set_flags (Gtk::CAN_FOCUS);
        input_latency.set_digits (0);
@@ -597,7 +613,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++;
 }
 
@@ -716,6 +738,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 ()
 {
@@ -817,7 +953,7 @@ EngineControl::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;
@@ -833,12 +969,9 @@ EngineControl::backend_changed ()
 
        if (backend->requires_driver_selection()) {
                if (set_driver_popdown_strings ()) {
-                       driver_combo.set_sensitive (true);
                        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
                 */
@@ -853,6 +986,12 @@ EngineControl::backend_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 ();
        }
@@ -884,7 +1023,7 @@ EngineControl::print_channel_count (Gtk::SpinButton* sb)
        if (ARDOUR::Profile->get_mixbus()) {
                return true;
        }
-       
+
        uint32_t cnt = (uint32_t) sb->get_value();
        if (cnt == 0) {
                sb->set_text (_("all available channels"));
@@ -926,6 +1065,46 @@ EngineControl::set_driver_popdown_strings ()
        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 ()
@@ -953,23 +1132,15 @@ EngineControl::set_device_popdown_strings ()
                return false;
        }
 
-       string current_device = backend->device_name ();
-
-       // Make sure that backend->device_name () is a valid
-       // device, the backend may not return a valid device if it hasn't
-       // been set yet.
-       if (std::find (available_devices.begin (),
-                      available_devices.end (),
-                      current_device) == available_devices.end ()) {
+       set_popdown_strings (device_combo, available_devices);
 
-               current_device = available_devices.front ();
-       }
+       std::string default_device =
+           get_default_device(backend->device_name(), available_devices);
 
-       set_popdown_strings (device_combo, available_devices);
        DEBUG_ECONTROL (
-           string_compose ("set device_combo active text: %1", current_device));
+           string_compose ("set device_combo active text: %1", default_device));
 
-       device_combo.set_active_text (current_device);
+       device_combo.set_active_text(default_device);
        return true;
 }
 
@@ -991,23 +1162,14 @@ EngineControl::set_input_device_popdown_strings ()
                return false;
        }
 
-       string current_device = backend->input_device_name ();
-
-       // Make sure that backend->input_device_name () is a valid
-       // device, the backend may not return a valid device if it hasn't
-       // been set yet.
-       if (std::find (available_devices.begin (),
-                      available_devices.end (),
-                      current_device) == available_devices.end ()) {
-
-               current_device = available_devices.front ();
-       }
-
        set_popdown_strings (input_device_combo, available_devices);
 
+       std::string default_device =
+           get_default_device(backend->input_device_name(), available_devices);
+
        DEBUG_ECONTROL (
-           string_compose ("set input_device_combo active text: %1", current_device));
-       input_device_combo.set_active_text (current_device);
+           string_compose ("set input_device_combo active text: %1", default_device));
+       input_device_combo.set_active_text(default_device);
        return true;
 }
 
@@ -1029,23 +1191,14 @@ EngineControl::set_output_device_popdown_strings ()
                return false;
        }
 
-       string current_device = backend->output_device_name ();
-
-       // Make sure that backend->output_device_name () is a valid
-       // device, the backend may not return a valid device if it hasn't
-       // been set yet.
-       if (std::find (available_devices.begin (),
-                      available_devices.end (),
-                      current_device) == available_devices.end ()) {
-
-               current_device = available_devices.front ();
-       }
-
        set_popdown_strings (output_device_combo, available_devices);
 
+       std::string default_device =
+           get_default_device(backend->output_device_name(), available_devices);
+
        DEBUG_ECONTROL (
-           string_compose ("set output_device_combo active text: %1", current_device));
-       output_device_combo.set_active_text (current_device);
+           string_compose ("set output_device_combo active text: %1", default_device));
+       output_device_combo.set_active_text(default_device);
        return true;
 }
 
@@ -1070,40 +1223,12 @@ EngineControl::list_devices ()
 
        if (devices_available) {
                device_changed ();
-
-               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);
-
        } 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
@@ -1121,8 +1246,39 @@ 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();
@@ -1131,18 +1287,9 @@ EngineControl::set_samplerate_popdown_strings (const std::string& device_name)
        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) {
@@ -1152,10 +1299,9 @@ EngineControl::set_samplerate_popdown_strings (const std::string& device_name)
                }
        }
 
-       if (!s.empty()) {
-               sample_rate_combo.set_sensitive (true);
-               set_popdown_strings (sample_rate_combo, s);
+       set_popdown_strings (sample_rate_combo, s);
 
+       if (!s.empty()) {
                if (desired.empty ()) {
                        float new_active_sr = backend->default_sample_rate ();
 
@@ -1168,13 +1314,45 @@ EngineControl::set_samplerate_popdown_strings (const std::string& device_name)
                        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();
@@ -1182,39 +1360,46 @@ EngineControl::set_buffersize_popdown_strings (const std::string& device_name)
        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);
+               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);
-               buffer_size_combo.set_active_text (s.front());
 
-               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
@@ -1248,7 +1433,7 @@ EngineControl::device_changed ()
                        queue_device_changed = true;
                }
        }
-       
+
        //the device name must be set FIRST so ASIO can populate buffersizes and the control panel button
        if (backend->use_separate_input_and_output_devices()) {
                backend->set_input_device_name (device_name_in);
@@ -1263,13 +1448,10 @@ EngineControl::device_changed ()
                 */
                PBD::Unwinder<uint32_t> protect_ignore_changes (ignore_changes, ignore_changes + 1);
 
-               /* backends that support separate devices, need to ignore
-                * the device-name - and use the devies set above
-                */
-               set_samplerate_popdown_strings (device_name_in);
-               set_buffersize_popdown_strings (device_name_in);
-               /* XXX theoretically need to set min + max channel counts here
-               */
+               set_samplerate_popdown_strings ();
+               set_buffersize_popdown_strings ();
+
+               /* TODO set min + max channel counts here */
 
                manage_control_app_sensitivity ();
        }
@@ -1531,6 +1713,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) {
@@ -1548,6 +1731,8 @@ 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");
        }
 }
 
@@ -1795,7 +1980,7 @@ EngineControl::set_current_state (const State& state)
        boost::shared_ptr<ARDOUR::AudioBackend> backend;
 
        if (!(backend = ARDOUR::AudioEngine::instance ()->set_backend (
-                 state->backend, "ardour", ""))) {
+                 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.
@@ -2269,7 +2454,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 "";
@@ -2306,6 +2491,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 ()
 {
@@ -2336,13 +2551,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) {
@@ -2620,14 +2833,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
@@ -2636,13 +2851,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