and a more intrusive KDE workaround
[ardour.git] / gtk2_ardour / engine_dialog.cc
index 8c0694713dfc01b5ae0b7497d2e895292966fb01..a9b4dbdce04d868194747050546aaf4e14001f91 100644 (file)
 #include "ardour_ui.h"
 #include "engine_dialog.h"
 #include "gui_thread.h"
+#include "ui_config.h"
 #include "utils.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
+#include "splash.h"
 
 using namespace std;
 using namespace Gtk;
@@ -87,6 +89,7 @@ EngineControl::EngineControl ()
        , midi_devices_button (_("Midi Device Setup"))
        , start_stop_button (_("Stop"))
        , update_devices_button (_("Refresh Devices"))
+       , use_buffered_io_button (_("Use Buffered I/O"), ArdourButton::led_default_elements)
        , lm_measure_label (_("Measure"))
        , lm_use_button (_("Use results"))
        , lm_back_button (_("Back to settings ... (ignore results)"))
@@ -96,6 +99,7 @@ EngineControl::EngineControl ()
        , lm_running (false)
        , midi_back_button (_("Back to settings"))
        , ignore_changes (0)
+       , ignore_device_changes (0)
        , _desired_sample_rate (0)
        , started_at_least_once (false)
        , queue_device_changed (false)
@@ -110,6 +114,12 @@ EngineControl::EngineControl ()
 
        set_name (X_("AudioMIDISetup"));
 
+       if (UIConfiguration::instance().get_all_floating_windows_are_dialogs()) {
+               set_type_hint (Gdk::WINDOW_TYPE_HINT_DIALOG);
+       } else {
+               set_type_hint (Gdk::WINDOW_TYPE_HINT_UTILITY);
+       }
+
        /* the backend combo is the one thing that is ALWAYS visible */
 
        vector<const ARDOUR::AudioBackendInfo*> backends = ARDOUR::AudioEngine::instance()->available_backends();
@@ -262,7 +272,6 @@ EngineControl::EngineControl ()
        output_channels.signal_output().connect (sigc::bind (sigc::ptr_fun (&EngineControl::print_channel_count), &output_channels));
 
        midi_devices_button.signal_clicked.connect (mem_fun (*this, &EngineControl::configure_midi_devices));
-       midi_devices_button.set_sensitive (false);
        midi_devices_button.set_name ("generic button");
        midi_devices_button.set_can_focus(true);
 
@@ -275,14 +284,17 @@ EngineControl::EngineControl ()
        start_stop_button.set_sensitive (false);
        start_stop_button.set_name ("generic button");
        start_stop_button.set_can_focus(true);
+       start_stop_button.set_can_default(true);
 
        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);
-       ok_button = add_button (Gtk::Stock::OK, Gtk::RESPONSE_OK);
+       use_buffered_io_button.signal_clicked.connect (mem_fun (*this, &EngineControl::use_buffered_io_button_clicked));
+       use_buffered_io_button.set_sensitive (false);
+       use_buffered_io_button.set_name ("generic button");
+       use_buffered_io_button.set_can_focus(true);
 
        /* Pick up any existing audio setup configuration, if appropriate */
 
@@ -301,13 +313,18 @@ EngineControl::EngineControl ()
                set_default_state ();
        }
 
+       update_sensitivity ();
        connect_changed_signals ();
 
        notebook.signal_switch_page().connect (sigc::mem_fun (*this, &EngineControl::on_switch_page));
 
        connect_disconnect_button.signal_clicked().connect (sigc::mem_fun (*this, &EngineControl::connect_disconnect_click));
-       connect_disconnect_button.set_no_show_all();
 
+       connect_disconnect_button.set_no_show_all();
+       use_buffered_io_button.set_no_show_all();
+       update_devices_button.set_no_show_all();
+       start_stop_button.set_no_show_all();
+       midi_devices_button.set_no_show_all();
 }
 
 void
@@ -321,6 +338,8 @@ EngineControl::connect_changed_signals ()
            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));
+       nperiods_combo_connection = nperiods_combo.signal_changed ().connect (
+           sigc::mem_fun (*this, &EngineControl::nperiods_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 (
@@ -350,6 +369,7 @@ EngineControl::block_changed_signals ()
                driver_combo_connection.block ();
                sample_rate_combo_connection.block ();
                buffer_size_combo_connection.block ();
+               nperiods_combo_connection.block ();
                device_combo_connection.block ();
                input_device_combo_connection.block ();
                output_device_combo_connection.block ();
@@ -370,6 +390,7 @@ EngineControl::unblock_changed_signals ()
                driver_combo_connection.unblock ();
                sample_rate_combo_connection.unblock ();
                buffer_size_combo_connection.unblock ();
+               nperiods_combo_connection.unblock ();
                device_combo_connection.unblock ();
                input_device_combo_connection.unblock ();
                output_device_combo_connection.unblock ();
@@ -400,12 +421,27 @@ void
 EngineControl::on_show ()
 {
        ArdourDialog::on_show ();
+       if (Splash::instance()) {
+               Splash::instance()->hide ();
+       }
        if (!ARDOUR::AudioEngine::instance()->current_backend() || !ARDOUR::AudioEngine::instance()->running()) {
                // re-check _have_control (jackd running) see #6041
                backend_changed ();
        }
        device_changed ();
-       ok_button->grab_focus();
+       start_stop_button.grab_focus();
+}
+
+bool
+EngineControl::try_autostart ()
+{
+       if (!start_stop_button.get_sensitive()) {
+               return false;
+       }
+       if (ARDOUR::AudioEngine::instance()->running()) {
+               return true;
+       }
+       return start_engine ();
 }
 
 bool
@@ -432,49 +468,6 @@ EngineControl::stop_engine (bool for_latency)
        return true;
 }
 
-void
-EngineControl::on_response (int response_id)
-{
-       ArdourDialog::on_response (response_id);
-
-       switch (response_id) {
-       case RESPONSE_OK:
-               if (!start_engine()) {
-                       return;
-               } else {
-                       hide();
-               }
-#ifdef PLATFORM_WINDOWS
-
-               // But if there's no session open, this can produce
-               // a long gap when nothing appears to be happening.
-               // Let's show the splash image while we're waiting.
-               if (!ARDOUR_COMMAND_LINE::no_splash) {
-                       if (ARDOUR_UI::instance()) {
-                               if (!ARDOUR_UI::instance()->session_loaded) {
-                                       ARDOUR_UI::instance()->show_splash();
-                               }
-                       }
-               }
-#endif
-               break;
-       case RESPONSE_DELETE_EVENT: {
-               GdkEventButton ev;
-               ev.type = GDK_BUTTON_PRESS;
-               ev.button = 1;
-               on_delete_event((GdkEventAny*)&ev);
-               break;
-       }
-       case RESPONSE_CANCEL:
-               if (ARDOUR_UI::instance() && ARDOUR_UI::instance()->session_loaded) {
-                       ARDOUR_UI::instance()->check_audioengine(*this);
-               }
-       // fall through
-       default:
-               hide();
-       }
-}
-
 void
 EngineControl::build_notebook ()
 {
@@ -499,6 +492,7 @@ EngineControl::build_notebook ()
 
        basic_packer.attach (start_stop_button, 3, 4, 0, 1, xopt, xopt);
        basic_packer.attach (update_devices_button, 3, 4, 1, 2, xopt, xopt);
+       basic_packer.attach (use_buffered_io_button, 3, 4, 2, 3, xopt, xopt);
 
        lm_button_audio.signal_clicked.connect (sigc::mem_fun (*this, &EngineControl::calibrate_audio_latency));
        lm_button_audio.set_name ("generic button");
@@ -572,9 +566,18 @@ EngineControl::build_full_control_notebook ()
        buffer_size_duration_label.set_alignment (0.0); /* left-align */
        basic_packer.attach (buffer_size_duration_label, 2, 3, row, row+1, SHRINK, (AttachOptions) 0);
 
-       /* button spans 2 rows */
+       int ctrl_btn_span = 1;
+       if (backend->can_set_period_size ()) {
+               row++;
+               label = manage (left_aligned_label (_("Periods:")));
+               basic_packer.attach (*label, 0, 1, row, row + 1, xopt, (AttachOptions) 0);
+               basic_packer.attach (nperiods_combo, 1, 2, row, row + 1, xopt, (AttachOptions) 0);
+               ++ctrl_btn_span;
+       }
+
+       /* button spans 2 or 3 rows */
 
-       basic_packer.attach (control_app_button, 3, 4, row-1, row+1, xopt, xopt);
+       basic_packer.attach (control_app_button, 3, 4, row - ctrl_btn_span, row + 1, xopt, xopt);
        row++;
 
        input_channels.set_name ("InputChannels");
@@ -636,13 +639,7 @@ 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++;
 }
 
@@ -767,7 +764,6 @@ 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;
        }
@@ -821,34 +817,59 @@ EngineControl::update_sensitivity ()
        }
 
        if (get_popdown_string_count (sample_rate_combo) > 0) {
+               bool allow_to_set_rate = false;
                if (!ARDOUR::AudioEngine::instance()->running()) {
-                       sample_rate_combo.set_sensitive (true);
-               } else {
-                       sample_rate_combo.set_sensitive (false);
+                       if (!ARDOUR_UI::instance()->session_loaded) {
+                               // engine is not running, no session loaded -> anything goes.
+                               allow_to_set_rate = true;
+                       } else if (_desired_sample_rate > 0 && get_rate () != _desired_sample_rate) {
+                               // only allow to change if the current setting is not the native session rate.
+                               allow_to_set_rate = true;
+                       }
                }
+               sample_rate_combo.set_sensitive (allow_to_set_rate);
        } else {
                sample_rate_combo.set_sensitive (false);
                valid = false;
        }
 
+       if (get_popdown_string_count (nperiods_combo) > 0) {
+               if (!ARDOUR::AudioEngine::instance()->running()) {
+                       nperiods_combo.set_sensitive (true);
+               } else {
+                       nperiods_combo.set_sensitive (false);
+               }
+       } else {
+               nperiods_combo.set_sensitive (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);
+                       use_buffered_io_button.set_sensitive(false);
                } else {
                        if (backend->can_request_update_devices()) {
                                update_devices_button.show();
                        } else {
                                update_devices_button.hide();
                        }
+                       if (backend->can_use_buffered_io()) {
+                               use_buffered_io_button.show();
+                       } else {
+                               use_buffered_io_button.hide();
+                       }
                        start_stop_button.set_text("Start");
                        update_devices_button.set_sensitive(true);
+                       use_buffered_io_button.set_sensitive(true);
                }
        } else {
                update_devices_button.set_sensitive(false);
                update_devices_button.hide();
+               use_buffered_io_button.set_sensitive(false);
+               use_buffered_io_button.hide();
                start_stop_button.set_sensitive(false);
                start_stop_button.hide();
        }
@@ -868,12 +889,6 @@ EngineControl::update_sensitivity ()
                        driver_combo.set_sensitive (false);
                }
        }
-
-       if (valid || !_have_control) {
-               ok_button->set_sensitive (true);
-       } else {
-               ok_button->set_sensitive (false);
-       }
 }
 
 void
@@ -1342,7 +1357,10 @@ EngineControl::set_samplerate_popdown_strings ()
        set_popdown_strings (sample_rate_combo, s);
 
        if (!s.empty()) {
-               if (desired.empty ()) {
+               if (ARDOUR::AudioEngine::instance()->running()) {
+                       sample_rate_combo.set_active_text (rate_as_string (backend->sample_rate()));
+               }
+               else if (desired.empty ()) {
                        float new_active_sr = backend->default_sample_rate ();
 
                        if (std::find (sr.begin (), sr.end (), new_active_sr) == sr.end ()) {
@@ -1442,6 +1460,31 @@ EngineControl::set_buffersize_popdown_strings ()
        update_sensitivity ();
 }
 
+void
+EngineControl::set_nperiods_popdown_strings ()
+{
+       DEBUG_ECONTROL ("set_nperiods_popdown_strings");
+       boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance()->current_backend();
+       vector<uint32_t> np;
+       vector<string> s;
+
+       if (backend->can_set_period_size()) {
+               np = backend->available_period_sizes (get_driver());
+       }
+
+       for (vector<uint32_t>::const_iterator x = np.begin(); x != np.end(); ++x) {
+               s.push_back (nperiods_as_string (*x));
+       }
+
+       set_popdown_strings (nperiods_combo, s);
+
+       if (!s.empty()) {
+               set_active_text_if_present (nperiods_combo, nperiods_as_string (backend->period_size())); // XXX 
+       }
+
+       update_sensitivity ();
+}
+
 void
 EngineControl::device_changed ()
 {
@@ -1490,6 +1533,7 @@ EngineControl::device_changed ()
 
                set_samplerate_popdown_strings ();
                set_buffersize_popdown_strings ();
+               set_nperiods_popdown_strings ();
 
                /* TODO set min + max channel counts here */
 
@@ -1507,6 +1551,24 @@ void
 EngineControl::input_device_changed ()
 {
        DEBUG_ECONTROL ("input_device_changed");
+
+       boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance()->current_backend();
+       if (backend && backend->match_input_output_devices_or_none ()) {
+               const std::string& dev_none = ARDOUR::AudioBackend::get_standard_device_name (ARDOUR::AudioBackend::DeviceNone);
+
+               if (get_output_device_name () != dev_none
+                               && get_input_device_name () != dev_none
+                               && get_input_device_name () != get_output_device_name ()) {
+                       block_changed_signals ();
+                       if (contains_value (output_device_combo, get_input_device_name ())) {
+                               output_device_combo.set_active_text (get_input_device_name ());
+                       } else {
+                               assert (contains_value (output_device_combo, dev_none));
+                               output_device_combo.set_active_text (dev_none);
+                       }
+                       unblock_changed_signals ();
+               }
+       }
        device_changed ();
 }
 
@@ -1514,20 +1576,41 @@ void
 EngineControl::output_device_changed ()
 {
        DEBUG_ECONTROL ("output_device_changed");
+       boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance()->current_backend();
+       if (backend && backend->match_input_output_devices_or_none ()) {
+               const std::string& dev_none = ARDOUR::AudioBackend::get_standard_device_name (ARDOUR::AudioBackend::DeviceNone);
+
+               if (get_input_device_name () != dev_none
+                               && get_input_device_name () != dev_none
+                               && get_input_device_name () != get_output_device_name ()) {
+                       block_changed_signals ();
+                       if (contains_value (input_device_combo, get_output_device_name ())) {
+                               input_device_combo.set_active_text (get_output_device_name ());
+                       } else {
+                               assert (contains_value (input_device_combo, dev_none));
+                               input_device_combo.set_active_text (dev_none);
+                       }
+                       unblock_changed_signals ();
+               }
+       }
        device_changed ();
 }
 
 string
 EngineControl::bufsize_as_string (uint32_t sz)
 {
-       /* Translators: "samples" is always plural here, so no
-          need for plural+singular forms.
-        */
-       char buf[64];
-       snprintf (buf, sizeof (buf), "%u %s", sz, P_("sample", "samples", sz));
+       return string_compose (P_("%1 sample", "%1 samples", sz), sz);
+}
+
+string
+EngineControl::nperiods_as_string (uint32_t np)
+{
+       char buf[8];
+       snprintf (buf, sizeof (buf), "%u", np);
        return buf;
 }
 
+
 void
 EngineControl::sample_rate_changed ()
 {
@@ -1547,6 +1630,13 @@ EngineControl::buffer_size_changed ()
        show_buffer_duration ();
 }
 
+void
+EngineControl::nperiods_changed ()
+{
+       DEBUG_ECONTROL ("nperiods_changed");
+       show_buffer_duration ();
+}
+
 void
 EngineControl::show_buffer_duration ()
 {
@@ -1559,17 +1649,12 @@ EngineControl::show_buffer_duration ()
        uint32_t samples = atoi (bs_text); /* will ignore trailing text */
        uint32_t rate = get_rate();
 
-       /* Developers: note the hard-coding of a double buffered model
-          in the (2 * samples) computation of latency. we always start
-          the audiobackend in this configuration.
-        */
-       /* note to jack1 developers: ardour also always starts the engine
-        * in async mode (no jack2 --sync option) which adds an extra cycle
-        * of latency with jack2 (and *3 would be correct)
-        * The value can also be wrong if jackd is started externally..
+       /* Except for ALSA and Dummy backends, we don't know the number of periods
+        * per cycle and settings.
         *
-        * At the time of writing the ALSA backend always uses double-buffering *2,
-        * The Dummy backend *1, and who knows what ASIO really does :)
+        * jack1 vs jack2 have different default latencies since jack2 start
+        * in async-mode unless --sync is given which adds an extra cycle
+        * of latency. The value is not known if jackd is started externally..
         *
         * So just display the period size, that's also what
         * ARDOUR_UI::update_sample_rate() does for the status bar.
@@ -1615,9 +1700,9 @@ EngineControl::midi_option_changed ()
        _midi_devices = new_devices;
 
        if (_midi_devices.empty()) {
-               midi_devices_button.set_sensitive (false);
+               midi_devices_button.hide ();
        } else {
-               midi_devices_button.set_sensitive (true);
+               midi_devices_button.show ();
        }
 }
 
@@ -1762,12 +1847,14 @@ EngineControl::store_state (State state)
        state->output_device = get_output_device_name ();
        state->sample_rate = get_rate ();
        state->buffer_size = get_buffer_size ();
+       state->n_periods = get_nperiods ();
        state->input_latency = get_input_latency ();
        state->output_latency = get_output_latency ();
        state->input_channels = get_input_channels ();
        state->output_channels = get_output_channels ();
        state->midi_option = get_midi_option ();
        state->midi_devices = _midi_devices;
+       state->use_buffered_io = get_use_buffered_io ();
        state->lru = time (NULL) ;
 }
 
@@ -1788,6 +1875,8 @@ EngineControl::maybe_display_saved_state ()
                        sample_rate_combo.set_active_text (rate_as_string (state->sample_rate));
                }
                set_active_text_if_present (buffer_size_combo, bufsize_as_string (state->buffer_size));
+
+               set_active_text_if_present (nperiods_combo, nperiods_as_string (state->n_periods));
                /* call this explicitly because we're ignoring changes to
                   the controls at this point.
                 */
@@ -1795,6 +1884,8 @@ EngineControl::maybe_display_saved_state ()
                input_latency.set_value (state->input_latency);
                output_latency.set_value (state->output_latency);
 
+               use_buffered_io_button.set_active (state->use_buffered_io);
+
                if (!state->midi_option.empty()) {
                        midi_option_combo.set_active_text (state->midi_option);
                        _midi_devices = state->midi_devices;
@@ -1807,7 +1898,7 @@ EngineControl::maybe_display_saved_state ()
 XMLNode&
 EngineControl::get_state ()
 {
-       LocaleGuard lg (X_("C"));
+       LocaleGuard lg;
 
        XMLNode* root = new XMLNode ("AudioMIDISetup");
        std::string path;
@@ -1826,11 +1917,13 @@ EngineControl::get_state ()
                        node->add_property ("output-device", (*i)->output_device);
                        node->add_property ("sample-rate", (*i)->sample_rate);
                        node->add_property ("buffer-size", (*i)->buffer_size);
+                       node->add_property ("n-periods", (*i)->n_periods);
                        node->add_property ("input-latency", (*i)->input_latency);
                        node->add_property ("output-latency", (*i)->output_latency);
                        node->add_property ("input-channels", (*i)->input_channels);
                        node->add_property ("output-channels", (*i)->output_channels);
                        node->add_property ("active", (*i)->active ? "yes" : "no");
+                       node->add_property ("use-buffered-io", (*i)->use_buffered_io ? "yes" : "no");
                        node->add_property ("midi-option", (*i)->midi_option);
                        node->add_property ("lru", (*i)->active ? time (NULL) : (*i)->lru);
 
@@ -1875,11 +1968,9 @@ EngineControl::set_state (const XMLNode& root)
 {
        XMLNodeList          clist, cclist;
        XMLNodeConstIterator citer, cciter;
-       XMLNode* child;
-       XMLNode* grandchild;
-       XMLProperty* prop = NULL;
-
-       fprintf (stderr, "EngineControl::set_state\n");
+       XMLNode const * child;
+       XMLNode const * grandchild;
+       XMLProperty const * prop = NULL;
 
        if (root.name() != "AudioMIDISetup") {
                return false;
@@ -1943,6 +2034,13 @@ EngineControl::set_state (const XMLNode& root)
                        }
                        state->buffer_size = atoi (prop->value ());
 
+                       if ((prop = grandchild->property ("n-periods")) == 0) {
+                               // optional (new value in 4.5)
+                               state->n_periods = 0;
+                       } else {
+                               state->n_periods = atoi (prop->value ());
+                       }
+
                        if ((prop = grandchild->property ("input-latency")) == 0) {
                                continue;
                        }
@@ -1968,6 +2066,11 @@ EngineControl::set_state (const XMLNode& root)
                        }
                        state->active = string_is_affirmative (prop->value ());
 
+                       if ((prop = grandchild->property ("use-buffered-io")) == 0) {
+                               continue;
+                       }
+                       state->use_buffered_io = string_is_affirmative (prop->value ());
+
                        if ((prop = grandchild->property ("midi-option")) == 0) {
                                continue;
                        }
@@ -2135,11 +2238,15 @@ EngineControl::set_current_state (const State& state)
        device_combo.set_active_text (state->device);
        input_device_combo.set_active_text (state->input_device);
        output_device_combo.set_active_text (state->output_device);
-       sample_rate_combo.set_active_text (rate_as_string (state->sample_rate));
+       if (!_desired_sample_rate) {
+               sample_rate_combo.set_active_text (rate_as_string (state->sample_rate));
+       }
        set_active_text_if_present (buffer_size_combo, bufsize_as_string (state->buffer_size));
+       set_active_text_if_present (nperiods_combo, nperiods_as_string (state->n_periods));
        input_latency.set_value (state->input_latency);
        output_latency.set_value (state->output_latency);
        midi_option_combo.set_active_text (state->midi_option);
+       use_buffered_io_button.set_active (state->use_buffered_io);
        return true;
 }
 
@@ -2148,6 +2255,7 @@ EngineControl::push_state_to_backend (bool start)
 {
        DEBUG_ECONTROL ("push_state_to_backend");
        boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance()->current_backend();
+       PBD::Unwinder<uint32_t> protect_ignore_device_changes (ignore_device_changes, ignore_device_changes + 1);
 
        if (!backend) {
                return 0;
@@ -2161,9 +2269,11 @@ EngineControl::push_state_to_backend (bool start)
        bool change_device = false;
        bool change_rate = false;
        bool change_bufsize = false;
+       bool change_nperiods = false;
        bool change_latency = false;
        bool change_channels = false;
        bool change_midi = false;
+       bool change_buffered_io = false;
 
        uint32_t ochan = get_output_channels ();
        uint32_t ichan = get_input_channels ();
@@ -2205,10 +2315,21 @@ EngineControl::push_state_to_backend (bool start)
                                change_bufsize = true;
                        }
 
+                       if (backend->can_set_period_size() && get_popdown_string_count (nperiods_combo) > 0
+                                       && get_nperiods() != backend->period_size()) {
+                               change_nperiods = true;
+                       }
+
                        if (get_midi_option() != backend->midi_option()) {
                                change_midi = true;
                        }
 
+                       if (backend->can_use_buffered_io()) {
+                               if (get_use_buffered_io() != backend->get_use_buffered_io()) {
+                                       change_buffered_io = true;
+                               }
+                       }
+
                        /* zero-requested channels means "all available" */
 
                        if (ichan == 0) {
@@ -2244,6 +2365,9 @@ EngineControl::push_state_to_backend (bool start)
                        change_channels = true;
                        change_latency = true;
                        change_midi = true;
+                       change_buffered_io = backend->can_use_buffered_io();
+                       change_channels = true;
+                       change_nperiods = backend->can_set_period_size() && get_popdown_string_count (nperiods_combo) > 0;
                }
 
        } else {
@@ -2301,16 +2425,17 @@ EngineControl::push_state_to_backend (bool start)
 
        /* determine if we need to stop the backend before changing parameters */
 
-       if (change_driver || change_device || change_channels ||
+       if (change_driver || change_device || change_channels || change_nperiods ||
                        (change_latency && !backend->can_change_systemic_latency_when_running ()) ||
                        (change_rate && !backend->can_change_sample_rate_when_running()) ||
-                       change_midi ||
+                       change_midi || change_buffered_io ||
                        (change_bufsize && !backend->can_change_buffer_size_when_running())) {
                restart_required = true;
        } else {
                restart_required = false;
        }
 
+
        if (was_running) {
                if (restart_required) {
                        if (ARDOUR::AudioEngine::instance()->stop()) {
@@ -2346,6 +2471,10 @@ EngineControl::push_state_to_backend (bool start)
                error << string_compose (_("Cannot set buffer size to %1"), get_buffer_size()) << endmsg;
                return -1;
        }
+       if (change_nperiods && backend->set_peridod_size (get_nperiods())) {
+               error << string_compose (_("Cannot set periods to %1"), get_nperiods()) << endmsg;
+               return -1;
+       }
 
        if (change_channels || get_input_channels() == 0 || get_output_channels() == 0) {
                if (backend->set_input_channels (get_input_channels())) {
@@ -2372,6 +2501,10 @@ EngineControl::push_state_to_backend (bool start)
                backend->set_midi_option (get_midi_option());
        }
 
+       if (change_buffered_io) {
+               backend->set_use_buffered_io (use_buffered_io_button.get_active());
+       }
+
        if (1 /* TODO */) {
                for (vector<MidiDeviceSettings>::const_iterator p = _midi_devices.begin(); p != _midi_devices.end(); ++p) {
                        if (_measure_midi) {
@@ -2473,12 +2606,25 @@ EngineControl::get_buffer_size () const
        return samples;
 }
 
+uint32_t
+EngineControl::get_nperiods () const
+{
+       string txt = nperiods_combo.get_active_text ();
+       return atoi (txt.c_str());
+}
+
 string
 EngineControl::get_midi_option () const
 {
        return midi_option_combo.get_active_text();
 }
 
+bool
+EngineControl::get_use_buffered_io () const
+{
+       return use_buffered_io_button.get_active();
+}
+
 uint32_t
 EngineControl::get_input_channels() const
 {
@@ -2571,7 +2717,16 @@ EngineControl::start_stop_button_clicked ()
        if (ARDOUR::AudioEngine::instance()->running()) {
                ARDOUR::AudioEngine::instance()->stop ();
        } else {
+               if (!ARDOUR_UI::instance()->session_loaded) {
+                       hide ();
+               }
                start_engine ();
+               if (!ARDOUR_UI::instance()->session_loaded) {
+                       ArdourDialog::on_response (RESPONSE_OK);
+                       if (Splash::instance()) {
+                               Splash::instance()->pop_front ();
+                       }
+               }
        }
 }
 
@@ -2589,6 +2744,20 @@ EngineControl::update_devices_button_clicked ()
        }
 }
 
+void
+EngineControl::use_buffered_io_button_clicked ()
+{
+       boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance()->current_backend();
+
+       if (!backend) {
+               return;
+       }
+
+       bool set_buffered_io = !use_buffered_io_button.get_active();
+       use_buffered_io_button.set_active (set_buffered_io);
+       backend->set_use_buffered_io (set_buffered_io);
+}
+
 void
 EngineControl::manage_control_app_sensitivity ()
 {
@@ -2611,6 +2780,10 @@ void
 EngineControl::set_desired_sample_rate (uint32_t sr)
 {
        _desired_sample_rate = sr;
+       if (ARDOUR::AudioEngine::instance ()->running ()
+                       && ARDOUR::AudioEngine::instance ()->sample_rate () != sr) {
+               stop_engine ();
+       }
        device_changed ();
 }
 
@@ -2618,12 +2791,8 @@ void
 EngineControl::on_switch_page (GtkNotebookPage*, guint page_num)
 {
        if (page_num == 0) {
-               cancel_button->set_sensitive (true);
                _measure_midi.reset();
                update_sensitivity ();
-       } else {
-               cancel_button->set_sensitive (false);
-               ok_button->set_sensitive (false);
        }
 
        if (page_num == midi_tab) {
@@ -2691,6 +2860,13 @@ EngineControl::check_audio_latency_measurement ()
                return true;
        }
 
+       if (mtdm->get_peak () > 0.707f) {
+               // get_peak() resets the peak-hold in the detector.
+               // this GUI callback is at 10Hz and so will be fine (test-signal is at higher freq)
+               lm_results.set_markup (string_compose (results_markup, _("Input signal is > -3dBFS. Lower the signal level (output gain, input gain) on the audio-interface.")));
+               return true;
+       }
+
        if (mtdm->err () > 0.3) {
                mtdm->invert ();
                mtdm->resolve ();
@@ -2906,6 +3082,10 @@ 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()));
 
+       if (backend->can_set_period_size ()) {
+               set_active_text_if_present (nperiods_combo, nperiods_as_string (backend->period_size()));
+       }
+
        connect_disconnect_button.set_label (string_compose (_("Disconnect from %1"), backend->name()));
        connect_disconnect_button.show();
 
@@ -2939,6 +3119,9 @@ EngineControl::engine_stopped ()
 void
 EngineControl::device_list_changed ()
 {
+       if (ignore_device_changes) {
+               return;
+       }
        PBD::Unwinder<uint32_t> protect_ignore_changes (ignore_changes, ignore_changes + 1); // ??
        list_devices ();
        midi_option_changed();
@@ -2950,7 +3133,16 @@ EngineControl::connect_disconnect_click()
        if (ARDOUR::AudioEngine::instance()->running()) {
                stop_engine ();
        } else {
+               if (!ARDOUR_UI::instance()->session_loaded) {
+                       hide ();
+               }
                start_engine ();
+               if (!ARDOUR_UI::instance()->session_loaded) {
+                       ArdourDialog::on_response (RESPONSE_OK);
+                       if (Splash::instance()) {
+                               Splash::instance()->pop_front ();
+                       }
+               }
        }
 }