minor code changes
[ardour.git] / gtk2_ardour / engine_dialog.cc
index 615e79e184402b39d53a86a2a871f5f327671c67..65fa7227a78eb3fe717ed98946ced7704cbdf441 100644 (file)
@@ -17,6 +17,7 @@
 
 */
 
+#include <exception>
 #include <vector>
 #include <cmath>
 #include <fstream>
 
 #include <boost/scoped_ptr.hpp>
 
-#include <glibmm.h>
 #include <gtkmm/messagedialog.h>
 
-#include "pbd/epa.h"
+#include "pbd/error.h"
 #include "pbd/xml++.h"
+#include "pbd/unwind.h"
 
-#ifdef __APPLE__
-#include <CoreAudio/CoreAudio.h>
-#include <CoreFoundation/CFString.h>
-#include <sys/param.h>
-#include <mach-o/dyld.h>
-#else
-#include <alsa/asoundlib.h>
-#endif
-
-#include <jack/jack.h>
-
+#include <gtkmm/alignment.h>
 #include <gtkmm/stock.h>
+#include <gtkmm/notebook.h>
 #include <gtkmm2ext/utils.h>
 
+#include "ardour/audio_backend.h"
+#include "ardour/audioengine.h"
+#include "ardour/mtdm.h"
+#include "ardour/rc_configuration.h"
+#include "ardour/types.h"
+
 #include "pbd/convert.h"
 #include "pbd/error.h"
-#include "pbd/pathscanner.h"
-
-#ifdef __APPLE
-#include <CFBundle.h>
-#endif
 
+#include "ardour_ui.h"
 #include "engine_dialog.h"
+#include "gui_thread.h"
 #include "i18n.h"
 
 using namespace std;
@@ -62,308 +57,305 @@ using namespace PBD;
 using namespace Glib;
 
 EngineControl::EngineControl ()
-       : periods_adjustment (2, 2, 16, 1, 2),
-         periods_spinner (periods_adjustment),
-         ports_adjustment (128, 8, 1024, 1, 16),
-         ports_spinner (ports_adjustment),
-         input_latency_adjustment (0, 0, 99999, 1),
-         input_latency (input_latency_adjustment),
-         output_latency_adjustment (0, 0, 99999, 1),
-         output_latency (output_latency_adjustment),
-         realtime_button (_("Realtime")),
-         no_memory_lock_button (_("Do not lock memory")),
-         unlock_memory_button (_("Unlock memory")),
-         soft_mode_button (_("No zombies")),
-         monitor_button (_("Provide monitor ports")),
-         force16bit_button (_("Force 16 bit")),
-         hw_monitor_button (_("H/W monitoring")),
-         hw_meter_button (_("H/W metering")),
-         verbose_output_button (_("Verbose output")),
-         start_button (_("Start")),
-         stop_button (_("Stop")),
-#ifdef __APPLE__
-         basic_packer (5, 2),
-         options_packer (4, 2),
-         device_packer (4, 2)
-#else
-         basic_packer (8, 2),
-         options_packer (14, 2),
-         device_packer (6, 2)
-#endif
+       : ArdourDialog (_("Audio/MIDI Setup"))
+       , basic_packer (9, 3)
+       , input_latency_adjustment (0, 0, 99999, 1)
+       , input_latency (input_latency_adjustment)
+       , output_latency_adjustment (0, 0, 99999, 1)
+       , output_latency (output_latency_adjustment)
+       , input_channels_adjustment (0, 0, 256, 1)
+       , input_channels (input_channels_adjustment)
+       , output_channels_adjustment (0, 0, 256, 1)
+       , output_channels (output_channels_adjustment)
+       , ports_adjustment (128, 8, 1024, 1, 16)
+       , ports_spinner (ports_adjustment)
+       , control_app_button (_("Device Control Panel"))
+       , lm_start_stop_label (_("Measure latency"))
+       , lm_use_button (_("Use results"))
+       , lm_table (5, 2)
+       , have_lm_results (false)
+       , midi_refresh_button (_("Refresh list"))
+       , aj_button (_("Start MIDI ALSA/JACK bridge"))
+       , ignore_changes (0)
+       , _desired_sample_rate (0)
+{
+       if (!ARDOUR::AudioEngine::instance()->setup_required()) {
+               _have_control = false;
+       } else {
+               _have_control = true;
+       }
+
+       set_name (X_("AudioMIDISetup"));
+
+       build_notebook ();
+
+       get_vbox()->set_border_width (12);
+       get_vbox()->pack_start (notebook);
+
+       control_app_button.signal_clicked().connect (mem_fun (*this, &EngineControl::control_app_button_clicked));
+       manage_control_app_sensitivity ();
+
+       cancel_button = add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
+       ok_button = add_button (Gtk::Stock::OK, Gtk::RESPONSE_OK);
+       apply_button = add_button (Gtk::Stock::APPLY, Gtk::RESPONSE_APPLY);
+
+       /* Pick up any existing audio setup configuration, if appropriate */
+
+       XMLNode* audio_setup = ARDOUR::Config->extra_xml ("AudioMIDISetup");
+       
+       /* push a change as if we altered the backend */
+       backend_changed ();
+
+       if (audio_setup) {
+               set_state (*audio_setup);
+       } 
+}
+
+void
+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:
+               push_state_to_backend (true);
+               hide ();
+               break;
+       case RESPONSE_DELETE_EVENT: {
+               GdkEventButton ev;
+               ev.type = GDK_BUTTON_PRESS;
+               ev.button = 1;
+               on_delete_event ((GdkEventAny*) &ev);
+               break;
+       }
+       default:
+               hide ();
+       }
+}
+
+void
+EngineControl::build_notebook ()
 {
        using namespace Notebook_Helpers;
        Label* label;
        vector<string> strings;
        int row = 0;
 
-       _used = false;
-
-       strings.push_back (_("8000Hz"));
-       strings.push_back (_("22050Hz"));
-       strings.push_back (_("44100Hz"));
-       strings.push_back (_("48000Hz"));
-       strings.push_back (_("88200Hz"));
-       strings.push_back (_("96000Hz"));
-       strings.push_back (_("192000Hz"));
-       set_popdown_strings (sample_rate_combo, strings);
-       sample_rate_combo.set_active_text ("48000Hz");
-
-       strings.clear ();
-       strings.push_back ("32");
-       strings.push_back ("64");
-       strings.push_back ("128");
-       strings.push_back ("256");
-       strings.push_back ("512");
-       strings.push_back ("1024");
-       strings.push_back ("2048");
-       strings.push_back ("4096");
-       strings.push_back ("8192");
-       set_popdown_strings (period_size_combo, strings);
-       period_size_combo.set_active_text ("1024");
-
-       strings.clear ();
-       strings.push_back (_("None"));
-       strings.push_back (_("Triangular"));
-       strings.push_back (_("Rectangular"));
-       strings.push_back (_("Shaped"));
-       set_popdown_strings (dither_mode_combo, strings);
-       dither_mode_combo.set_active_text (_("None"));
-
-       /* basic parameters */
+       vector<const ARDOUR::AudioBackendInfo*> backends = ARDOUR::AudioEngine::instance()->available_backends();
+       for (vector<const ARDOUR::AudioBackendInfo*>::const_iterator b = backends.begin(); b != backends.end(); ++b) {
+               strings.push_back ((*b)->name);
+       }
+
+       set_popdown_strings (backend_combo, strings);
+       backend_combo.set_active_text (strings.front());
 
        basic_packer.set_spacings (6);
+       basic_packer.set_border_width (12);
+       basic_packer.set_homogeneous (true);
 
-       strings.clear ();
-#ifdef __APPLE__
-       strings.push_back (X_("CoreAudio"));
-#else
-       strings.push_back (X_("ALSA"));
-       strings.push_back (X_("OSS"));
-       strings.push_back (X_("FreeBoB"));
-       strings.push_back (X_("FFADO"));
-#endif
-       strings.push_back (X_("NetJACK"));
-       strings.push_back (X_("Dummy"));
-       set_popdown_strings (driver_combo, strings);
-       driver_combo.set_active_text (strings.front());
+       row = 0;
 
-       driver_combo.signal_changed().connect (sigc::mem_fun (*this, &EngineControl::driver_changed));
-       driver_changed ();
-
-       strings.clear ();
-       strings.push_back (_("Playback/recording on 1 device"));
-       strings.push_back (_("Playback/recording on 2 devices"));
-       strings.push_back (_("Playback only"));
-       strings.push_back (_("Recording only"));
-       set_popdown_strings (audio_mode_combo, strings);
-       audio_mode_combo.set_active_text (strings.front());
-
-       audio_mode_combo.signal_changed().connect (sigc::mem_fun (*this, &EngineControl::audio_mode_changed));
-       audio_mode_changed ();
-
-       strings.clear ();
-       strings.push_back (_("None"));
-       strings.push_back (_("seq"));
-       strings.push_back (_("raw"));
-       set_popdown_strings (midi_driver_combo, strings);
-       midi_driver_combo.set_active_text (strings.front ());
+       AttachOptions xopt = AttachOptions (FILL|EXPAND);
 
-       row = 0;
+       label = manage (left_aligned_label (_("Audio System:")));
+       basic_packer.attach (*label, 0, 1, row, row + 1, xopt, (AttachOptions) 0);
+       basic_packer.attach (backend_combo, 1, 2, row, row + 1, xopt, (AttachOptions) 0);
+       row++;
 
        label = manage (left_aligned_label (_("Driver:")));
-       basic_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
-       basic_packer.attach (driver_combo, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
+       basic_packer.attach (*label, 0, 1, row, row + 1, xopt, (AttachOptions) 0);
+       basic_packer.attach (driver_combo, 1, 2, row, row + 1, xopt, (AttachOptions) 0);
        row++;
 
-       label = manage (left_aligned_label (_("Audio Interface:")));
-       basic_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
-       basic_packer.attach (interface_combo, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
+       label = manage (left_aligned_label (_("Device:")));
+       basic_packer.attach (*label, 0, 1, row, row + 1, xopt, (AttachOptions) 0);
+       basic_packer.attach (device_combo, 1, 2, row, row + 1, xopt, (AttachOptions) 0);
        row++;
 
        label = manage (left_aligned_label (_("Sample rate:")));
-       basic_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
-       basic_packer.attach (sample_rate_combo, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
+       basic_packer.attach (*label, 0, 1, row, row + 1, xopt, (AttachOptions) 0);
+       basic_packer.attach (sample_rate_combo, 1, 2, row, row + 1, xopt, (AttachOptions) 0);
        row++;
 
+
        label = manage (left_aligned_label (_("Buffer size:")));
-       basic_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
-       basic_packer.attach (period_size_combo, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
+       basic_packer.attach (*label, 0, 1, row, row + 1, xopt, (AttachOptions) 0);
+       basic_packer.attach (buffer_size_combo, 1, 2, row, row + 1, xopt, (AttachOptions) 0);
+       buffer_size_duration_label.set_alignment (0.0); /* left-align */
+       basic_packer.attach (buffer_size_duration_label, 2, 3, row, row+1, xopt, (AttachOptions) 0);
        row++;
 
-#ifndef __APPLE__
-       label = manage (left_aligned_label (_("Number of buffers:")));
-       basic_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
-       basic_packer.attach (periods_spinner, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
-       periods_spinner.set_value (2);
-       row++;
-#endif
+       input_channels.set_name ("InputChannels");
+       input_channels.set_flags(Gtk::CAN_FOCUS);
+       input_channels.set_digits(0);
+       input_channels.set_wrap(false);
+       output_channels.set_editable (true);
 
-       label = manage (left_aligned_label (_("Approximate latency:")));
-       basic_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
-       basic_packer.attach (latency_label, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
-       row++;
+       label = manage (left_aligned_label (_("Input Channels:")));
+       basic_packer.attach (*label, 0, 1, row, row+1, xopt, (AttachOptions) 0);
+       basic_packer.attach (input_channels, 1, 2, row, row+1, xopt, (AttachOptions) 0);
+       ++row;
 
-       sample_rate_combo.signal_changed().connect (sigc::mem_fun (*this, &EngineControl::redisplay_latency));
-       periods_adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &EngineControl::redisplay_latency));
-       period_size_combo.signal_changed().connect (sigc::mem_fun (*this, &EngineControl::redisplay_latency));
-       redisplay_latency();
-       row++;
-       /* no audio mode with CoreAudio, its duplex or nuthin' */
+       output_channels.set_name ("OutputChannels");
+       output_channels.set_flags(Gtk::CAN_FOCUS);
+       output_channels.set_digits(0);
+       output_channels.set_wrap(false);
+       output_channels.set_editable (true);
 
-#ifndef __APPLE__
-       label = manage (left_aligned_label (_("Audio mode:")));
-       basic_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
-       basic_packer.attach (audio_mode_combo, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
-       row++;
-#endif
+       label = manage (left_aligned_label (_("Output Channels:")));
+       basic_packer.attach (*label, 0, 1, row, row+1, xopt, (AttachOptions) 0);
+       basic_packer.attach (output_channels, 1, 2, row, row+1, xopt, (AttachOptions) 0);
+       ++row;
 
-       interface_combo.set_size_request (250, -1);
-       input_device_combo.set_size_request (250, -1);
-       output_device_combo.set_size_request (250, -1);
+       input_latency.set_name ("InputLatency");
+       input_latency.set_flags(Gtk::CAN_FOCUS);
+       input_latency.set_digits(0);
+       input_latency.set_wrap(false);
+       input_latency.set_editable (true);
 
-       /*
+       label = manage (left_aligned_label (_("Hardware input latency:")));
+       basic_packer.attach (*label, 0, 1, row, row+1, xopt, (AttachOptions) 0);
+       basic_packer.attach (input_latency, 1, 2, row, row+1, xopt, (AttachOptions) 0);
+       label = manage (left_aligned_label (_("samples")));
+       basic_packer.attach (*label, 2, 3, row, row+1, xopt, (AttachOptions) 0);
+       ++row;
 
-       if (engine_running()) {
-               start_button.set_sensitive (false);
-       } else {
-               stop_button.set_sensitive (false);
-       }
+       output_latency.set_name ("OutputLatency");
+       output_latency.set_flags(Gtk::CAN_FOCUS);
+       output_latency.set_digits(0);
+       output_latency.set_wrap(false);
+       output_latency.set_editable (true);
 
-       start_button.signal_clicked().connect (sigc::mem_fun (*this, &EngineControl::start_engine));
-       stop_button.signal_clicked().connect (sigc::mem_fun (*this, &EngineControl::start_engine));
-       */
+       label = manage (left_aligned_label (_("Hardware output latency:")));
+       basic_packer.attach (*label, 0, 1, row, row+1, xopt, (AttachOptions) 0);
+       basic_packer.attach (output_latency, 1, 2, row, row+1, xopt, (AttachOptions) 0);
+       label = manage (left_aligned_label (_("samples")));
+       basic_packer.attach (*label, 2, 3, row, row+1, xopt, (AttachOptions) 0);
+       ++row;
 
-       button_box.pack_start (start_button, false, false);
-       button_box.pack_start (stop_button, false, false);
+       basic_hbox.pack_start (basic_packer, false, false);
+       basic_vbox.pack_start (basic_hbox, false, false);
+
+       Gtk::HBox* hpacker = manage (new HBox);
+       hpacker->set_border_width (12);
+       hpacker->pack_start (control_app_button, false, false);
+       hpacker->show ();
+       control_app_button.show();
+       basic_vbox.pack_start (*hpacker);
+
+       /* latency measurement tab */
+       
+       lm_title.set_markup (string_compose ("<span size=\"large\" weight=\"bold\">%1</span>", _("Latency Measurement Tool")));
+       
+       row = 0;
+       lm_table.set_row_spacings (12);
 
-       // basic_packer.attach (button_box, 0, 2, 8, 9, FILL|EXPAND, (AttachOptions) 0);
+       lm_table.attach (lm_title, 0, 2, row, row+1, xopt, (AttachOptions) 0);
+       row++;
 
-       /* options */
+       Gtk::Label* preamble;
 
-       options_packer.set_spacings (6);
-       row = 0;
+       preamble = manage (new Label);
+       preamble->set_width_chars (60);
+       preamble->set_line_wrap (true);
+       preamble->set_markup (_("<span weight=\"bold\">Turn down the volume on your hardware to a very low level.</span>"));
 
-       options_packer.attach (realtime_button, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
-       ++row;
+       lm_table.attach (*preamble, 0, 2, row, row+1, AttachOptions(FILL|EXPAND), (AttachOptions) 0);
+       row++;
 
-       realtime_button.set_active (true);
+       preamble = manage (new Label);
+       preamble->set_width_chars (60);
+       preamble->set_line_wrap (true);
+       preamble->set_markup (_("Select two channels below and connect them using a cable or (less ideally) a speaker and microphone."));
 
-#if PROVIDE_TOO_MANY_OPTIONS
+       lm_table.attach (*preamble, 0, 2, row, row+1, AttachOptions(FILL|EXPAND), (AttachOptions) 0);
+       row++;
 
-#ifndef __APPLE__
-       options_packer.attach (no_memory_lock_button, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
-       ++row;
-       options_packer.attach (unlock_memory_button, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
-       ++row;
-       options_packer.attach (soft_mode_button, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
-       ++row;
-       options_packer.attach (monitor_button, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
-       ++row;
-       options_packer.attach (force16bit_button, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
-       ++row;
-       options_packer.attach (hw_monitor_button, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
-       ++row;
-       options_packer.attach (hw_meter_button, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
+       label = manage (new Label (_("Output channel")));
+       lm_table.attach (*label, 0, 1, row, row+1, xopt, (AttachOptions) 0);
+
+       Gtk::Alignment* misc_align = manage (new Alignment (0.0, 0.5));
+       misc_align->add (lm_output_channel_combo);
+       lm_table.attach (*misc_align, 1, 2, row, row+1, xopt, (AttachOptions) 0);
        ++row;
-       options_packer.attach (verbose_output_button, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
+
+       label = manage (new Label (_("Input channel")));
+       lm_table.attach (*label, 0, 1, row, row+1, xopt, (AttachOptions) 0);
+
+       misc_align = manage (new Alignment (0.0, 0.5));
+       misc_align->add (lm_input_channel_combo);
+       lm_table.attach (*misc_align, 1, 2, row, row+1, FILL, (AttachOptions) 0);
        ++row;
-#else
-       options_packer.attach (verbose_output_button, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
+
+       xopt = AttachOptions(0);
+
+       lm_measure_button.add (lm_start_stop_label);
+       
+       lm_measure_button.signal_toggled().connect (sigc::mem_fun (*this, &EngineControl::latency_button_toggled));
+       lm_use_button.signal_clicked().connect (sigc::mem_fun (*this, &EngineControl::use_latency_button_clicked));
+       lm_use_button.set_sensitive (false);
+               
+
+       preamble = manage (new Label);
+       preamble->set_width_chars (60);
+       preamble->set_line_wrap (true);
+       preamble->set_markup (_("Once the channels are connected, click the \"Measure latency\" button."));
+       lm_table.attach (*preamble, 0, 2, row, row+1, AttachOptions(FILL|EXPAND), (AttachOptions) 0);
+       row++;
+
+       lm_table.attach (lm_measure_button, 0, 2, row, row+1, xopt, (AttachOptions) 0);
        ++row;
-#endif
-
-       strings.clear ();
-       strings.push_back (_("Ignore"));
-       strings.push_back ("500 msec");
-       strings.push_back ("1 sec");
-       strings.push_back ("2 sec");
-       strings.push_back ("10 sec");
-       set_popdown_strings (timeout_combo, strings);
-       timeout_combo.set_active_text (strings.front ());
-
-       label = manage (new Label (_("Client timeout")));
-       label->set_alignment (1.0, 0.5);
-       options_packer.attach (timeout_combo, 1, 2, row, row + 1, FILL|EXPAND, AttachOptions(0));
-       options_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
+       lm_table.attach (lm_results, 0, 2, row, row+1, AttachOptions(FILL|EXPAND), (AttachOptions) 0);
        ++row;
 
-#endif /* PROVIDE_TOO_MANY_OPTIONS */
-       label = manage (left_aligned_label (_("Number of ports:")));
-       options_packer.attach (ports_spinner, 1, 2, row, row + 1, FILL|EXPAND, AttachOptions(0));
-       options_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
-       ++row;
 
-       label = manage (left_aligned_label (_("MIDI driver:")));
-       options_packer.attach (midi_driver_combo, 1, 2, row, row + 1, FILL|EXPAND, AttachOptions(0));
-       options_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
-       ++row;
+       preamble = manage (new Label);
+       preamble->set_width_chars (60);
+       preamble->set_line_wrap (true);
+       preamble->set_markup (_("When satisfied with the results, click the \"Use results\" button."));
+       lm_table.attach (*preamble, 0, 2, row, row+1, AttachOptions(FILL|EXPAND), (AttachOptions) 0);
+       row++;
 
-#ifndef __APPLE__
-       label = manage (left_aligned_label (_("Dither:")));
-       options_packer.attach (dither_mode_combo, 1, 2, row, row + 1, FILL|EXPAND, AttachOptions(0));
-       options_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
+       lm_table.attach (lm_use_button, 0, 2, row, row+1, xopt, (AttachOptions) 0);
        ++row;
-#endif
 
-       find_jack_servers (server_strings);
+       lm_results.set_markup ("<i>No measurement results yet</i>");
 
-       if (server_strings.empty()) {
-               fatal << _("No JACK server found anywhere on this system. Please install JACK and restart") << endmsg;
-               /*NOTREACHED*/
-       }
+       lm_vbox.set_border_width (12);
+       lm_vbox.pack_start (lm_table, false, false);
 
-       set_popdown_strings (serverpath_combo, server_strings);
-       serverpath_combo.set_active_text (server_strings.front());
+       /* pack it all up */
 
-       if (server_strings.size() > 1) {
-               label = manage (left_aligned_label (_("Server:")));
-               options_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
-               options_packer.attach (serverpath_combo, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
-               ++row;
-       }
+       notebook.pages().push_back (TabElem (basic_vbox, _("Audio")));
+       notebook.pages().push_back (TabElem (midi_vbox, _("MIDI")));
+       notebook.pages().push_back (TabElem (lm_vbox, _("Latency")));
+       notebook.set_border_width (12);
 
-       /* device settings */
+       notebook.set_tab_pos (POS_RIGHT);
+       notebook.show_all ();
 
-       device_packer.set_spacings (6);
-       row = 0;
+       notebook.set_name ("SettingsNotebook");
 
-#ifndef __APPLE__
-       label = manage (left_aligned_label (_("Input device:")));
-       device_packer.attach (*label, 0, 1, row, row+1, FILL|EXPAND, (AttachOptions) 0);
-       device_packer.attach (input_device_combo, 1, 2, row, row+1, FILL|EXPAND, (AttachOptions) 0);
-       ++row;
-       label = manage (left_aligned_label (_("Output device:")));
-       device_packer.attach (*label, 0, 1, row, row+1, FILL|EXPAND, (AttachOptions) 0);
-       device_packer.attach (output_device_combo, 1, 2, row, row+1, FILL|EXPAND, (AttachOptions) 0);
-       ++row;
-#endif
-       label = manage (left_aligned_label (_("Hardware input latency:")));
-       device_packer.attach (*label, 0, 1, row, row+1, FILL|EXPAND, (AttachOptions) 0);
-       device_packer.attach (input_latency, 1, 2, row, row+1, FILL|EXPAND, (AttachOptions) 0);
-       label = manage (left_aligned_label (_("samples")));
-       device_packer.attach (*label, 2, 3, row, row+1, FILL|EXPAND, (AttachOptions) 0);
-       ++row;
-       label = manage (left_aligned_label (_("Hardware output latency:")));
-       device_packer.attach (*label, 0, 1, row, row+1, FILL|EXPAND, (AttachOptions) 0);
-       device_packer.attach (output_latency, 1, 2, row, row+1, FILL|EXPAND, (AttachOptions) 0);
-       label = manage (left_aligned_label (_("samples")));
-       device_packer.attach (*label, 2, 3, row, row+1, FILL|EXPAND, (AttachOptions) 0);
-       ++row;
+       /* Connect to signals */
 
-       basic_hbox.pack_start (basic_packer, false, false);
-       options_hbox.pack_start (options_packer, false, false);
+       backend_combo.signal_changed().connect (sigc::mem_fun (*this, &EngineControl::backend_changed));
+       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));
 
-       device_packer.set_border_width (12);
-       options_packer.set_border_width (12);
-       basic_packer.set_border_width (12);
+       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));
 
-       notebook.pages().push_back (TabElem (basic_hbox, _("Device")));
-       notebook.pages().push_back (TabElem (options_hbox, _("Options")));
-       notebook.pages().push_back (TabElem (device_packer, _("Advanced")));
-       notebook.set_border_width (12);
+       input_channels.signal_output().connect (sigc::bind (sigc::ptr_fun (&EngineControl::print_channel_count), &input_channels));
+       output_channels.signal_output().connect (sigc::bind (sigc::ptr_fun (&EngineControl::print_channel_count), &output_channels));
 
-       set_border_width (12);
-       pack_start (notebook);
+       notebook.signal_switch_page().connect (sigc::mem_fun (*this, &EngineControl::on_switch_page));
 }
 
 EngineControl::~EngineControl ()
@@ -372,956 +364,1121 @@ EngineControl::~EngineControl ()
 }
 
 void
-EngineControl::build_command_line (vector<string>& cmd)
+EngineControl::disable_latency_tab ()
 {
-       string str;
-       string driver;
-       bool using_alsa = false;
-       bool using_coreaudio = false;
-       bool using_dummy = false;
-       bool using_ffado = false;
-
-       /* first, path to jackd */
-
-       cmd.push_back (serverpath_combo.get_active_text ());
-
-       /* now jackd arguments */
+       vector<string> empty;
+       set_popdown_strings (lm_output_channel_combo, empty);
+       set_popdown_strings (lm_input_channel_combo, empty);
+       lm_measure_button.set_sensitive (false);
+       lm_use_button.set_sensitive (false);
+}
 
-       str = timeout_combo.get_active_text ();
+void
+EngineControl::enable_latency_tab ()
+{
+       vector<string> outputs;
+       ARDOUR::AudioEngine::instance()->get_physical_outputs (ARDOUR::DataType::AUDIO, outputs);
+       set_popdown_strings (lm_output_channel_combo, outputs);
+       lm_output_channel_combo.set_active_text (outputs.front());
 
-       if (str != _("Ignore")) {
+       vector<string> inputs;
+       ARDOUR::AudioEngine::instance()->get_physical_inputs (ARDOUR::DataType::AUDIO, inputs);
+       set_popdown_strings (lm_input_channel_combo, inputs);
+       lm_input_channel_combo.set_active_text (inputs.front());
 
-               double secs = 0;
-               uint32_t msecs;
-               secs = atof (str);
-               msecs = (uint32_t) floor (secs * 1000.0);
+       lm_measure_button.set_sensitive (true);
+}
 
-               if (msecs > 0) {
-                       cmd.push_back ("-t");
-                       cmd.push_back (to_string (msecs, std::dec));
-               }
-       }
+void
+EngineControl::setup_midi_tab_for_backend ()
+{
+       string backend = backend_combo.get_active_text ();
 
-       if (no_memory_lock_button.get_active()) {
-               cmd.push_back ("-m"); /* no munlock */
-       }
+       Gtkmm2ext::container_clear (midi_vbox);
 
-       cmd.push_back ("-p"); /* port max */
-       cmd.push_back (to_string ((uint32_t) floor (ports_spinner.get_value()), std::dec));
+       midi_vbox.set_border_width (12);
+       midi_device_table.set_border_width (12);
 
-       if (realtime_button.get_active()) {
-               cmd.push_back ("-R");
-       } else {
-               cmd.push_back ("-r"); /* override jackd's default --realtime */
+       if (backend == "JACK") {
+               setup_midi_tab_for_jack ();
        }
 
-       if (unlock_memory_button.get_active()) {
-               cmd.push_back ("-u");
-       }
+       midi_vbox.pack_start (midi_device_table, true, true);
+       midi_vbox.pack_start (midi_refresh_button, false, false);
+       midi_vbox.show_all ();
 
-       if (verbose_output_button.get_active()) {
-               cmd.push_back ("-v");
-       }
+       midi_refresh_button.signal_clicked().connect (sigc::mem_fun (*this, &EngineControl::refresh_midi_display));
+}
 
-       /* now add fixed arguments (not user-selectable) */
-
-       cmd.push_back ("-T"); // temporary */
-
-       /* next the driver */
-
-       cmd.push_back ("-d");
-
-       driver = driver_combo.get_active_text ();
-
-       if (driver == X_("ALSA")) {
-               using_alsa = true;
-               cmd.push_back ("alsa");
-       } else if (driver == X_("OSS")) {
-               cmd.push_back ("oss");
-       } else if (driver == X_("CoreAudio")) {
-               using_coreaudio = true;
-               cmd.push_back ("coreaudio");
-       } else if (driver == X_("NetJACK")) {
-               cmd.push_back ("netjack");
-       } else if (driver == X_("FreeBoB")) {
-               cmd.push_back ("freebob");
-       } else if (driver == X_("FFADO")) {
-               using_ffado = true;
-               cmd.push_back ("firewire");
-       } else if ( driver == X_("Dummy")) {
-               using_dummy = true;
-               cmd.push_back ("dummy");
-       }
+void
+EngineControl::setup_midi_tab_for_jack ()
+{
+       midi_vbox.pack_start (aj_button, false, false);
+}      
 
-       /* driver arguments */
+void
+EngineControl::refresh_midi_display ()
+{
+       boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance()->current_backend();
+       assert (backend);
 
-       if (!using_coreaudio) {
-               str = audio_mode_combo.get_active_text();
+       vector<string> midi_inputs;
+       vector<string> midi_outputs;
+       int row  = 0;
+       AttachOptions xopt = AttachOptions (FILL|EXPAND);
+       Gtk::Label* l;
 
-               if (str == _("Playback/Recording on 1 Device")) {
+       Gtkmm2ext::container_clear (midi_device_table);
 
-                       /* relax */
+       backend->get_physical_inputs (ARDOUR::DataType::MIDI, midi_inputs);
+       backend->get_physical_outputs (ARDOUR::DataType::MIDI, midi_outputs);
 
-               } else if (str == _("Playback/Recording on 2 Devices")) {
+       midi_device_table.set_spacings (6);
+       midi_device_table.set_homogeneous (true);
+       midi_device_table.resize (midi_inputs.size() + midi_outputs.size() + 3, 1);
 
-                       string input_device = get_device_name (driver, input_device_combo.get_active_text());
-                       string output_device = get_device_name (driver, output_device_combo.get_active_text());
+       l = manage (new Label);
+       l->set_markup (string_compose ("<span size=\"large\" weight=\"bold\">%1</span>", _("MIDI Inputs")));
+       midi_device_table.attach (*l, 0, 1, row, row + 1, xopt, AttachOptions (0));
+       l->set_alignment (0, 0.5);
+       row++;
+       l->show ();
+       
+       for (vector<string>::iterator p = midi_inputs.begin(); p != midi_inputs.end(); ++p) {
+               l = manage (new Label ((*p).substr ((*p).find_last_of (':') + 1)));
+               l->set_alignment (0, 0.5);
+               midi_device_table.attach (*l, 0, 1, row, row + 1, xopt, AttachOptions (0));
+               l->show ();
+               row++;
+       }
 
-                       if (input_device.empty() || output_device.empty()) {
-                               cmd.clear ();
-                               return;
-                       }
+       row++; // extra row of spacing
 
-                       cmd.push_back ("-C");
-                       cmd.push_back (input_device);
+       l = manage (new Label);
+       l->set_markup (string_compose ("<span size=\"large\" weight=\"bold\">%1</span>", _("MIDI Outputs")));
+       midi_device_table.attach (*l, 0, 1, row, row + 1, xopt, AttachOptions (0));
+       l->set_alignment (0, 0.5);
+       row++;
+       l->show ();
+
+       for (vector<string>::iterator p = midi_outputs.begin(); p != midi_outputs.end(); ++p) {
+               l = manage (new Label ((*p).substr ((*p).find_last_of (':') + 1)));
+               l->set_alignment (0, 0.5);
+               midi_device_table.attach (*l, 0, 1, row, row + 1, xopt, AttachOptions (0));
+               l->show ();
+               row++;
+       }
+}
 
-                       cmd.push_back ("-P");
-                       cmd.push_back (output_device);
+void
+EngineControl::backend_changed ()
+{
+       if (ignore_changes) {
+               return;
+       }
 
-               } else if (str == _("Playback only")) {
-                       cmd.push_back ("-P");
-               } else if (str == _("Recording only")) {
-                       cmd.push_back ("-C");
-               }
+       string backend_name = backend_combo.get_active_text();
+       boost::shared_ptr<ARDOUR::AudioBackend> backend;
 
-               if (!using_dummy) {
-                       cmd.push_back ("-n");
-                       cmd.push_back (to_string ((uint32_t) floor (periods_spinner.get_value()), std::dec));
-               }
+       if (!(backend = ARDOUR::AudioEngine::instance()->set_backend (backend_name, "ardour", ""))) {
+               /* eh? setting the backend failed... how ? */
+               return;
        }
 
-       cmd.push_back ("-r");
-       cmd.push_back (to_string (get_rate(), std::dec));
+       setup_midi_tab_for_backend ();
 
-       cmd.push_back ("-p");
-       cmd.push_back (period_size_combo.get_active_text());
+       if (backend->requires_driver_selection()) {
+               vector<string> drivers = backend->enumerate_drivers();
+               driver_combo.set_sensitive (true);
+               set_popdown_strings (driver_combo, drivers);
+               driver_combo.set_active_text (drivers.front());
+               driver_changed ();
+       } else {
+               driver_combo.set_sensitive (false);
+               list_devices ();
+       }
+       
+       maybe_display_saved_state ();
+}
 
-       if (using_alsa || using_ffado || using_coreaudio) {
+bool
+EngineControl::print_channel_count (Gtk::SpinButton* sb)
+{
+       uint32_t cnt = (uint32_t) sb->get_value();
+       if (cnt == 0) {
+               sb->set_text (_("all available channels"));
+       } else {
+               char buf[32];
+               snprintf (buf, sizeof (buf), "%d", cnt);
+               sb->set_text (buf);
+       }
+       return true;
+}
 
-               double val = input_latency_adjustment.get_value();
+void
+EngineControl::list_devices ()
+{
+       boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance()->current_backend();
+       assert (backend);
+
+       /* now fill out devices, mark sample rates, buffer sizes insensitive */
+           
+       vector<ARDOUR::AudioBackend::DeviceStatus> all_devices = backend->enumerate_devices ();
+       
+       /* NOTE: Ardour currently does not display the "available" field of the
+        * returned devices.
+        *
+        * Doing so would require a different GUI widget than the combo
+        * box/popdown that we currently use, since it has no way to list
+        * items that are not selectable. Something more like a popup menu,
+        * which could have unselectable items, would be appropriate.
+        */
 
-                if (val) {
-                        cmd.push_back ("-I");
-                        cmd.push_back (to_string ((uint32_t) val, std::dec));
-                }
+       vector<string> available_devices;
 
-                val = output_latency_adjustment.get_value();
+       for (vector<ARDOUR::AudioBackend::DeviceStatus>::const_iterator i = all_devices.begin(); i != all_devices.end(); ++i) {
+               available_devices.push_back (i->name);
+       }
 
-               if (val) {
-                        cmd.push_back ("-O");
-                        cmd.push_back (to_string ((uint32_t) val, std::dec));
-                }
+       ignore_changes++;
+       set_popdown_strings (device_combo, available_devices);
+       ignore_changes--;
+
+       if (!available_devices.empty()) {
+               sample_rate_combo.set_sensitive (true);
+               buffer_size_combo.set_sensitive (true);
+               input_latency.set_sensitive (true);
+               output_latency.set_sensitive (true);
+               input_channels.set_sensitive (true);
+               output_channels.set_sensitive (true);
+                                               
+               /* changing the text in the combo will trigger device_changed()
+                  which should populate the parameter controls
+               */
+               
+               device_combo.set_active_text (available_devices.front());
+       } else {
+               sample_rate_combo.set_sensitive (true);
+               buffer_size_combo.set_sensitive (true);
+               input_latency.set_sensitive (true);
+               output_latency.set_sensitive (true);
+               input_channels.set_sensitive (true);
+               output_channels.set_sensitive (true);
+       }
+}
+       
+void
+EngineControl::driver_changed ()
+{
+       if (ignore_changes) {
+               return;
        }
 
-       if (using_alsa) {
+       boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance()->current_backend();
+       assert (backend);
 
-               if (audio_mode_combo.get_active_text() != _("Playback/Recording on 2 Devices")) {
+       backend->set_driver (driver_combo.get_active_text());
+       list_devices ();
 
-                       string device = get_device_name (driver, interface_combo.get_active_text());
-                       if (device.empty()) {
-                               cmd.clear ();
-                               return;
-                       }
+       maybe_display_saved_state ();
+}
 
-                       cmd.push_back ("-d");
-                       cmd.push_back (device);
-               }
+void
+EngineControl::device_changed ()
+{
+       if (ignore_changes) {
+               return;
+       }
 
-               if (hw_meter_button.get_active()) {
-                       cmd.push_back ("-M");
-               }
+       boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance()->current_backend();
+       assert (backend);
+       string device_name = device_combo.get_active_text ();
+       vector<string> s;
 
-               if (hw_monitor_button.get_active()) {
-                       cmd.push_back ("-H");
+       /* don't allow programmatic change to sample_rate_combo to cause a
+          recursive call to this method.
+       */
+          
+       ignore_changes++;
+
+       /* sample rates */
+       
+       string desired;
+
+       vector<float> sr = backend->available_sample_rates (device_name);
+       for (vector<float>::const_iterator x = sr.begin(); x != sr.end(); ++x) {
+               s.push_back (rate_as_string (*x));
+               if (*x == _desired_sample_rate) {
+                       desired = s.back();
                }
+       }
 
-               str = dither_mode_combo.get_active_text();
-
-               if (str == _("None")) {
-               } else if (str == _("Triangular")) {
-                       cmd.push_back ("-z triangular");
-               } else if (str == _("Rectangular")) {
-                       cmd.push_back ("-z rectangular");
-               } else if (str == _("Shaped")) {
-                       cmd.push_back ("-z shaped");
+       if (!s.empty()) {
+               set_popdown_strings (sample_rate_combo, s);
+       
+               if (desired.empty()) {
+                       sample_rate_combo.set_active_text (s.front());
+               } else {
+                       sample_rate_combo.set_active_text (desired);
                }
+       } else {
+               /* hmm ... how to tell the user about the fact that we have no
+                * available sample rates.
+                */
+       }
+                
 
-               if (force16bit_button.get_active()) {
-                       cmd.push_back ("-S");
-               }
+       vector<uint32_t> bs = backend->available_buffer_sizes(device_name);
+       s.clear ();
+       for (vector<uint32_t>::const_iterator x = bs.begin(); x != bs.end(); ++x) {
+               s.push_back (bufsize_as_string (*x));
+       }
 
-               if (soft_mode_button.get_active()) {
-                       cmd.push_back ("-s");
-               }
+       if (!s.empty()) {
+               set_popdown_strings (buffer_size_combo, s);
+               buffer_size_combo.set_active_text (s.front());
+               show_buffer_duration ();
+       } else {
+               /* hmm ... how to tell the user about the fact that we have no
+                * available buffer sizes.
+                */
+       }
 
-               str = midi_driver_combo.get_active_text ();
+       manage_control_app_sensitivity ();
 
-               if (str == _("seq")) {
-                       cmd.push_back ("-X seq");
-               } else if (str == _("raw")) {
-                       cmd.push_back ("-X raw");
-               }
-       } else if (using_coreaudio) {
+       ignore_changes--;
 
-#ifdef __APPLE__
-               // note: older versions of the CoreAudio JACK backend use -n instead of -d here
+       /* pick up any saved state for this device */
 
-               string device = get_device_name (driver, interface_combo.get_active_text());
-               if (device.empty()) {
-                       cmd.clear ();
-                       return;
-               }
+       maybe_display_saved_state ();
+
+       /* and push it to the backend */
 
-               cmd.push_back ("-d");
-               cmd.push_back (device);
-#endif
+       push_state_to_backend (false);
+}      
 
+string
+EngineControl::rate_as_string (float r)
+{
+       char buf[32];
+       if (fmod (r, 1000.0f)) {
+               snprintf (buf, sizeof (buf), "%.1f kHz", r/1000.0);
+       } else {
+               snprintf (buf, sizeof (buf), "%.0f kHz", r/1000.0);
        }
+       return buf;
 }
 
-bool
-EngineControl::engine_running ()
+string
+EngineControl::bufsize_as_string (uint32_t sz)
 {
-        EnvironmentalProtectionAgency* global_epa = EnvironmentalProtectionAgency::get_global_epa ();
-        boost::scoped_ptr<EnvironmentalProtectionAgency> current_epa;
+       /* Translators: "samples" is always plural here, so no
+          need for plural+singular forms.
+       */
+       char buf[32];
+       snprintf (buf, sizeof (buf), _("%u samples"), sz);
+       return buf;
+}
 
-        /* revert all environment settings back to whatever they were when ardour started
-         */
+void 
+EngineControl::sample_rate_changed ()
+{
+       if (ignore_changes) {
+               return;
+       }
 
-        if (global_epa) {
-                current_epa.reset (new EnvironmentalProtectionAgency(true)); /* will restore settings when we leave scope */
-                global_epa->restore ();
-        }
+       /* reset the strings for buffer size to show the correct msec value
+          (reflecting the new sample rate).
+       */
 
-       jack_status_t status;
-       jack_client_t* c = jack_client_open ("ardourprobe", JackNoStartServer, &status);
+       show_buffer_duration ();
+       save_state ();
 
-       if (status == 0) {
-               jack_client_close (c);
-               return true;
-       }
-       return false;
 }
 
-int
-EngineControl::setup_engine ()
+void 
+EngineControl::buffer_size_changed ()
 {
-       vector<string> args;
-       std::string cwd = "/tmp";
-
-       build_command_line (args);
-
-       if (args.empty()) {
-               return 1; // try again
+       if (ignore_changes) {
+               return;
        }
 
-       std::string jackdrc_path = Glib::get_home_dir();
-       jackdrc_path += "/.jackdrc";
+       show_buffer_duration ();
+       save_state ();
+}
 
-       ofstream jackdrc (jackdrc_path.c_str());
-       if (!jackdrc) {
-               error << string_compose (_("cannot open JACK rc file %1 to store parameters"), jackdrc_path) << endmsg;
-               return -1;
-       }
-       cerr << "JACK COMMAND: ";
-       for (vector<string>::iterator i = args.begin(); i != args.end(); ++i) {
-               cerr << (*i) << ' ';
-               jackdrc << (*i) << ' ';
-       }
-       cerr << endl;
-       jackdrc << endl;
-       jackdrc.close ();
+void
+EngineControl::show_buffer_duration ()
+{
 
-       _used = true;
+       /* buffer sizes  - convert from just samples to samples + msecs for
+        * the displayed string
+        */
 
-       return 0;
+       string bs_text = buffer_size_combo.get_active_text ();
+       uint32_t samples = atoi (bs_text); /* will ignore trailing text */
+       uint32_t rate = get_rate();
+
+       /* Translators: "msecs" is ALWAYS plural here, so we do not
+          need singular form as well.
+       */
+       /* 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.
+       */
+       char buf[32];
+       snprintf (buf, sizeof (buf), _("(%.1f msecs)"), (2 * samples) / (rate/1000.0));
+       buffer_size_duration_label.set_text (buf);
 }
 
 void
-EngineControl::enumerate_devices (const string& driver)
+EngineControl::parameter_changed ()
 {
-       /* note: case matters for the map keys */
-
-       if (driver == "CoreAudio") {
-#ifdef __APPLE__
-               devices[driver] = enumerate_coreaudio_devices ();
-#endif
-
-#ifndef __APPLE__
-       } else if (driver == "ALSA") {
-               devices[driver] = enumerate_alsa_devices ();
-       } else if (driver == "FreeBOB") {
-               devices[driver] = enumerate_freebob_devices ();
-       } else if (driver == "FFADO") {
-               devices[driver] = enumerate_ffado_devices ();
-       } else if (driver == "OSS") {
-               devices[driver] = enumerate_oss_devices ();
-       } else if (driver == "Dummy") {
-               devices[driver] = enumerate_dummy_devices ();
-       } else if (driver == "NetJACK") {
-               devices[driver] = enumerate_netjack_devices ();
+       if (!ignore_changes) {
+               save_state ();
        }
-#else
-        }
-#endif
-}
-
-#ifdef __APPLE__
-static OSStatus
-getDeviceUIDFromID( AudioDeviceID id, char *name, size_t nsize)
-{
-       UInt32 size = sizeof(CFStringRef);
-       CFStringRef UI;
-       OSStatus res = AudioDeviceGetProperty(id, 0, false,
-               kAudioDevicePropertyDeviceUID, &size, &UI);
-       if (res == noErr)
-               CFStringGetCString(UI,name,nsize,CFStringGetSystemEncoding());
-       CFRelease(UI);
-       return res;
 }
 
-vector<string>
-EngineControl::enumerate_coreaudio_devices ()
+EngineControl::State*
+EngineControl::get_matching_state (const string& backend,
+                                  const string& driver,
+                                  const string& device)
 {
-       vector<string> devs;
-
-       // Find out how many Core Audio devices are there, if any...
-       // (code snippet gently "borrowed" from St?hane Letz jackdmp;)
-       OSStatus err;
-       Boolean isWritable;
-       UInt32 outSize = sizeof(isWritable);
-
-       backend_devs.clear ();
-
-       err = AudioHardwareGetPropertyInfo(kAudioHardwarePropertyDevices,
-                                          &outSize, &isWritable);
-       if (err == noErr) {
-               // Calculate the number of device available...
-               int numCoreDevices = outSize / sizeof(AudioDeviceID);
-               // Make space for the devices we are about to get...
-               AudioDeviceID *coreDeviceIDs = new AudioDeviceID [numCoreDevices];
-               err = AudioHardwareGetProperty(kAudioHardwarePropertyDevices,
-                                              &outSize, (void *) coreDeviceIDs);
-               if (err == noErr) {
-                       // Look for the CoreAudio device name...
-                       char coreDeviceName[256];
-                       UInt32 nameSize;
-
-                       for (int i = 0; i < numCoreDevices; i++) {
-
-                               nameSize = sizeof (coreDeviceName);
-
-                               /* enforce duplex devices only */
-
-                               err = AudioDeviceGetPropertyInfo(coreDeviceIDs[i],
-                                                                0, true, kAudioDevicePropertyStreams,
-                                                                &outSize, &isWritable);
-
-                               if (err != noErr || outSize == 0) {
-                                       continue;
-                               }
-
-                               err = AudioDeviceGetPropertyInfo(coreDeviceIDs[i],
-                                                                0, false, kAudioDevicePropertyStreams,
-                                                                &outSize, &isWritable);
-
-                               if (err != noErr || outSize == 0) {
-                                       continue;
-                               }
-
-                               err = AudioDeviceGetPropertyInfo(coreDeviceIDs[i],
-                                                                0, true, kAudioDevicePropertyDeviceName,
-                                                                &outSize, &isWritable);
-                               if (err == noErr) {
-                                       err = AudioDeviceGetProperty(coreDeviceIDs[i],
-                                                                    0, true, kAudioDevicePropertyDeviceName,
-                                                                    &nameSize, (void *) coreDeviceName);
-                                       if (err == noErr) {
-                                               char drivername[128];
-
-                                               // this returns the unique id for the device
-                                               // that must be used on the commandline for jack
-
-                                               if (getDeviceUIDFromID(coreDeviceIDs[i], drivername, sizeof (drivername)) == noErr) {
-                                                       devs.push_back (coreDeviceName);
-                                                       backend_devs.push_back (drivername);
-                                               }
-                                       }
-                               }
-                       }
+       for (StateList::iterator i = states.begin(); i != states.end(); ++i) {
+               if ((*i).backend == backend &&
+                   (*i).driver == driver &&
+                   (*i).device == device) {
+                       return &(*i);
                }
-               delete [] coreDeviceIDs;
        }
+       return 0;
+}
 
+EngineControl::State*
+EngineControl::get_saved_state_for_currently_displayed_backend_and_device ()
+{
+       boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance()->current_backend();
 
-       if (devs.size() == 0) {
-               MessageDialog msg (_("\
-You do not have any audio devices capable of\n\
-simultaneous playback and recording.\n\n\
-Please use Applications -> Utilities -> Audio MIDI Setup\n\
-to create an \"aggregrate\" device, or install a suitable\n\
-audio interface.\n\n\
-Please send email to Apple and ask them why new Macs\n\
-have no duplex audio device.\n\n\
-Alternatively, if you really want just playback\n\
-or recording but not both, start JACK before running\n\
-Ardour and choose the relevant device then."
-                                          ),
-                                  true, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK);
-               msg.set_title (_("No suitable audio devices"));
-               msg.set_position (Gtk::WIN_POS_MOUSE);
-               msg.run ();
-               exit (1);
+       if (backend) {
+               return get_matching_state (backend_combo.get_active_text(),
+                                          (backend->requires_driver_selection() ? (std::string) driver_combo.get_active_text() : string()),
+                                          device_combo.get_active_text());
        }
 
 
-       return devs;
+       return get_matching_state (backend_combo.get_active_text(),
+                                  string(),
+                                  device_combo.get_active_text());
 }
-#else
-vector<string>
-EngineControl::enumerate_alsa_devices ()
-{
-       vector<string> devs;
 
-       snd_ctl_t *handle;
-       snd_ctl_card_info_t *info;
-       snd_pcm_info_t *pcminfo;
-       snd_ctl_card_info_alloca(&info);
-       snd_pcm_info_alloca(&pcminfo);
-       string devname;
-       int cardnum = -1;
-       int device = -1;
-
-       backend_devs.clear ();
-
-       while (snd_card_next (&cardnum) >= 0 && cardnum >= 0) {
-
-               devname = "hw:";
-               devname += to_string (cardnum, std::dec);
-
-               if (snd_ctl_open (&handle, devname.c_str(), 0) >= 0 && snd_ctl_card_info (handle, info) >= 0) {
-
-                       while (snd_ctl_pcm_next_device (handle, &device) >= 0 && device >= 0) {
-
-                               snd_pcm_info_set_device (pcminfo, device);
-                               snd_pcm_info_set_subdevice (pcminfo, 0);
-                               snd_pcm_info_set_stream (pcminfo, SND_PCM_STREAM_PLAYBACK);
+EngineControl::State*
+EngineControl::save_state ()
+{
+       bool existing = true;
+       State* state = get_saved_state_for_currently_displayed_backend_and_device ();
 
-                               if (snd_ctl_pcm_info (handle, pcminfo) >= 0) {
-                                       devs.push_back (snd_pcm_info_get_name (pcminfo));
-                                       devname += ',';
-                                       devname += to_string (device, std::dec);
-                                       backend_devs.push_back (devname);
-                               }
-                       }
+       if (!state) {
+               existing = false;
+               state = new State;
+       }
+       
+       store_state (*state);
 
-                       snd_ctl_close(handle);
-               }
+       if (!existing) {
+               states.push_back (*state);
        }
 
-       return devs;
+       return state;
 }
 
-vector<string>
-EngineControl::enumerate_ffado_devices ()
+void
+EngineControl::store_state (State& state)
 {
-       vector<string> devs;
-       backend_devs.clear ();
-       return devs;
+       state.backend = get_backend ();
+       state.driver = get_driver ();
+       state.device = get_device_name ();
+       state.sample_rate = get_rate ();
+       state.buffer_size = get_buffer_size ();
+       state.input_latency = get_input_latency ();
+       state.output_latency = get_output_latency ();
+       state.input_channels = get_input_channels ();
+       state.output_channels = get_output_channels ();
 }
 
-vector<string>
-EngineControl::enumerate_freebob_devices ()
+void
+EngineControl::maybe_display_saved_state ()
 {
-       vector<string> devs;
-       return devs;
-}
+       State* state = get_saved_state_for_currently_displayed_backend_and_device ();
 
-vector<string>
-EngineControl::enumerate_oss_devices ()
-{
-       vector<string> devs;
-       return devs;
-}
-vector<string>
-EngineControl::enumerate_dummy_devices ()
-{
-       vector<string> devs;
-       return devs;
+       if (state) {
+               ignore_changes++;
+               if (!_desired_sample_rate) {
+                       sample_rate_combo.set_active_text (rate_as_string (state->sample_rate));
+               }
+               buffer_size_combo.set_active_text (bufsize_as_string (state->buffer_size));
+               /* call this explicitly because we're ignoring changes to
+                  the controls at this point.
+               */
+               show_buffer_duration ();
+               input_latency.set_value (state->input_latency);
+               output_latency.set_value (state->output_latency);
+               ignore_changes--;
+       }
 }
-vector<string>
-EngineControl::enumerate_netjack_devices ()
+       
+XMLNode&
+EngineControl::get_state ()
 {
-       vector<string> devs;
-       return devs;
+       XMLNode* root = new XMLNode ("AudioMIDISetup");
+       std::string path;
+
+       if (!states.empty()) {
+               XMLNode* state_nodes = new XMLNode ("EngineStates");
+               
+               for (StateList::const_iterator i = states.begin(); i != states.end(); ++i) {
+                       
+                       XMLNode* node = new XMLNode ("State");
+                       
+                       node->add_property ("backend", (*i).backend);
+                       node->add_property ("driver", (*i).driver);
+                       node->add_property ("device", (*i).device);
+                       node->add_property ("sample-rate", (*i).sample_rate);
+                       node->add_property ("buffer-size", (*i).buffer_size);
+                       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");
+                       
+                       state_nodes->add_child_nocopy (*node);
+               }
+               
+               root->add_child_nocopy (*state_nodes);
+       }
+
+       return *root;
 }
-#endif
 
 void
-EngineControl::driver_changed ()
+EngineControl::set_state (const XMLNode& root)
 {
-       string driver = driver_combo.get_active_text();
-       string::size_type maxlen = 0;
-       int n = 0;
-
-       enumerate_devices (driver);
-
-       vector<string>& strings = devices[driver];
+       XMLNodeList          clist, cclist;
+       XMLNodeConstIterator citer, cciter;
+       XMLNode* child;
+       XMLNode* grandchild;
+       XMLProperty* prop = NULL;
 
-       if (strings.empty() && driver != "FreeBoB" && driver != "FFADO" && driver != "Dummy") {
+       if (root.name() != "AudioMIDISetup") {
                return;
        }
 
-       for (vector<string>::iterator i = strings.begin(); i != strings.end(); ++i, ++n) {
-               if ((*i).length() > maxlen) {
-                       maxlen = (*i).length();
+       clist = root.children();
+
+       states.clear ();
+
+       for (citer = clist.begin(); citer != clist.end(); ++citer) {
+
+               child = *citer;
+               
+               if (child->name() != "EngineStates") {
+                       continue;
                }
-       }
 
-       set_popdown_strings (interface_combo, strings);
-       set_popdown_strings (input_device_combo, strings);
-       set_popdown_strings (output_device_combo, strings);
+               cclist = child->children();
 
-       if (!strings.empty()) {
-               interface_combo.set_active_text (strings.front());
-               input_device_combo.set_active_text (strings.front());
-               output_device_combo.set_active_text (strings.front());
-       }
+               for (cciter = cclist.begin(); cciter != cclist.end(); ++cciter) {
+                       State state;
+                       
+                       grandchild = *cciter;
 
-       if (driver == "ALSA") {
-               soft_mode_button.set_sensitive (true);
-               force16bit_button.set_sensitive (true);
-               hw_monitor_button.set_sensitive (true);
-               hw_meter_button.set_sensitive (true);
-               monitor_button.set_sensitive (true);
-       } else {
-               soft_mode_button.set_sensitive (false);
-               force16bit_button.set_sensitive (false);
-               hw_monitor_button.set_sensitive (false);
-               hw_meter_button.set_sensitive (false);
-               monitor_button.set_sensitive (false);
+                       if (grandchild->name() != "State") {
+                               continue;
+                       }
+                       
+                       if ((prop = grandchild->property ("backend")) == 0) {
+                               continue;
+                       }
+                       state.backend = prop->value ();
+                       
+                       if ((prop = grandchild->property ("driver")) == 0) {
+                               continue;
+                       }
+                       state.driver = prop->value ();
+                       
+                       if ((prop = grandchild->property ("device")) == 0) {
+                               continue;
+                       }
+                       state.device = prop->value ();
+                       
+                       if ((prop = grandchild->property ("sample-rate")) == 0) {
+                               continue;
+                       }
+                       state.sample_rate = atof (prop->value ());
+                       
+                       if ((prop = grandchild->property ("buffer-size")) == 0) {
+                               continue;
+                       }
+                       state.buffer_size = atoi (prop->value ());
+                       
+                       if ((prop = grandchild->property ("input-latency")) == 0) {
+                               continue;
+                       }
+                       state.input_latency = atoi (prop->value ());
+                       
+                       if ((prop = grandchild->property ("output-latency")) == 0) {
+                               continue;
+                       }
+                       state.output_latency = atoi (prop->value ());
+                       
+                       if ((prop = grandchild->property ("input-channels")) == 0) {
+                               continue;
+                       }
+                       state.input_channels = atoi (prop->value ());
+                       
+                       if ((prop = grandchild->property ("output-channels")) == 0) {
+                               continue;
+                       }
+                       state.output_channels = atoi (prop->value ());
+
+                       if ((prop = grandchild->property ("active")) == 0) {
+                               continue;
+                       }
+                       state.active = string_is_affirmative (prop->value ());
+                       
+                       states.push_back (state);
+               }
        }
-}
 
-uint32_t
-EngineControl::get_rate ()
-{
-       double r = atof (sample_rate_combo.get_active_text ());
-       /* the string may have been translated with an abbreviation for
-        * thousands, so use a crude heuristic to fix this.
-        */
-       if (r < 1000.0) {
-               r *= 1000.0;
+       /* now see if there was an active state and switch the setup to it */
+       
+       for (StateList::const_iterator i = states.begin(); i != states.end(); ++i) {
+               if ((*i).active) {
+                       ignore_changes++;
+                       backend_combo.set_active_text ((*i).backend);
+                       driver_combo.set_active_text ((*i).driver);
+                       device_combo.set_active_text ((*i).device);
+                       sample_rate_combo.set_active_text (rate_as_string ((*i).sample_rate));
+                       buffer_size_combo.set_active_text (bufsize_as_string ((*i).buffer_size));
+                       input_latency.set_value ((*i).input_latency);
+                       output_latency.set_value ((*i).output_latency);
+                       ignore_changes--;
+                       break;
+               }
        }
-       return lrint (r);
 }
 
-void
-EngineControl::redisplay_latency ()
-{
-       uint32_t rate = get_rate();
-#ifdef __APPLE_
-       float periods = 2;
-#else
-       float periods = periods_adjustment.get_value();
-#endif
-       float period_size = atof (period_size_combo.get_active_text());
-
-       char buf[32];
-       snprintf (buf, sizeof(buf), "%.1fmsec", (periods * period_size) / (rate/1000.0));
-
-       latency_label.set_text (buf);
-       latency_label.set_alignment (0, 0.5);
-}
 
-void
-EngineControl::audio_mode_changed ()
+int
+EngineControl::push_state_to_backend (bool start)
 {
-       std::string str = audio_mode_combo.get_active_text();
-
-       if (str == _("Playback/Recording on 1 Device")) {
-               input_device_combo.set_sensitive (false);
-               output_device_combo.set_sensitive (false);
-       } else if (str == _("Playback/Recording on 2 Devices")) {
-               input_device_combo.set_sensitive (true);
-               output_device_combo.set_sensitive (true);
-       } else if (str == _("Playback only")) {
-               output_device_combo.set_sensitive (true);
-               input_device_combo.set_sensitive (false);
-       } else if (str == _("Recording only")) {
-               input_device_combo.set_sensitive (true);
-               output_device_combo.set_sensitive (false);
+       boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance()->current_backend();
+
+       if (!backend) {
+               return 0;
        }
-}
+       
+       /* figure out what is going to change */
+
+       bool restart_required = false;
+       bool was_running = ARDOUR::AudioEngine::instance()->running();
+       bool change_driver = false;
+       bool change_device = false;
+       bool change_rate = false;
+       bool change_bufsize = false;
+       bool change_latency = false;
+       bool change_channels = false;
+
+       uint32_t ochan = get_output_channels ();
+       uint32_t ichan = get_input_channels ();
+
+       if (_have_control) {
+               
+               /* we can control the backend */
+
+               if (backend->requires_driver_selection()) {
+                       if (get_driver() != backend->driver_name()) {
+                               change_driver = true;
+                       }
+               }
 
-static bool jack_server_filter(const string& str, void */*arg*/)
-{
-   return str == "jackd" || str == "jackdmp";
-}
+               if (get_device_name() != backend->device_name()) {
+                       change_device = true;
+               }
 
-void
-EngineControl::find_jack_servers (vector<string>& strings)
-{
-#ifdef __APPLE__
-       /* this magic lets us finds the path to the OSX bundle, and then
-          we infer JACK's location from there
-       */
+               if (get_rate() != backend->sample_rate()) {
+                       change_rate = true;
+               }
 
-       char execpath[MAXPATHLEN+1];
-       uint32_t pathsz = sizeof (execpath);
+               if (get_buffer_size() != backend->buffer_size()) {
+                       change_bufsize = true;
+               }
 
-       _NSGetExecutablePath (execpath, &pathsz);
+               /* zero-requested channels means "all available" */
 
-       string path (Glib::path_get_dirname (execpath));
-       path += "/jackd";
+               if (ichan == 0) {
+                       ichan = backend->input_channels();
+               }
 
-       if (Glib::file_test (path, FILE_TEST_EXISTS)) {
-               strings.push_back (path);
-       }
+               if (ochan == 0) {
+                       ochan = backend->output_channels();
+               }
 
-       if (getenv ("ARDOUR_WITH_JACK")) {
-               /* no other options - only use the JACK we supply */
-               if (strings.empty()) {
-                       fatal << string_compose (_("JACK appears to be missing from the %1 bundle"), PROGRAM_NAME) << endmsg;
-                       /*NOTREACHED*/
+               if (ichan != backend->input_channels()) {
+                       change_channels = true;
                }
-               return;
-       }
-#else
-       string path;
-#endif
 
-       PathScanner scanner;
-       vector<string *> *jack_servers;
-       std::map<string,int> un;
-       char *p;
-       bool need_minimal_path = false;
+               if (ochan != backend->output_channels()) {
+                       change_channels = true;
+               }
 
-       p = getenv ("PATH");
+               if (get_input_latency() != backend->systemic_input_latency() ||
+                   get_output_latency() != backend->systemic_output_latency()) {
+                       change_latency = true;
+               }
 
-       if (p && *p) {
-               path = p;
        } else {
-               need_minimal_path = true;
-       }
 
-#ifdef __APPLE__
-       // many mac users don't have PATH set up to include
-       // likely installed locations of JACK
-       need_minimal_path = true;
-#endif
+               /* we have no control over the backend, meaning that we can
+                * only possibly change sample rate and buffer size.
+                */
 
-       if (need_minimal_path) {
-               if (path.empty()) {
-                       path = "/usr/bin:/bin:/usr/local/bin:/opt/local/bin";
-               } else {
-                       path += ":/usr/local/bin:/opt/local/bin";
-               }
-       }
 
-#ifdef __APPLE__
-       // push it back into the environment so that auto-started JACK can find it.
-       // XXX why can't we just expect OS X users to have PATH set correctly? we can't ...
-       setenv ("PATH", path.c_str(), 1);
-#endif
+               if (get_rate() != backend->sample_rate()) {
+                       change_bufsize = true;
+               }
 
-       jack_servers = scanner (path, jack_server_filter, 0, false, true);
-       if (!jack_servers) {
-               return;
+               if (get_buffer_size() != backend->buffer_size()) {
+                       change_bufsize = true;
+               }
        }
 
-       vector<string *>::iterator iter;
+       if (!_have_control) {
 
-       for (iter = jack_servers->begin(); iter != jack_servers->end(); iter++) {
-               string p = **iter;
+               /* We do not have control over the backend, so the best we can
+                * do is try to change the sample rate and/or bufsize and get
+                * out of here.
+                */
 
-               if (un[p]++ == 0) {
-                       strings.push_back(p);
+               if (change_rate && !backend->can_change_sample_rate_when_running()) {
+                       return 1;
                }
-       }
-}
 
+               if (change_bufsize && !backend->can_change_buffer_size_when_running()) {
+                       return 1;
+               }
+               
+               if (change_rate) {
+                       backend->set_sample_rate (get_rate());
+               }
+               
+               if (change_bufsize) {
+                       backend->set_buffer_size (get_buffer_size());
+               }
 
-string
-EngineControl::get_device_name (const string& driver, const string& human_readable)
-{
-       vector<string>::iterator n;
-       vector<string>::iterator i;
+               post_push ();
 
-       if (human_readable.empty()) {
-               /* this can happen if the user's .ardourrc file has a device name from
-                  another computer system in it
-               */
-               MessageDialog msg (_("You need to choose an audio device first."));
-                msg.set_position (WIN_POS_MOUSE);
-               msg.run ();
-               return string();
+               return 0;
+       } 
+
+       /* determine if we need to stop the backend before changing parameters */
+
+       if (change_driver || change_device || change_channels || change_latency ||
+           (change_rate && !backend->can_change_sample_rate_when_running()) ||
+           (change_bufsize && !backend->can_change_buffer_size_when_running())) {
+               restart_required = true;
+       } else {
+               restart_required = false;
        }
 
-       if (backend_devs.empty()) {
-               return human_readable;
+       if (was_running) {
+
+               if (!change_driver && !change_device && !change_channels && !change_latency) {
+                       /* no changes in any parameters that absolutely require a
+                        * restart, so check those that might be changeable without a
+                        * restart
+                        */
+                       
+                       if (change_rate && !backend->can_change_sample_rate_when_running()) {
+                               /* can't do this while running ... */
+                               restart_required = true;
+                       }
+
+                       if (change_bufsize && !backend->can_change_buffer_size_when_running()) {
+                               /* can't do this while running ... */
+                               restart_required = true;
+                       }
+               }
        }
 
-       for (i = devices[driver].begin(), n = backend_devs.begin(); i != devices[driver].end(); ++i, ++n) {
-               if (human_readable == (*i)) {
-                       return (*n);
+       if (was_running) {
+               if (restart_required) {
+                       if (ARDOUR_UI::instance()->disconnect_from_engine ()) {
+                               return -1;
+                       }
                }
        }
+               
 
-       if (i == devices[driver].end()) {
-               warning << string_compose (_("Audio device \"%1\" not known on this computer."), human_readable) << endmsg;
+       if (change_driver && backend->set_driver (get_driver())) {
+               error << string_compose (_("Cannot set driver to %1"), get_driver()) << endmsg;
+               return -1;
+       }
+       if (change_device && backend->set_device_name (get_device_name())) {
+               error << string_compose (_("Cannot set device name to %1"), get_device_name()) << endmsg;
+               return -1;
+       }
+       if (change_rate && backend->set_sample_rate (get_rate())) {
+               error << string_compose (_("Cannot set sample rate to %1"), get_rate()) << endmsg;
+               return -1;
        }
+       if (change_bufsize && backend->set_buffer_size (get_buffer_size())) {
+               error << string_compose (_("Cannot set buffer size to %1"), get_buffer_size()) << endmsg;
+               return -1;
+       }
+
+       if (change_channels || get_input_channels() == 0 || get_output_channels() == 0) {
+               if (backend->set_input_channels (get_input_channels())) {
+                       error << string_compose (_("Cannot set input channels to %1"), get_input_channels()) << endmsg;
+                       return -1;
+               }
+               if (backend->set_output_channels (get_output_channels())) {
+                       error << string_compose (_("Cannot set output channels to %1"), get_output_channels()) << endmsg;
+                       return -1;
+               }
+       }
+       if (change_latency) {
+               if (backend->set_systemic_input_latency (get_input_latency())) {
+                       error << string_compose (_("Cannot set input latency to %1"), get_input_latency()) << endmsg;
+                       return -1;
+               }
+               if (backend->set_systemic_output_latency (get_output_latency())) {
+                       error << string_compose (_("Cannot set output latency to %1"), get_output_latency()) << endmsg;
+                       return -1;
+               }
+       }
+                       
+       if (start || (was_running && restart_required)) {
+               if (ARDOUR_UI::instance()->reconnect_to_engine()) {
+                       return -1;
+               }
+       }
+       
+       post_push ();
 
-       return string();
+       return 0;
 }
 
-XMLNode&
-EngineControl::get_state ()
+void
+EngineControl::post_push ()
 {
-       XMLNode* root = new XMLNode ("AudioSetup");
-       XMLNode* child;
-       std::string path;
-
-       child = new XMLNode ("periods");
-       child->add_property ("val", to_string (periods_adjustment.get_value(), std::dec));
-       root->add_child_nocopy (*child);
+       /* get a pointer to the current state object, creating one if
+        * necessary
+        */
+       
+       State* state = get_saved_state_for_currently_displayed_backend_and_device ();
+       
+       if (!state) {
+               state = save_state ();
+               assert (state);
+       }
+       
+       /* all off */
+       
+       for (StateList::iterator i = states.begin(); i != states.end(); ++i) {
+               (*i).active = false;
+       }
+       
+       /* mark this one active (to be used next time the dialog is
+        * shown)
+        */
+       
+       state->active = true;
 
-       child = new XMLNode ("ports");
-       child->add_property ("val", to_string (ports_adjustment.get_value(), std::dec));
-       root->add_child_nocopy (*child);
+       manage_control_app_sensitivity ();
 
-       child = new XMLNode ("inlatency");
-       child->add_property ("val", to_string (input_latency.get_value(), std::dec));
-       root->add_child_nocopy (*child);
+       /* schedule a redisplay of MIDI ports */
+       
+       Glib::signal_timeout().connect (sigc::bind_return (sigc::mem_fun (*this, &EngineControl::refresh_midi_display), false), 1000);
+}
 
-       child = new XMLNode ("outlatency");
-       child->add_property ("val", to_string (output_latency.get_value(), std::dec));
-       root->add_child_nocopy (*child);
 
-       child = new XMLNode ("realtime");
-       child->add_property ("val", to_string (realtime_button.get_active(), std::dec));
-       root->add_child_nocopy (*child);
+float
+EngineControl::get_rate () const
+{
+       float r = atof (sample_rate_combo.get_active_text ());
+       /* the string may have been translated with an abbreviation for
+        * thousands, so use a crude heuristic to fix this.
+        */
+       if (r < 1000.0) {
+               r *= 1000.0;
+       }
+       return r;
+}
+       
 
-       child = new XMLNode ("nomemorylock");
-       child->add_property ("val", to_string (no_memory_lock_button.get_active(), std::dec));
-       root->add_child_nocopy (*child);
+uint32_t
+EngineControl::get_buffer_size () const
+{
+       string txt = buffer_size_combo.get_active_text ();
+       uint32_t samples;
 
-       child = new XMLNode ("unlockmemory");
-       child->add_property ("val", to_string (unlock_memory_button.get_active(), std::dec));
-       root->add_child_nocopy (*child);
+       if (sscanf (txt.c_str(), "%d", &samples) != 1) {
+               throw exception ();
+       }
 
-       child = new XMLNode ("softmode");
-       child->add_property ("val", to_string (soft_mode_button.get_active(), std::dec));
-       root->add_child_nocopy (*child);
+       return samples;
+}
 
-       child = new XMLNode ("force16bit");
-       child->add_property ("val", to_string (force16bit_button.get_active(), std::dec));
-       root->add_child_nocopy (*child);
+uint32_t
+EngineControl::get_input_channels() const
+{
+       return (uint32_t) input_channels_adjustment.get_value();
+}
 
-       child = new XMLNode ("hwmonitor");
-       child->add_property ("val", to_string (hw_monitor_button.get_active(), std::dec));
-       root->add_child_nocopy (*child);
+uint32_t
+EngineControl::get_output_channels() const
+{
+       return (uint32_t) output_channels_adjustment.get_value();
+}
 
-       child = new XMLNode ("hwmeter");
-       child->add_property ("val", to_string (hw_meter_button.get_active(), std::dec));
-       root->add_child_nocopy (*child);
+uint32_t
+EngineControl::get_input_latency() const
+{
+       return (uint32_t) input_latency_adjustment.get_value();
+}
 
-       child = new XMLNode ("verbose");
-       child->add_property ("val", to_string (verbose_output_button.get_active(), std::dec));
-       root->add_child_nocopy (*child);
+uint32_t
+EngineControl::get_output_latency() const
+{
+       return (uint32_t) output_latency_adjustment.get_value();
+}
 
-       child = new XMLNode ("samplerate");
-       child->add_property ("val", sample_rate_combo.get_active_text());
-       root->add_child_nocopy (*child);
+string
+EngineControl::get_backend () const
+{
+       return backend_combo.get_active_text ();
+}
 
-       child = new XMLNode ("periodsize");
-       child->add_property ("val", period_size_combo.get_active_text());
-       root->add_child_nocopy (*child);
+string
+EngineControl::get_driver () const
+{
+       return driver_combo.get_active_text ();
+}
 
-       child = new XMLNode ("serverpath");
-       child->add_property ("val", serverpath_combo.get_active_text());
-       root->add_child_nocopy (*child);
+string
+EngineControl::get_device_name () const
+{
+       return device_combo.get_active_text ();
+}
 
-       child = new XMLNode ("driver");
-       child->add_property ("val", driver_combo.get_active_text());
-       root->add_child_nocopy (*child);
+void
+EngineControl::control_app_button_clicked ()
+{
+       boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance()->current_backend();
+       
+       if (!backend) {
+               return;
+       }
+       
+       backend->launch_control_app ();
+}
 
-       child = new XMLNode ("interface");
-       child->add_property ("val", interface_combo.get_active_text());
-       root->add_child_nocopy (*child);
+void
+EngineControl::manage_control_app_sensitivity ()
+{
+       boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance()->current_backend();
+       
+       if (!backend) {
+               return;
+       }
+       
+       string appname = backend->control_app_name();
 
-       child = new XMLNode ("timeout");
-       child->add_property ("val", timeout_combo.get_active_text());
-       root->add_child_nocopy (*child);
+       if (appname.empty()) {
+               control_app_button.set_sensitive (false);
+       } else {
+               control_app_button.set_sensitive (true);
+       }
+}
 
-       child = new XMLNode ("dither");
-       child->add_property ("val", dither_mode_combo.get_active_text());
-       root->add_child_nocopy (*child);
+void
+EngineControl::set_desired_sample_rate (uint32_t sr)
+{
+       _desired_sample_rate = sr;
+       device_changed ();
+}
 
-       child = new XMLNode ("audiomode");
-       child->add_property ("val", audio_mode_combo.get_active_text());
-       root->add_child_nocopy (*child);
+void
+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);
+       } else {
+               cancel_button->set_sensitive (false);
+               ok_button->set_sensitive (false);
+               apply_button->set_sensitive (false);
+       }
 
-       child = new XMLNode ("inputdevice");
-       child->add_property ("val", input_device_combo.get_active_text());
-       root->add_child_nocopy (*child);
+       if (page_num == 1) {
+               /* MIDI tab */
+               refresh_midi_display ();
+       }
 
-       child = new XMLNode ("outputdevice");
-       child->add_property ("val", output_device_combo.get_active_text());
-       root->add_child_nocopy (*child);
+       if (page_num == 2) {
+               /* latency tab */
+
+               if (!ARDOUR::AudioEngine::instance()->running()) {
+                       
+                       PBD::Unwinder<uint32_t> protect_ignore_changes (ignore_changes, ignore_changes + 1);
+                       
+                       /* save any existing latency values */
+                       
+                       uint32_t il = (uint32_t) input_latency.get_value ();
+                       uint32_t ol = (uint32_t) input_latency.get_value ();
+
+                       /* reset to zero so that our new test instance of JACK
+                          will be clean of any existing latency measures.
+                       */
+                       
+                       input_latency.set_value (0);
+                       output_latency.set_value (0);
+                       
+                       /* reset control */
+
+                       input_latency.set_value (il);
+                       output_latency.set_value (ol);
+
+               } 
+
+               if (ARDOUR::AudioEngine::instance()->prepare_for_latency_measurement()) {
+                       disable_latency_tab ();
+               }
 
-       child = new XMLNode ("mididriver");
-       child->add_property ("val", midi_driver_combo.get_active_text());
-       root->add_child_nocopy (*child);
+               enable_latency_tab ();
 
-       return *root;
+       } else {
+               ARDOUR::AudioEngine::instance()->stop_latency_detection();
+       }
 }
 
-void
-EngineControl::set_state (const XMLNode& root)
+/* latency measurement */
+
+bool
+EngineControl::check_latency_measurement ()
 {
-       XMLNodeList          clist;
-       XMLNodeConstIterator citer;
-       XMLNode* child;
-       XMLProperty* prop = NULL;
-       bool using_dummy = false;
-       bool using_ffado = false;
+        MTDM* mtdm = ARDOUR::AudioEngine::instance()->mtdm ();
 
-       int val;
-       string strval;
+        if (mtdm->resolve () < 0) {
+               lm_results.set_markup (string_compose ("<span foreground=\"red\">%1</span>", _("No signal detected ")));
+                return true;
+        }
 
-       if ( (child = root.child ("driver"))){
-               prop = child->property("val");
+        if (mtdm->err () > 0.3) {
+                mtdm->invert ();
+                mtdm->resolve ();
+        }
 
-               if (prop && (prop->value() == "Dummy") ) {
-                       using_dummy = true;
-               }
-               if (prop && (prop->value() == "FFADO") ) {
-                       using_ffado = true;
-               }
+        char buf[128];
+       ARDOUR::framecnt_t const sample_rate = ARDOUR::AudioEngine::instance()->sample_rate();
 
-       }
+        if (sample_rate == 0) {
+                lm_results.set_text (_("Disconnected from audio engine"));
+               ARDOUR::AudioEngine::instance()->stop_latency_detection ();
+                return false;
+        }
 
-       clist = root.children();
+       uint32_t frames_total = mtdm->del();
+       uint32_t extra = frames_total - ARDOUR::AudioEngine::instance()->latency_signal_delay();
 
-       for (citer = clist.begin(); citer != clist.end(); ++citer) {
+        snprintf (buf, sizeof (buf), "%u samples %10.3lf ms", extra, extra * 1000.0f/sample_rate);
 
-               child = *citer;
+        bool solid = true;
 
-               prop = child->property ("val");
+        if (mtdm->err () > 0.2) {
+                strcat (buf, " ??");
+                solid = false;
+        }
 
-               if (!prop || prop->value().empty()) {
+        if (mtdm->inv ()) {
+                strcat (buf, " (Inv)");
+                solid = false;
+        }
 
-                       if (((using_dummy || using_ffado)
-                               && ( child->name() == "interface"
-                                       || child->name() == "inputdevice"
-                                       || child->name() == "outputdevice"))
-                               || child->name() == "timeout")
-                       {
-                               continue;
-                       }
+        if (solid) {
+                lm_measure_button.set_active (false);
+               lm_use_button.set_sensitive (true);
+                strcat (buf, " (set)");
+               have_lm_results = true;
+        }
+       
+        lm_results.set_text (buf);
 
-                       error << string_compose (_("AudioSetup value for %1 is missing data"), child->name()) << endmsg;
-                       continue;
-               }
+        return true;
+}
 
-               strval = prop->value();
-
-               /* adjustments/spinners */
-
-               if (child->name() == "periods") {
-                       val = atoi (strval);
-                       periods_adjustment.set_value(val);
-               } else if (child->name() == "ports") {
-                       val = atoi (strval);
-                       ports_adjustment.set_value(val);
-               } else if (child->name() == "inlatency") {
-                       val = atoi (strval);
-                       input_latency.set_value(val);
-               } else if (child->name() == "outlatency") {
-                       val = atoi (strval);
-                       output_latency.set_value(val);
-               }
+void
+EngineControl::start_latency_detection ()
+{
+       ARDOUR::AudioEngine::instance()->set_latency_input_port (lm_input_channel_combo.get_active_text());
+       ARDOUR::AudioEngine::instance()->set_latency_output_port (lm_output_channel_combo.get_active_text());
+       ARDOUR::AudioEngine::instance()->start_latency_detection ();
+       lm_results.set_text (_("Detecting ..."));
+       latency_timeout = Glib::signal_timeout().connect (mem_fun (*this, &EngineControl::check_latency_measurement), 250);
+       lm_start_stop_label.set_text (_("Cancel measurement"));
+       have_lm_results = false;
+       lm_input_channel_combo.set_sensitive (false);
+       lm_output_channel_combo.set_sensitive (false);
+}
 
-               /* buttons */
-
-               else if (child->name() == "realtime") {
-                       val = atoi (strval);
-                       realtime_button.set_active(val);
-               } else if (child->name() == "nomemorylock") {
-                       val = atoi (strval);
-                       no_memory_lock_button.set_active(val);
-               } else if (child->name() == "unlockmemory") {
-                       val = atoi (strval);
-                       unlock_memory_button.set_active(val);
-               } else if (child->name() == "softmode") {
-                       val = atoi (strval);
-                       soft_mode_button.set_active(val);
-               } else if (child->name() == "force16bit") {
-                       val = atoi (strval);
-                       force16bit_button.set_active(val);
-               } else if (child->name() == "hwmonitor") {
-                       val = atoi (strval);
-                       hw_monitor_button.set_active(val);
-               } else if (child->name() == "hwmeter") {
-                       val = atoi (strval);
-                       hw_meter_button.set_active(val);
-               } else if (child->name() == "verbose") {
-                       val = atoi (strval);
-                       verbose_output_button.set_active(val);
-               }
+void
+EngineControl::end_latency_detection ()
+{
+       ARDOUR::AudioEngine::instance()->stop_latency_detection ();
+       latency_timeout.disconnect ();
+       lm_start_stop_label.set_text (_("Measure latency"));
+       if (!have_lm_results) {
+               lm_results.set_markup ("<i>No measurement results yet</i>");
+       }
+       lm_input_channel_combo.set_sensitive (true);
+       lm_output_channel_combo.set_sensitive (true);
+}
 
-               /* combos */
-
-               else if (child->name() == "samplerate") {
-                       sample_rate_combo.set_active_text(strval);
-               } else if (child->name() == "periodsize") {
-                       period_size_combo.set_active_text(strval);
-               } else if (child->name() == "serverpath") {
-
-                        /* only attempt to set this if we have bothered to look
-                           up server names already. otherwise this is all
-                           redundant (actually, all of this dialog/widget
-                           is redundant in that case ...)
-                        */
-
-                        if (!server_strings.empty()) {
-                                /* do not allow us to use a server path that doesn't
-                                   exist on this system. this handles cases where
-                                   the user has an RC file listing a serverpath
-                                   from some other machine.
-                                */
-                                vector<string>::iterator x;
-                                for (x = server_strings.begin(); x != server_strings.end(); ++x) {
-                                        if (*x == strval) {
-                                                break;
-                                        }
-                                }
-                                if (x != server_strings.end()) {
-                                        serverpath_combo.set_active_text (strval);
-                                } else {
-                                        warning << string_compose (_("configuration files contain a JACK server path that doesn't exist (%1)"),
-                                                                   strval)
-                                                << endmsg;
-                                }
-                        }
-
-               } else if (child->name() == "driver") {
-                       driver_combo.set_active_text(strval);
-               } else if (child->name() == "interface") {
-                       interface_combo.set_active_text(strval);
-               } else if (child->name() == "timeout") {
-                       timeout_combo.set_active_text(strval);
-               } else if (child->name() == "dither") {
-                       dither_mode_combo.set_active_text(strval);
-               } else if (child->name() == "audiomode") {
-                       audio_mode_combo.set_active_text(strval);
-               } else if (child->name() == "inputdevice") {
-                       input_device_combo.set_active_text(strval);
-               } else if (child->name() == "outputdevice") {
-                       output_device_combo.set_active_text(strval);
-               } else if (child->name() == "mididriver") {
-                       midi_driver_combo.set_active_text(strval);
-               }
+void
+EngineControl::latency_button_toggled ()
+{
+        if (lm_measure_button.get_active ()) {
+               start_latency_detection ();
+       } else {
+               end_latency_detection ();
+        }
+}
+
+void
+EngineControl::use_latency_button_clicked ()
+{
+        MTDM* mtdm = ARDOUR::AudioEngine::instance()->mtdm ();
+
+       if (!mtdm) {
+               return;
+       }
+
+       uint32_t frames_total = mtdm->del();
+       uint32_t extra = frames_total - ARDOUR::AudioEngine::instance()->latency_signal_delay();
+       uint32_t one_way = extra/2;
+
+       input_latency_adjustment.set_value (one_way);
+       output_latency_adjustment.set_value (one_way);
+}
+
+bool
+EngineControl::on_delete_event (GdkEventAny* ev)
+{
+       if (notebook.get_current_page() == 2) {
+               /* currently on latency tab - be sure to clean up */
+               end_latency_detection ();
        }
+       return ArdourDialog::on_delete_event (ev);
 }
+