remove all trace of SAE from source code.
[ardour.git] / gtk2_ardour / ardour_ui.cc
index ce95aec7e682a67d51b88e332d74424f63051311..cadb71ebfd32c2589810d37b138e285f16b07ae2 100644 (file)
@@ -26,7 +26,6 @@
 #include <cmath>
 #include <iostream>
 #include <cerrno>
-#include <fstream>
 
 #include <stdarg.h>
 
@@ -41,7 +40,7 @@
 #include <time.h>
 
 #include <glib.h>
-#include <glib/gstdio.h>
+#include "pbd/gstdio_compat.h"
 
 #include <gtkmm/messagedialog.h>
 #include <gtkmm/accelmap.h>
@@ -49,6 +48,7 @@
 #include "pbd/error.h"
 #include "pbd/basename.h"
 #include "pbd/compose.h"
+#include "pbd/convert.h"
 #include "pbd/failed_constructor.h"
 #include "pbd/enumwriter.h"
 #include "pbd/memento_command.h"
@@ -77,6 +77,7 @@
 #include "ardour/diskstream.h"
 #include "ardour/filename_extensions.h"
 #include "ardour/filesystem_paths.h"
+#include "ardour/ltc_file_reader.h"
 #include "ardour/port.h"
 #include "ardour/plugin_manager.h"
 #include "ardour/process_thread.h"
@@ -86,6 +87,7 @@
 #include "ardour/session_route.h"
 #include "ardour/session_state_utils.h"
 #include "ardour/session_utils.h"
+#include "ardour/source_factory.h"
 #include "ardour/slave.h"
 #include "ardour/system_exec.h"
 
@@ -107,8 +109,11 @@ typedef uint64_t microseconds_t;
 #include "ambiguous_file_dialog.h"
 #include "ardour_ui.h"
 #include "audio_clock.h"
+#include "audio_region_view.h"
 #include "big_clock_window.h"
 #include "bundle_manager.h"
+#include "duplicate_routes_dialog.h"
+#include "debug.h"
 #include "engine_dialog.h"
 #include "export_video_dialog.h"
 #include "export_video_infobox.h"
@@ -123,6 +128,7 @@ typedef uint64_t microseconds_t;
 #include "missing_file_dialog.h"
 #include "missing_plugin_dialog.h"
 #include "mixer_ui.h"
+#include "meterbridge.h"
 #include "mouse_cursors.h"
 #include "nsm.h"
 #include "opts.h"
@@ -164,8 +170,6 @@ ARDOUR_UI *ARDOUR_UI::theArdourUI = 0;
 sigc::signal<void, framepos_t, bool, framepos_t> ARDOUR_UI::Clock;
 sigc::signal<void>      ARDOUR_UI::CloseAllDialogs;
 
-float ARDOUR_UI::ui_scale = 1.0;
-
 static bool
 ask_about_configuration_copy (string const & old_dir, string const & new_dir, int version)
 {
@@ -221,16 +225,20 @@ libxml_structured_error_func (void* /* parsing_context*/,
 }
 
 
-ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir, UIConfiguration* uic)
+ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
+<<<<<<< HEAD
 
+       : Gtkmm2ext::UI (PROGRAM_NAME, X_("gui"), argcp, argvp)
+=======
        : Gtkmm2ext::UI (PROGRAM_NAME, argcp, argvp)
-       , ui_config (uic->post_gui_init ())
+>>>>>>> first compilable version of tabbable design.
        , session_loaded (false)
        , gui_object_state (new GUIObjectState)
        , primary_clock   (new MainClock (X_("primary"),   X_("transport"), true ))
        , secondary_clock (new MainClock (X_("secondary"), X_("secondary"), false))
        , big_clock (new AudioClock (X_("bigclock"), false, "big", true, true, false, false))
        , video_timeline(0)
+       , global_actions (X_("global"))
        , ignore_dual_punch (false)
        , editor (0)
        , mixer (0)
@@ -255,15 +263,13 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir, UIConfi
        , error_alert_button ( ArdourButton::just_led_default_elements )
        , editor_meter(0)
        , editor_meter_peak_display()
-       , session_selector_window (0)
        , _numpad_locate_happening (false)
        , _session_is_new (false)
        , last_key_press_time (0)
        , save_as_dialog (0)
        , meterbridge (0)
+       , rc_option_editor (0)
        , speaker_config_window (X_("speaker-config"), _("Speaker Configuration"))
-       , key_editor (X_("key-editor"), _("Key Bindings"))
-       , rc_option_editor (X_("rc-options-editor"), _("Preferences"))
        , add_route_dialog (X_("add-routes"), _("Add Tracks/Busses"))
        , about (X_("about"), _("About"))
        , location_ui (X_("locations"), _("Locations"))
@@ -271,11 +277,12 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir, UIConfi
        , audio_midi_setup (X_("audio-midi-setup"), _("Audio/MIDI Setup"))
        , export_video_dialog (X_("video-export"), _("Video Export Dialog"))
        , session_option_editor (X_("session-options-editor"), _("Properties"), boost::bind (&ARDOUR_UI::create_session_option_editor, this))
-       , add_video_dialog (X_("add-video"), _("Add Tracks/Busses"), boost::bind (&ARDOUR_UI::create_add_video_dialog, this))
+       , add_video_dialog (X_("add-video"), _("Add Video"), boost::bind (&ARDOUR_UI::create_add_video_dialog, this))
        , bundle_manager (X_("bundle-manager"), _("Bundle Manager"), boost::bind (&ARDOUR_UI::create_bundle_manager, this))
        , big_clock_window (X_("big-clock"), _("Big Clock"), boost::bind (&ARDOUR_UI::create_big_clock_window, this))
        , audio_port_matrix (X_("audio-connection-manager"), _("Audio Connections"), boost::bind (&ARDOUR_UI::create_global_port_matrix, this, ARDOUR::DataType::AUDIO))
        , midi_port_matrix (X_("midi-connection-manager"), _("MIDI Connections"), boost::bind (&ARDOUR_UI::create_global_port_matrix, this, ARDOUR::DataType::MIDI))
+       , key_editor (X_("key-editor"), _("Bindings Editor"), boost::bind (&ARDOUR_UI::create_key_editor, this))
        , video_server_process (0)
        , splash (0)
        , have_configure_timeout (false)
@@ -285,16 +292,19 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir, UIConfi
        , _status_bar_visibility (X_("status-bar"))
        , _feedback_exists (false)
        , _log_not_acknowledged (LogLevelNone)
+       , duplicate_routes_dialog (0)
 {
        Gtkmm2ext::init (localedir);
 
+       UIConfiguration::instance().post_gui_init ();
+
        if (ARDOUR::handle_old_configuration_files (boost::bind (ask_about_configuration_copy, _1, _2, _3))) {
                MessageDialog msg (string_compose (_("Your configuration files were copied. You can now restart %1."), PROGRAM_NAME), true);
                msg.run ();
                /* configuration was modified, exit immediately */
                _exit (0);
        }
-       
+
        if (theArdourUI == 0) {
                theArdourUI = this;
        }
@@ -303,10 +313,10 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir, UIConfi
 
        xmlSetGenericErrorFunc (this, libxml_generic_error_func);
        xmlSetStructuredErrorFunc (this, libxml_structured_error_func);
-       
-       ui_config->ParameterChanged.connect (sigc::mem_fun (*this, &ARDOUR_UI::parameter_changed));
+
+       UIConfiguration::instance().ParameterChanged.connect (sigc::mem_fun (*this, &ARDOUR_UI::parameter_changed));
        boost::function<void (string)> pc (boost::bind (&ARDOUR_UI::parameter_changed, this, _1));
-       ui_config->map_parameters (pc);
+       UIConfiguration::instance().map_parameters (pc);
 
        roll_button.set_controllable (roll_controllable);
        stop_button.set_controllable (stop_controllable);
@@ -391,7 +401,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir, UIConfi
        /* we don't like certain modifiers */
        Bindings::set_ignored_state (GDK_LOCK_MASK|GDK_MOD2_MASK|GDK_MOD3_MASK);
 
-       reset_dpi();
+       UIConfiguration::instance().reset_dpi ();
 
        TimeAxisViewItem::set_constant_heights ();
 
@@ -404,24 +414,24 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir, UIConfi
        const XMLNode* ui_xml = Config->extra_xml (X_("UI"));
 
        if (ui_xml) {
-               key_editor.set_state (*ui_xml);
-               rc_option_editor.set_state (*ui_xml);
-               session_option_editor.set_state (*ui_xml);
-               speaker_config_window.set_state (*ui_xml);
-               about.set_state (*ui_xml);
-               add_route_dialog.set_state (*ui_xml);
-               add_video_dialog.set_state (*ui_xml);
-               route_params.set_state (*ui_xml);
-               bundle_manager.set_state (*ui_xml);
-               location_ui.set_state (*ui_xml);
-               big_clock_window.set_state (*ui_xml);
-               audio_port_matrix.set_state (*ui_xml);
-               midi_port_matrix.set_state (*ui_xml);
-               export_video_dialog.set_state (*ui_xml);
-       }
+               key_editor.set_state (*ui_xml, 0);
+               session_option_editor.set_state (*ui_xml, 0);
+               speaker_config_window.set_state (*ui_xml, 0);
+               about.set_state (*ui_xml, 0);
+               add_route_dialog.set_state (*ui_xml, 0);
+               add_video_dialog.set_state (*ui_xml, 0);
+               route_params.set_state (*ui_xml, 0);
+               bundle_manager.set_state (*ui_xml, 0);
+               location_ui.set_state (*ui_xml, 0);
+               big_clock_window.set_state (*ui_xml, 0);
+               audio_port_matrix.set_state (*ui_xml, 0);
+               midi_port_matrix.set_state (*ui_xml, 0);
+               export_video_dialog.set_state (*ui_xml, 0);
+       }
+
+       /* Separate windows */
 
        WM::Manager::instance().register_window (&key_editor);
-       WM::Manager::instance().register_window (&rc_option_editor);
        WM::Manager::instance().register_window (&session_option_editor);
        WM::Manager::instance().register_window (&speaker_config_window);
        WM::Manager::instance().register_window (&about);
@@ -438,12 +448,12 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir, UIConfi
 
        /* Trigger setting up the color scheme and loading the GTK RC file */
 
-       ARDOUR_UI::config()->load_rc_file (false);
-       
+       UIConfiguration::instance().load_rc_file (false);
+
        _process_thread = new ProcessThread ();
        _process_thread->init ();
 
-       DPIReset.connect (sigc::mem_fun (*this, &ARDOUR_UI::resize_text_widgets));
+       UIConfiguration::instance().DPIReset.connect (sigc::mem_fun (*this, &ARDOUR_UI::resize_text_widgets));
 
        attach_to_engine ();
 }
@@ -470,16 +480,19 @@ ARDOUR_UI::engine_stopped ()
        ENSURE_GUI_THREAD (*this, &ARDOUR_UI::engine_stopped)
        ActionManager::set_sensitive (ActionManager::engine_sensitive_actions, false);
        ActionManager::set_sensitive (ActionManager::engine_opposite_sensitive_actions, true);
+       update_sample_rate (0);
+       update_cpu_load ();
 }
 
 void
 ARDOUR_UI::engine_running ()
 {
+       ENSURE_GUI_THREAD (*this, &ARDOUR_UI::engine_running)
        if (first_time_engine_run) {
                post_engine();
                first_time_engine_run = false;
-       } 
-       
+       }
+
        if (_session) {
                _session->reset_xrun_count ();
        }
@@ -488,6 +501,9 @@ ARDOUR_UI::engine_running ()
        update_xrun_count ();
        update_sample_rate (AudioEngine::instance()->sample_rate());
        update_timecode_format ();
+       update_peak_thread_work ();
+       ActionManager::set_sensitive (ActionManager::engine_sensitive_actions, true);
+       ActionManager::set_sensitive (ActionManager::engine_opposite_sensitive_actions, false);
 }
 
 void
@@ -524,10 +540,10 @@ was not fast enough. Try to restart\n\
 the audio backend and save the session."), PROGRAM_NAME);
        }
 
-       MessageDialog msg (*editor, msgstr);
+       MessageDialog msg (_main_window, msgstr);
        pop_back_splash (msg);
        msg.run ();
-       
+
        if (free_reason) {
                free (const_cast<char*> (reason));
        }
@@ -548,7 +564,7 @@ ARDOUR_UI::post_engine ()
 #endif
 
        ARDOUR::init_post_engine ();
-       
+
        /* connect to important signals */
 
        AudioEngine::instance()->Stopped.connect (forever_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::engine_stopped, this), gui_context());
@@ -557,8 +573,6 @@ ARDOUR_UI::post_engine ()
        AudioEngine::instance()->Halted.connect_same_thread (halt_connection, boost::bind (&ARDOUR_UI::engine_halted, this, _1, false));
        AudioEngine::instance()->BecameSilent.connect (forever_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::audioengine_became_silent, this), gui_context());
 
-       _tooltips.enable();
-
        if (setup_windows ()) {
                throw failed_constructor ();
        }
@@ -568,25 +582,35 @@ ARDOUR_UI::post_engine ()
        if (n) {
                _status_bar_visibility.set_state (*n);
        }
-       
+
        check_memory_locking();
 
-       /* this is the first point at which all the keybindings are available */
+       /* this is the first point at which all the possible actions are
+        * available, because some of the available actions are dependent on
+        * aspects of the engine/backend.
+        */
 
        if (ARDOUR_COMMAND_LINE::show_key_actions) {
-               vector<string> names;
+
+
                vector<string> paths;
+               vector<string> labels;
                vector<string> tooltips;
                vector<string> keys;
-               vector<AccelKey> bindings;
+               vector<Glib::RefPtr<Gtk::Action> > actions;
 
-               ActionManager::get_all_actions (names, paths, tooltips, keys, bindings);
+               Gtkmm2ext::ActionMap::get_all_actions (paths, labels, tooltips, keys, actions);
 
-               vector<string>::iterator n;
                vector<string>::iterator k;
                vector<string>::iterator p;
-               for (n = names.begin(), k = keys.begin(), p = paths.begin(); n != names.end(); ++n, ++k, ++p) {
-                       cout << "Action: '" << (*n) << "' bound to '" << (*k) << "' Path: '" << (*p) << "'" << endl;
+
+               for (p = paths.begin(), k = keys.begin(); p != paths.end(); ++k, ++p) {
+
+                       if ((*k).empty()) {
+                               cout << *p << endl;
+                       } else {
+                               cout << *p << " => " << *k << endl;
+                       }
                }
 
                halt_connection.disconnect ();
@@ -601,13 +625,8 @@ ARDOUR_UI::post_engine ()
 
        /* set default clock modes */
 
-       if (Profile->get_sae()) {
-               primary_clock->set_mode (AudioClock::BBT);
-               secondary_clock->set_mode (AudioClock::MinSec);
-       }  else {
-               primary_clock->set_mode (AudioClock::Timecode);
-               secondary_clock->set_mode (AudioClock::BBT);
-       }
+       primary_clock->set_mode (AudioClock::Timecode);
+       secondary_clock->set_mode (AudioClock::BBT);
 
        /* start the time-of-day-clock */
 
@@ -623,13 +642,13 @@ ARDOUR_UI::post_engine ()
                boost::function<void (string)> pc (boost::bind (&ARDOUR_UI::parameter_changed, this, _1));
                Config->map_parameters (pc);
 
-               ui_config->map_parameters (pc);
+               UIConfiguration::instance().map_parameters (pc);
        }
 }
 
 ARDOUR_UI::~ARDOUR_UI ()
 {
-       ui_config->save_state();
+       UIConfiguration::instance().save_state();
 
        stop_video_server();
 
@@ -639,9 +658,23 @@ ARDOUR_UI::~ARDOUR_UI ()
                delete primary_clock;
                delete secondary_clock;
                delete _process_thread;
+               delete meterbridge;
+               delete editor;
+               delete mixer;
+               delete nsm;
                delete gui_object_state;
                FastMeter::flush_pattern_cache ();
+               PixFader::flush_pattern_cache ();
        }
+
+#ifndef NDEBUG
+       /* Small trick to flush main-thread event pool.
+        * Other thread-pools are destroyed at pthread_exit(),
+        * but tmain thread termination is too late to trigger Pool::~Pool()
+        */
+       SessionEvent* ev = new SessionEvent (SessionEvent::SetTransportSpeed, SessionEvent::Clear, SessionEvent::Immediate, 0, 0); // get the pool reference, values don't matter since the event is never queued.
+       delete ev->event_pool();
+#endif
 }
 
 void
@@ -773,10 +806,15 @@ ARDOUR_UI::autosave_session ()
 }
 
 void
-ARDOUR_UI::update_autosave ()
+ARDOUR_UI::session_dirty_changed ()
 {
-       ENSURE_GUI_THREAD (*this, &ARDOUR_UI::update_autosave)
+       update_autosave ();
+       update_title ();
+}
 
+void
+ARDOUR_UI::update_autosave ()
+{
        if (_session && _session->dirty()) {
                if (_autosave_connection.connected()) {
                        _autosave_connection.disconnect();
@@ -807,20 +845,19 @@ ARDOUR_UI::check_announcements ()
 #endif
        _annc_filename.append (VERSIONSTRING);
 
+       _announce_string = "";
+
        std::string path = Glib::build_filename (user_config_directory(), _annc_filename);
        FILE* fin = g_fopen (path.c_str(), "rb");
-
        if (fin) {
-               std::ifstream announce_file (fin);
-
-               if ( announce_file.fail() )
-                       _announce_string = "";
-               else {
-                       std::stringstream oss;
-                       oss << announce_file.rdbuf();
-                       _announce_string = oss.str();
+               while (!feof (fin)) {
+                       char tmp[1024];
+                       size_t len;
+                       if ((len = fread (tmp, sizeof(char), 1024, fin)) == 0 || ferror (fin)) {
+                               break;
+                       }
+                       _announce_string.append (tmp, len);
                }
-
                fclose (fin);
        }
 
@@ -828,6 +865,13 @@ ARDOUR_UI::check_announcements ()
 #endif
 }
 
+static bool
+_hide_splash (gpointer arg)
+{
+       ((ARDOUR_UI*)arg)->hide_splash();
+       return false;
+}
+
 int
 ARDOUR_UI::starting ()
 {
@@ -847,7 +891,7 @@ ARDOUR_UI::starting ()
        /* we need to create this early because it may need to set the
         *  audio backend end up.
         */
-       
+
        try {
                audio_midi_setup.get (true);
        } catch (...) {
@@ -928,7 +972,7 @@ ARDOUR_UI::starting ()
                }
 
        } else  {
-               
+
                if (brand_new_user) {
                        _initial_verbose_plugin_scan = true;
                        ArdourStartup s;
@@ -950,16 +994,16 @@ ARDOUR_UI::starting ()
                ARDOUR::read_recent_sessions (rs);
 
                string path = Glib::build_filename (user_config_directory(), ".iknowaboutfreeversion");
-               
+
                if (!Glib::file_test (path, Glib::FILE_TEST_EXISTS) && !rs.empty()) {
-                       
+
                        /* already used Ardour, have sessions ... warn about plugin state */
-                       
+
                        ArdourDialog d (_("Free/Demo Version Warning"), true);
                        Label l;
                        Button b (string_compose (_("Subscribe and support development of %1"), PROGRAM_NAME));
                        CheckButton c (_("Don't warn me about this again"));
-                       
+
                        l.set_markup (string_compose (_("<span weight=\"bold\" size=\"large\">%1</span>\n\n<b>%2</b>\n\n<i>%3</i>\n\n%4"),
                                                      string_compose (_("This is a free/demo version of %1"), PROGRAM_NAME),
                                                      _("It will not restore OR save any plugin settings"),
@@ -968,26 +1012,26 @@ ARDOUR_UI::starting ()
                                                      _("To get full access to updates without this limitation\n"
                                                        "consider becoming a subscriber for a low cost every month.")));
                        l.set_justify (JUSTIFY_CENTER);
-                       
+
                        b.signal_clicked().connect (mem_fun(*this, &ARDOUR_UI::launch_subscribe));
-                       
+
                        d.get_vbox()->pack_start (l, true, true);
                        d.get_vbox()->pack_start (b, false, false, 12);
                        d.get_vbox()->pack_start (c, false, false, 12);
-                       
+
                        d.add_button (_("Quit now"), RESPONSE_CANCEL);
                        d.add_button (string_compose (_("Continue using %1"), PROGRAM_NAME), RESPONSE_OK);
-                       
+
                        d.show_all ();
 
                        c.signal_toggled().connect (sigc::hide_return (sigc::bind (sigc::ptr_fun (toggle_file_existence), path)));
-                       
+
                        if (d.run () != RESPONSE_OK) {
                                _exit (0);
                        }
                }
 #endif
-                       
+
                /* go get a session */
 
                const bool new_session_required = (ARDOUR_COMMAND_LINE::new_session || brand_new_user);
@@ -1000,8 +1044,6 @@ ARDOUR_UI::starting ()
 
        use_config ();
 
-       goto_editor_window ();
-
        WM::Manager::instance().show_visible ();
 
        /* We have to do this here since goto_editor_window() ends up calling show_all() on the
@@ -1010,6 +1052,14 @@ ARDOUR_UI::starting ()
        _status_bar_visibility.update ();
 
        BootMessage (string_compose (_("%1 is ready for use"), PROGRAM_NAME));
+
+       if (splash && splash->is_visible()) {
+               // in 1 second, hide the splash screen
+               Glib::signal_timeout().connect (sigc::bind (sigc::ptr_fun (_hide_splash), this), 1000);
+       }
+
+       /* all other dialogs are created conditionally */
+
        return 0;
 }
 
@@ -1056,7 +1106,7 @@ ARDOUR_UI::check_memory_locking ()
                                                  "runs out of memory. \n\n"
                                                  "You can view the memory limit with 'ulimit -l', "
                                                  "and it is normally controlled by %2"),
-                                               PROGRAM_NAME, 
+                                               PROGRAM_NAME,
 #ifdef __FreeBSD__
                                                X_("/etc/login.conf")
 #else
@@ -1077,7 +1127,6 @@ ARDOUR_UI::check_memory_locking ()
 
                                pop_back_splash (msg);
 
-                               editor->ensure_float (msg);
                                msg.run ();
 
                                if (cb.get_active()) {
@@ -1123,7 +1172,7 @@ ARDOUR_UI::finish()
                                /* use the default name */
                                if (save_state_canfail ("")) {
                                        /* failed - don't quit */
-                                       MessageDialog msg (*editor,
+                                       MessageDialog msg (_main_window,
                                                           string_compose (_("\
 %1 was unable to save your session.\n\n\
 If you still wish to quit, please use the\n\n\
@@ -1247,6 +1296,7 @@ ARDOUR_UI::every_second ()
        update_buffer_load ();
        update_disk_space ();
        update_timecode_format ();
+       update_peak_thread_work ();
 
        if (nsm && nsm->is_active ()) {
                nsm->check ();
@@ -1274,10 +1324,10 @@ ARDOUR_UI::every_point_zero_something_seconds ()
 {
        // august 2007: actual update frequency: 25Hz (40ms), not 100Hz
 
-       if (editor_meter && ARDOUR_UI::config()->get_show_editor_meter()) {
+       if (editor_meter && UIConfiguration::instance().get_show_editor_meter()) {
                float mpeak = editor_meter->update_meters();
                if (mpeak > editor_meter_max_peak) {
-                       if (mpeak >= ARDOUR_UI::config()->get_meter_peak()) {
+                       if (mpeak >= UIConfiguration::instance().get_meter_peak()) {
                                editor_meter_peak_display.set_active_state ( Gtkmm2ext::ExplicitActive );
                        }
                }
@@ -1383,10 +1433,16 @@ ARDOUR_UI::update_format ()
        case RF64:
                s << _("RF64");
                break;
+       case RF64_WAV:
+               s << _("RF64/WAV");
+               break;
+       case MBWF:
+               s << _("MBWF");
+               break;
        }
 
        s << " ";
-       
+
        switch (_session->config.get_native_file_data_format ()) {
        case FormatFloat:
                s << _("32-float");
@@ -1441,6 +1497,19 @@ ARDOUR_UI::update_cpu_load ()
        cpu_load_label.set_markup (buf);
 }
 
+void
+ARDOUR_UI::update_peak_thread_work ()
+{
+       char buf[64];
+       const int c = SourceFactory::peak_work_queue_length ();
+       if (c > 0) {
+               snprintf (buf, sizeof (buf), _("PkBld: <span foreground=\"%s\">%d</span>"), c >= 2 ? X_("red") : X_("green"), c);
+               peak_thread_work_label.set_markup (buf);
+       } else {
+               peak_thread_work_label.set_markup (X_(""));
+       }
+}
+
 void
 ARDOUR_UI::update_buffer_load ()
 {
@@ -1452,7 +1521,7 @@ ARDOUR_UI::update_buffer_load ()
        /* If this text is changed, the set_size_request_to_display_given_text call in ARDOUR_UI::resize_text_widgets
           should also be changed.
        */
-       
+
        if (_session) {
                snprintf (
                        buf, sizeof (buf),
@@ -1523,9 +1592,9 @@ ARDOUR_UI::update_disk_space()
                        mins = frames / (fr * 60);
                        frames -= mins * fr * 60;
                        secs = frames / fr;
-                       
+
                        bool const low = (hrs == 0 && mins <= 30);
-                       
+
                        snprintf (
                                buf, sizeof(buf),
                                _("Disk: <span foreground=\"%s\">%02dh:%02dm:%02ds</span>"),
@@ -1553,7 +1622,7 @@ ARDOUR_UI::update_timecode_format ()
                } else {
                        matching = true;
                }
-                       
+
                snprintf (buf, sizeof (buf), S_("Timecode|TC: <span foreground=\"%s\">%s</span>"),
                          matching ? X_("green") : X_("red"),
                          Timecode::timecode_format_name (_session->config.get_timecode_format()).c_str());
@@ -1562,7 +1631,7 @@ ARDOUR_UI::update_timecode_format ()
        }
 
        timecode_format_label.set_markup (buf);
-}      
+}
 
 gint
 ARDOUR_UI::update_wall_clock ()
@@ -1583,171 +1652,40 @@ ARDOUR_UI::update_wall_clock ()
        return TRUE;
 }
 
-void
-ARDOUR_UI::redisplay_recent_sessions ()
-{
-       std::vector<std::string> session_directories;
-       RecentSessionsSorter cmp;
-
-       recent_session_display.set_model (Glib::RefPtr<TreeModel>(0));
-       recent_session_model->clear ();
-
-       ARDOUR::RecentSessions rs;
-       ARDOUR::read_recent_sessions (rs);
-
-       if (rs.empty()) {
-               recent_session_display.set_model (recent_session_model);
-               return;
-       }
-
-       // sort them alphabetically
-       sort (rs.begin(), rs.end(), cmp);
-
-       for (ARDOUR::RecentSessions::iterator i = rs.begin(); i != rs.end(); ++i) {
-               session_directories.push_back ((*i).second);
-       }
-
-       for (vector<std::string>::const_iterator i = session_directories.begin();
-                       i != session_directories.end(); ++i)
-       {
-               std::vector<std::string> state_file_paths;
-
-               // now get available states for this session
-
-               get_state_files_in_directory (*i, state_file_paths);
-
-               vector<string> states;
-               vector<const gchar*> item;
-               string fullpath = *i;
-
-               /* remove any trailing / */
-
-               if (fullpath[fullpath.length() - 1] == '/') {
-                       fullpath = fullpath.substr (0, fullpath.length() - 1);
-               }
-
-               /* check whether session still exists */
-               if (!Glib::file_test(fullpath.c_str(), Glib::FILE_TEST_EXISTS)) {
-                       /* session doesn't exist */
-                       continue;
-               }
-
-               /* now get available states for this session */
-               states = Session::possible_states (fullpath);
-
-               if (states.empty()) {
-                       /* no state file? */
-                       continue;
-               }
-
-               std::vector<string> state_file_names(get_file_names_no_extension (state_file_paths));
-
-               Gtk::TreeModel::Row row = *(recent_session_model->append());
-
-               row[recent_session_columns.fullpath] = fullpath;
-               row[recent_session_columns.tip] = Glib::Markup::escape_text (fullpath);
-
-               if (state_file_names.size() > 1) {
-                       // multiple session files in the session directory - show the directory name.
-                       row[recent_session_columns.visible_name] = Glib::path_get_basename (fullpath);
-
-                       // add the children
-                       for (std::vector<std::string>::iterator i2 = state_file_names.begin();
-                                       i2 != state_file_names.end(); ++i2)
-                       {
-
-                               Gtk::TreeModel::Row child_row = *(recent_session_model->append (row.children()));
-
-                               child_row[recent_session_columns.visible_name] = *i2;
-                               child_row[recent_session_columns.fullpath] = fullpath;
-                               child_row[recent_session_columns.tip] = Glib::Markup::escape_text (fullpath);
-                       }
-               } else {
-                       // only a single session file in the directory - show its actual name.
-                       row[recent_session_columns.visible_name] = state_file_names.front ();
-               }
-       }
-
-       recent_session_display.set_tooltip_column(1); // recent_session_columns.tip
-       recent_session_display.set_model (recent_session_model);
-}
-
-void
-ARDOUR_UI::build_session_selector ()
-{
-       session_selector_window = new ArdourDialog (_("Recent Sessions"));
-
-       Gtk::ScrolledWindow *scroller = manage (new Gtk::ScrolledWindow);
-
-       session_selector_window->add_button (Stock::CANCEL, RESPONSE_CANCEL);
-       session_selector_window->add_button (Stock::OPEN, RESPONSE_ACCEPT);
-       session_selector_window->set_default_response (RESPONSE_ACCEPT);
-       recent_session_model = TreeStore::create (recent_session_columns);
-       recent_session_display.set_model (recent_session_model);
-       recent_session_display.append_column (_("Recent Sessions"), recent_session_columns.visible_name);
-       recent_session_display.set_headers_visible (false);
-       recent_session_display.get_selection()->set_mode (SELECTION_BROWSE);
-       recent_session_display.signal_row_activated().connect (sigc::mem_fun (*this, &ARDOUR_UI::recent_session_row_activated));
-
-       scroller->add (recent_session_display);
-       scroller->set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
-
-       session_selector_window->set_name ("SessionSelectorWindow");
-       session_selector_window->set_size_request (200, 400);
-       session_selector_window->get_vbox()->pack_start (*scroller);
-
-       recent_session_display.show();
-       scroller->show();
-}
-
-void
-ARDOUR_UI::recent_session_row_activated (const TreePath& /*path*/, TreeViewColumn* /*col*/)
-{
-       session_selector_window->response (RESPONSE_ACCEPT);
-}
-
 void
 ARDOUR_UI::open_recent_session ()
 {
        bool can_return = (_session != 0);
 
-       if (session_selector_window == 0) {
-               build_session_selector ();
-       }
-
-       redisplay_recent_sessions ();
+       SessionDialog recent_session_dialog;
 
        while (true) {
 
-               ResponseType r = (ResponseType) session_selector_window->run ();
+               ResponseType r = (ResponseType) recent_session_dialog.run ();
 
                switch (r) {
                case RESPONSE_ACCEPT:
                        break;
                default:
                        if (can_return) {
-                               session_selector_window->hide();
+                               recent_session_dialog.hide();
                                return;
                        } else {
                                exit (1);
                        }
                }
 
-               if (recent_session_display.get_selection()->count_selected_rows() == 0) {
-                       continue;
-               }
+               recent_session_dialog.hide();
 
-               session_selector_window->hide();
+               bool should_be_new;
 
-               Gtk::TreeModel::iterator i = recent_session_display.get_selection()->get_selected();
+               std::string path = recent_session_dialog.session_folder();
+               std::string state = recent_session_dialog.session_name (should_be_new);
 
-               if (i == recent_session_model->children().end()) {
-                       return;
+               if (should_be_new == true) {
+                       continue;
                }
 
-               std::string path = (*i)[recent_session_columns.fullpath];
-               std::string state = (*i)[recent_session_columns.visible_name];
-
                _session_is_new = false;
 
                if (load_session (path, state) == 0) {
@@ -1759,12 +1697,12 @@ ARDOUR_UI::open_recent_session ()
 }
 
 bool
-ARDOUR_UI::check_audioengine ()
+ARDOUR_UI::check_audioengine (Gtk::Window& parent)
 {
        if (!AudioEngine::instance()->connected()) {
-               MessageDialog msg (string_compose (
-                                          _("%1 is not connected to any audio backend.\n"
-                                            "You cannot open or close sessions in this condition"),
+               MessageDialog msg (parent, string_compose (
+                                          _("%1 is not connected to any audio backend.\n"
+                                            "You cannot open or close sessions in this condition"),
                                           PROGRAM_NAME));
                pop_back_splash (msg);
                msg.run ();
@@ -1776,9 +1714,8 @@ ARDOUR_UI::check_audioengine ()
 void
 ARDOUR_UI::open_session ()
 {
-       if (!check_audioengine()) {
+       if (!check_audioengine (_main_window)) {
                return;
-
        }
 
        /* ardour sessions are folders */
@@ -1787,8 +1724,6 @@ ARDOUR_UI::open_session ()
        open_session_selector.add_button (Gtk::Stock::OPEN, Gtk::RESPONSE_ACCEPT);
        open_session_selector.set_default_response(Gtk::RESPONSE_ACCEPT);
 
-
-
        if (_session) {
                string session_parent_dir = Glib::path_get_dirname(_session->path());
                open_session_selector.set_current_folder(session_parent_dir);
@@ -1796,11 +1731,9 @@ ARDOUR_UI::open_session ()
                open_session_selector.set_current_folder(Config->get_default_session_parent_dir());
        }
 
+       Gtkmm2ext::add_volume_shortcuts (open_session_selector);
        try {
                /* add_shortcut_folder throws an exception if the folder being added already has a shortcut */
-#ifdef GTKOSX
-               open_session_selector.add_shortcut_folder_uri("file:///Volumes");
-#endif
                string default_session_folder = Config->get_default_session_parent_dir();
                open_session_selector.add_shortcut_folder (default_session_folder);
        }
@@ -1817,6 +1750,10 @@ ARDOUR_UI::open_session ()
        int response = open_session_selector.run();
        open_session_selector.hide ();
 
+       if (response == Gtk::RESPONSE_CANCEL) {
+               return;
+       }
+
        string session_path = open_session_selector.get_filename();
        string path, name;
        bool isnew;
@@ -1831,7 +1768,7 @@ ARDOUR_UI::open_session ()
 
 
 void
-ARDOUR_UI::session_add_mixed_track (const ChanCount& input, const ChanCount& output, RouteGroup* route_group, 
+ARDOUR_UI::session_add_mixed_track (const ChanCount& input, const ChanCount& output, RouteGroup* route_group,
                                    uint32_t how_many, const string& name_template, PluginInfoPtr instrument)
 {
        list<boost::shared_ptr<MidiTrack> > tracks;
@@ -1843,14 +1780,14 @@ ARDOUR_UI::session_add_mixed_track (const ChanCount& input, const ChanCount& out
 
        try {
                tracks = _session->new_midi_track (input, output, instrument, ARDOUR::Normal, route_group, how_many, name_template);
-               
+
                if (tracks.size() != how_many) {
                        error << string_compose(P_("could not create %1 new mixed track", "could not create %1 new mixed tracks", how_many), how_many) << endmsg;
                }
        }
 
        catch (...) {
-               MessageDialog msg (*editor,
+               MessageDialog msg (_main_window,
                                   string_compose (_("There are insufficient ports available\n\
 to create a new track or bus.\n\
 You should save %1, exit and\n\
@@ -1858,7 +1795,7 @@ restart with more ports."), PROGRAM_NAME));
                msg.run ();
        }
 }
-       
+
 
 void
 ARDOUR_UI::session_add_midi_route (bool disk, RouteGroup* route_group, uint32_t how_many, const string& name_template, PluginInfoPtr instrument)
@@ -1895,7 +1832,7 @@ ARDOUR_UI::session_add_audio_route (
                        tracks = _session->new_audio_track (input_channels, output_channels, mode, route_group, how_many, name_template);
 
                        if (tracks.size() != how_many) {
-                               error << string_compose (P_("could not create %1 new audio track", "could not create %1 new audio tracks", how_many), how_many) 
+                               error << string_compose (P_("could not create %1 new audio track", "could not create %1 new audio tracks", how_many), how_many)
                                      << endmsg;
                        }
 
@@ -1911,7 +1848,7 @@ ARDOUR_UI::session_add_audio_route (
        }
 
        catch (...) {
-               MessageDialog msg (*editor,
+               MessageDialog msg (_main_window,
                                   string_compose (_("There are insufficient ports available\n\
 to create a new track or bus.\n\
 You should save %1, exit and\n\
@@ -1964,9 +1901,9 @@ ARDOUR_UI::transport_goto_wallclock ()
 
                time (&now);
                localtime_r (&now, &tmnow);
-               
+
                framecnt_t frame_rate = _session->frame_rate();
-               
+
                if (frame_rate == 0) {
                        /* no frame rate available */
                        return;
@@ -2022,7 +1959,7 @@ ARDOUR_UI::transport_stop ()
 
 /** Check if any tracks are record enabled. If none are, record enable all of them.
  * @return true if track record-enabled status was changed, false otherwise.
- */  
+ */
 bool
 ARDOUR_UI::trx_record_enable_all_tracks ()
 {
@@ -2045,7 +1982,7 @@ ARDOUR_UI::trx_record_enable_all_tracks ()
 
        if (none_record_enabled) {
                _session->set_record_enabled (rl, true, Session::rt_cleanup);
-       } 
+       }
 
        return none_record_enabled;
 }
@@ -2057,7 +1994,7 @@ ARDOUR_UI::transport_record (bool roll)
                switch (_session->record_status()) {
                case Session::Disabled:
                        if (_session->ntracks() == 0) {
-                               MessageDialog msg (*editor, _("Please create one or more tracks before trying to record.\nYou can do this with the \"Add Track or Bus\" option in the Session menu."));
+                               MessageDialog msg (_main_window, _("Please create one or more tracks before trying to record.\nYou can do this with the \"Add Track or Bus\" option in the Session menu."));
                                msg.run ();
                                return;
                        }
@@ -2126,7 +2063,7 @@ ARDOUR_UI::transport_roll ()
                                /* stop loop playback but keep rolling */
                                _session->request_play_loop (false, false);
                        }
-               } 
+               }
 
        } else if (_session->get_play_range () ) {
                /* stop playing a range if we currently are */
@@ -2173,17 +2110,26 @@ ARDOUR_UI::toggle_roll (bool with_abort, bool roll_out_of_bounded_mode)
        if (rolling && roll_out_of_bounded_mode) {
                /* drop out of loop/range playback but leave transport rolling */
                if (_session->get_play_loop()) {
-                       if (Config->get_seamless_loop()) {
-                               /* the disk buffers contain copies of the loop - we can't
-                                  just keep playing, so stop the transport. the user
-                                  can restart as they wish.
-                               */
-                               affect_transport = true;
+                       if (_session->actively_recording()) {
+
+                               /* just stop using the loop, then actually stop
+                                * below
+                                */
+                               _session->request_play_loop (false, affect_transport);
+
                        } else {
-                               /* disk buffers are normal, so we can keep playing */
-                               affect_transport = false;
+                               if (Config->get_seamless_loop()) {
+                                       /* the disk buffers contain copies of the loop - we can't
+                                          just keep playing, so stop the transport. the user
+                                          can restart as they wish.
+                                       */
+                                       affect_transport = true;
+                               } else {
+                                       /* disk buffers are normal, so we can keep playing */
+                                       affect_transport = false;
+                               }
+                               _session->request_play_loop (false, affect_transport);
                        }
-                       _session->request_play_loop (false, affect_transport);
                } else if (_session->get_play_range ()) {
                        affect_transport = false;
                        _session->request_play_range (0, true);
@@ -2194,7 +2140,12 @@ ARDOUR_UI::toggle_roll (bool with_abort, bool roll_out_of_bounded_mode)
                if (rolling) {
                        _session->request_stop (with_abort, true);
                } else {
-                       if (ARDOUR_UI::config()->get_follow_edits() && ( editor->get_selection().time.front().start == _session->transport_frame() ) ) {  //if playhead is exactly at the start of a range, we can assume it was placed there by follow_edits
+                       /* the only external sync condition we can be in here
+                        * would be Engine (JACK) sync, in which case we still
+                        * want to do this.
+                        */
+
+                       if (UIConfiguration::instance().get_follow_edits() && ( editor->get_selection().time.front().start == _session->transport_frame() ) ) {  //if playhead is exactly at the start of a range, we can assume it was placed there by follow_edits
                                _session->request_play_range (&editor->get_selection().time, true);
                                _session->set_requested_return_frame( editor->get_selection().time.front().start );  //force an auto-return here
                        }
@@ -2206,9 +2157,13 @@ ARDOUR_UI::toggle_roll (bool with_abort, bool roll_out_of_bounded_mode)
 void
 ARDOUR_UI::toggle_session_auto_loop ()
 {
+       if (!_session) {
+               return;
+       }
+
        Location * looploc = _session->locations()->auto_loop_location();
 
-       if (!_session || !looploc) {
+       if (!looploc) {
                return;
        }
 
@@ -2232,7 +2187,7 @@ ARDOUR_UI::toggle_session_auto_loop ()
                        _session->request_play_loop (true, true);
                }
        }
-       
+
        //show the loop markers
        looploc->set_hidden (false, this);
 }
@@ -2261,7 +2216,7 @@ ARDOUR_UI::transport_rewind (int option)
 {
        float current_transport_speed;
 
-               if (_session) {
+       if (_session) {
                current_transport_speed = _session->transport_speed();
 
                if (current_transport_speed >= 0.0f) {
@@ -2289,9 +2244,9 @@ ARDOUR_UI::transport_forward (int option)
        if (!_session) {
                return;
        }
-       
+
        float current_transport_speed = _session->transport_speed();
-       
+
        if (current_transport_speed <= 0.0f) {
                switch (option) {
                case 0:
@@ -2321,10 +2276,10 @@ ARDOUR_UI::toggle_record_enable (uint32_t rid)
 
        if ((r = _session->route_by_remote_id (rid)) != 0) {
 
-               Track* t;
+               boost::shared_ptr<Track> t;
 
-               if ((t = dynamic_cast<Track*>(r.get())) != 0) {
-                       t->set_record_enabled (!t->record_enabled(), this);
+               if ((t = boost::dynamic_pointer_cast<Track>(r)) != 0) {
+                       t->set_record_enabled (!t->record_enabled(), Controllable::UseGroup);
                }
        }
 }
@@ -2371,7 +2326,7 @@ ARDOUR_UI::map_transport_state ()
                        auto_loop_button.set_active (false);
                }
 
-               if (ARDOUR_UI::config()->get_follow_edits()) {
+               if (UIConfiguration::instance().get_follow_edits() && !_session->config.get_external_sync()) {
                        /* light up both roll and play-selection if they are joined */
                        roll_button.set_active (true);
                        play_selection_button.set_active (true);
@@ -2417,7 +2372,7 @@ ARDOUR_UI::update_clocks ()
 void
 ARDOUR_UI::start_clocking ()
 {
-       if (ui_config->get_super_rapid_clock_update()) {
+       if (UIConfiguration::instance().get_super_rapid_clock_update()) {
                clock_signal_connection = Timers::fps_connect (sigc::mem_fun(*this, &ARDOUR_UI::update_clocks));
        } else {
                clock_signal_connection = Timers::rapid_connect (sigc::mem_fun(*this, &ARDOUR_UI::update_clocks));
@@ -2441,7 +2396,7 @@ ARDOUR_UI::save_as_progress_update (float fraction, int64_t cnt, int64_t total,
        bar->set_fraction (fraction);
 
        /* process events, redraws, etc. */
-       
+
        while (gtk_events_pending()) {
                gtk_main_iteration ();
        }
@@ -2465,16 +2420,16 @@ ARDOUR_UI::save_session_as ()
        int response = save_as_dialog->run ();
 
        save_as_dialog->hide ();
-       
+
        switch (response) {
        case Gtk::RESPONSE_OK:
                break;
        default:
                return;
        }
-       
-       
-       Session::SaveAs sa;
+
+
+       Session::SaveAs sa;
 
        sa.new_parent_folder = save_as_dialog->new_parent_folder ();
        sa.new_name = save_as_dialog->new_name ();
@@ -2488,14 +2443,14 @@ ARDOUR_UI::save_session_as ()
           will be very fast because we're only talking about a few kB's to
           perhaps a couple of MB's of data.
        */
-       
+
        ArdourDialog progress_dialog (_("Save As"), true);
 
        if (sa.include_media && sa.copy_media) {
-               
+
                Gtk::Label label;
                Gtk::ProgressBar progress_bar;
-               
+
                progress_dialog.get_vbox()->pack_start (label);
                progress_dialog.get_vbox()->pack_start (progress_bar);
                label.show ();
@@ -2506,15 +2461,15 @@ ARDOUR_UI::save_session_as ()
                 * complete (in terms of total data to copy), the number of files
                 * copied so far, and the total number to copy.
                 */
-               
+
                ScopedConnection c;
-               
+
                sa.Progress.connect_same_thread (c, boost::bind (&ARDOUR_UI::save_as_progress_update, this, _1, _2, _3, &label, &progress_bar));
-               
+
                progress_dialog.show_all ();
                progress_dialog.present ();
        }
-       
+
        if (_session->save_as (sa)) {
                /* ERROR MESSAGE */
                MessageDialog msg (string_compose (_("Save As failed: %1"), sa.failure_message));
@@ -2527,6 +2482,62 @@ ARDOUR_UI::save_session_as ()
        }
 }
 
+void
+ARDOUR_UI::quick_snapshot_session (bool switch_to_it)
+{
+               char timebuf[128];
+               time_t n;
+               struct tm local_time;
+
+               time (&n);
+               localtime_r (&n, &local_time);
+               strftime (timebuf, sizeof(timebuf), "%FT%H.%M.%S", &local_time);
+
+               save_state (timebuf, switch_to_it);
+}
+
+
+bool
+ARDOUR_UI::process_snapshot_session_prompter (ArdourPrompter& prompter, bool switch_to_it)
+{
+       string snapname;
+
+       prompter.get_result (snapname);
+
+       bool do_save = (snapname.length() != 0);
+
+       if (do_save) {
+               char illegal = Session::session_name_is_legal(snapname);
+               if (illegal) {
+                       MessageDialog msg (string_compose (_("To ensure compatibility with various systems\n"
+                                            "snapshot names may not contain a '%1' character"), illegal));
+                       msg.run ();
+                       return false;
+               }
+       }
+
+       vector<std::string> p;
+       get_state_files_in_directory (_session->session_directory().root_path(), p);
+       vector<string> n = get_file_names_no_extension (p);
+
+       if (find (n.begin(), n.end(), snapname) != n.end()) {
+
+               do_save = overwrite_file_dialog (prompter,
+                                                _("Confirm Snapshot Overwrite"),
+                                                _("A snapshot already exists with that name. Do you want to overwrite it?"));
+       }
+
+       if (do_save) {
+               save_state (snapname, switch_to_it);
+       }
+       else {
+               return false;
+       }
+
+       return true;
+}
+
+
 /** Ask the user for the name of a new snapshot and then take it.
  */
 
@@ -2534,7 +2545,6 @@ void
 ARDOUR_UI::snapshot_session (bool switch_to_it)
 {
        ArdourPrompter prompter (true);
-       string snapname;
 
        prompter.set_name ("Prompter");
        prompter.add_button (Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT);
@@ -2546,7 +2556,9 @@ ARDOUR_UI::snapshot_session (bool switch_to_it)
                prompter.set_prompt (_("Name of new snapshot"));
        }
 
-       if (!switch_to_it) {
+       if (switch_to_it) {
+               prompter.set_initial_text (_session->snap_name());
+       } else {
                char timebuf[128];
                time_t n;
                struct tm local_time;
@@ -2557,49 +2569,19 @@ ARDOUR_UI::snapshot_session (bool switch_to_it)
                prompter.set_initial_text (timebuf);
        }
 
-  again:
-       switch (prompter.run()) {
-       case RESPONSE_ACCEPT:
-       {
-               prompter.get_result (snapname);
-
-               bool do_save = (snapname.length() != 0);
-
-               if (do_save) {
-                       char illegal = Session::session_name_is_legal(snapname);
-                       if (illegal) {
-                               MessageDialog msg (string_compose (_("To ensure compatibility with various systems\n"
-                                                    "snapshot names may not contain a '%1' character"), illegal));
-                               msg.run ();
-                               goto again;
-                       }
-               }
-
-               vector<std::string> p;
-               get_state_files_in_directory (_session->session_directory().root_path(), p);
-               vector<string> n = get_file_names_no_extension (p);
-               if (find (n.begin(), n.end(), snapname) != n.end()) {
-
-                       ArdourDialog confirm (_("Confirm Snapshot Overwrite"), true);
-                       Label m (_("A snapshot already exists with that name.  Do you want to overwrite it?"));
-                       confirm.get_vbox()->pack_start (m, true, true);
-                       confirm.add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
-                       confirm.add_button (_("Overwrite"), Gtk::RESPONSE_ACCEPT);
-                       confirm.show_all ();
-                       switch (confirm.run()) {
-                       case RESPONSE_CANCEL:
-                               do_save = false;
-                       }
+       bool finished = false;
+       while (!finished) {
+               switch (prompter.run()) {
+               case RESPONSE_ACCEPT:
+               {
+                       finished = process_snapshot_session_prompter (prompter, switch_to_it);
+                       break;
                }
 
-               if (do_save) {
-                       save_state (snapname, switch_to_it);
+               default:
+                       finished = true;
+                       break;
                }
-               break;
-       }
-
-       default:
-               break;
        }
 }
 
@@ -2657,7 +2639,7 @@ ARDOUR_UI::rename_session ()
                        }
                        }
                }
-               
+
                break;
        }
 
@@ -2669,6 +2651,10 @@ ARDOUR_UI::rename_session ()
 void
 ARDOUR_UI::save_state (const string & name, bool switch_to_it)
 {
+       if (!_session || _session->deletion_in_progress()) {
+               return;
+       }
+
        XMLNode* node = new XMLNode (X_("UI"));
 
        WM::Manager::instance().add_state (*node);
@@ -2690,10 +2676,6 @@ ARDOUR_UI::save_state_canfail (string name, bool switch_to_it)
        if (_session) {
                int ret;
 
-               if (name.length() == 0) {
-                       name = _session->snap_name();
-               }
-
                if ((ret = _session->save_state (name, false, switch_to_it)) != 0) {
                        return ret;
                }
@@ -2754,33 +2736,59 @@ ARDOUR_UI::transport_rec_enable_blink (bool onoff)
        }
 }
 
-void
-ARDOUR_UI::save_template ()
+bool
+ARDOUR_UI::process_save_template_prompter (ArdourPrompter& prompter)
 {
-       ArdourPrompter prompter (true);
        string name;
 
-       if (!check_audioengine()) {
-               return;
-       }
+       prompter.get_result (name);
 
-       prompter.set_name (X_("Prompter"));
-       prompter.set_title (_("Save Template"));
-       prompter.set_prompt (_("Name for template:"));
-       prompter.set_initial_text(_session->name() + _("-template"));
-       prompter.add_button (Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT);
+       if (name.length()) {
+               int failed = _session->save_template (name);
 
-       switch (prompter.run()) {
-       case RESPONSE_ACCEPT:
-               prompter.get_result (name);
+               if (failed == -2) { /* file already exists. */
+                       bool overwrite = overwrite_file_dialog (prompter,
+                                                               _("Confirm Template Overwrite"),
+                                                               _("A template already exists with that name. Do you want to overwrite it?"));
 
-               if (name.length()) {
-                       _session->save_template (name);
+                       if (overwrite) {
+                               _session->save_template (name, true);
+                       }
+                       else {
+                               return false;
+                       }
                }
-               break;
+       }
 
-       default:
-               break;
+       return true;
+}
+
+void
+ARDOUR_UI::save_template ()
+{
+       ArdourPrompter prompter (true);
+
+       if (!check_audioengine (_main_window)) {
+               return;
+       }
+
+       prompter.set_name (X_("Prompter"));
+       prompter.set_title (_("Save Template"));
+       prompter.set_prompt (_("Name for template:"));
+       prompter.set_initial_text(_session->name() + _("-template"));
+       prompter.add_button (Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT);
+
+       bool finished = false;
+       while (!finished) {
+               switch (prompter.run()) {
+               case RESPONSE_ACCEPT:
+                       finished = process_save_template_prompter (prompter);
+                       break;
+
+               default:
+                       finished = true;
+                       break;
+               }
        }
 }
 
@@ -2832,7 +2840,7 @@ ARDOUR_UI::build_session_from_dialog (SessionDialog& sd, const std::string& sess
 {
        BusProfile bus_profile;
 
-       if (nsm || Profile->get_sae()) {
+       if (nsm) {
 
                bus_profile.master_out_channels = 2;
                bus_profile.input_ac = AutoConnectPhysical;
@@ -2881,13 +2889,47 @@ void
 ARDOUR_UI::load_from_application_api (const std::string& path)
 {
        ARDOUR_COMMAND_LINE::session_name = path;
+       /* Cancel SessionDialog if it's visible to make OSX delegates work.
+        *
+        * ARDOUR_UI::starting connects app->ShouldLoad signal and then shows a SessionDialog
+        * race-condition:
+        *  - ShouldLoad does not arrive in time, ARDOUR_COMMAND_LINE::session_name is empty:
+        *    -> ARDOUR_UI::get_session_parameters starts a SessionDialog.
+        *  - ShouldLoad signal arrives, this function is called and sets ARDOUR_COMMAND_LINE::session_name
+        *    -> SessionDialog is not displayed
+        */
 
+       if (_session_dialog) {
+               std::string session_name = basename_nosuffix (ARDOUR_COMMAND_LINE::session_name);
+               std::string session_path = path;
+               if (Glib::file_test (session_path, Glib::FILE_TEST_IS_REGULAR)) {
+                       session_path = Glib::path_get_dirname (session_path);
+               }
+               // signal the existing dialog in ARDOUR_UI::get_session_parameters()
+               _session_dialog->set_provided_session (session_name, session_path);
+               _session_dialog->response (RESPONSE_NONE);
+               _session_dialog->hide();
+               return;
+       }
+
+       int rv;
        if (Glib::file_test (path, Glib::FILE_TEST_IS_DIR)) {
                /* /path/to/foo => /path/to/foo, foo */
-               load_session (path, basename_nosuffix (path));
+               rv = load_session (path, basename_nosuffix (path));
        } else {
                /* /path/to/foo/foo.ardour => /path/to/foo, foo */
-               load_session (Glib::path_get_dirname (path), basename_nosuffix (path));
+               rv =load_session (Glib::path_get_dirname (path), basename_nosuffix (path));
+       }
+
+       // if load_session fails -> pop up SessionDialog.
+       if (rv) {
+               ARDOUR_COMMAND_LINE::session_name = "";
+
+               if (get_session_parameters (true, false)) {
+                       exit (1);
+               }
+
+               goto_editor_window ();
        }
 }
 
@@ -2903,7 +2945,7 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new, stri
        bool cancel_not_quit;
 
        /* deal with any existing DIRTY session now, rather than later. don't
-        * treat a non-dirty session this way, so that it stays visible 
+        * treat a non-dirty session this way, so that it stays visible
         * as we bring up the new session dialog.
         */
 
@@ -2931,7 +2973,7 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new, stri
 
        session_name = basename_nosuffix (ARDOUR_COMMAND_LINE::session_name);
        session_path = ARDOUR_COMMAND_LINE::session_name;
-       
+
        if (!session_path.empty()) {
                if (Glib::file_test (session_path.c_str(), Glib::FILE_TEST_EXISTS)) {
                        if (Glib::file_test (session_path.c_str(), Glib::FILE_TEST_IS_REGULAR)) {
@@ -2943,6 +2985,7 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new, stri
 
        SessionDialog session_dialog (should_be_new, session_name, session_path, load_template, cancel_not_quit);
 
+       _session_dialog = &session_dialog;
        while (ret != 0) {
 
                if (!ARDOUR_COMMAND_LINE::session_name.empty()) {
@@ -2967,7 +3010,7 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new, stri
                        session_name = "";
                        session_dialog.clear_given ();
                }
-               
+
                if (should_be_new || session_name.empty()) {
                        /* need the dialog to get info from user */
 
@@ -2976,6 +3019,10 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new, stri
                        switch (session_dialog.run()) {
                        case RESPONSE_ACCEPT:
                                break;
+                       case RESPONSE_NONE:
+                               /* this is used for async * app->ShouldLoad(). */
+                               continue; // while loop
+                               break;
                        default:
                                if (quit_on_cancel) {
                                        // JE - Currently (July 2014) this section can only get reached if the
@@ -2995,9 +3042,9 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new, stri
                }
 
                /* if we run the startup dialog again, offer more than just "new session" */
-               
+
                should_be_new = false;
-               
+
                session_name = session_dialog.session_name (likely_new);
                session_path = session_dialog.session_folder ();
 
@@ -3006,22 +3053,22 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new, stri
                }
 
                string::size_type suffix = session_name.find (statefile_suffix);
-               
+
                if (suffix != string::npos) {
                        session_name = session_name.substr (0, suffix);
                }
-               
+
                /* this shouldn't happen, but we catch it just in case it does */
-               
+
                if (session_name.empty()) {
                        continue;
                }
-               
+
                if (session_dialog.use_session_template()) {
                        template_name = session_dialog.session_template_name();
                        _session_is_new = true;
                }
-               
+
                if (session_name[0] == G_DIR_SEPARATOR ||
 #ifdef PLATFORM_WINDOWS
                    (session_name.length() > 3 && session_name[1] == ':' && session_name[2] == G_DIR_SEPARATOR)
@@ -3031,20 +3078,20 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new, stri
 #endif
                         )
                {
-                       
+
                        /* absolute path or cwd-relative path specified for session name: infer session folder
                           from what was given.
                        */
-                       
+
                        session_path = Glib::path_get_dirname (session_name);
                        session_name = Glib::path_get_basename (session_name);
-                       
+
                } else {
 
                        session_path = session_dialog.session_folder();
-                       
+
                        char illegal = Session::session_name_is_legal (session_name);
-                       
+
                        if (illegal) {
                                MessageDialog msg (session_dialog,
                                                   string_compose (_("To ensure compatibility with various systems\n"
@@ -3055,7 +3102,7 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new, stri
                                continue;
                        }
                }
-       
+
                if (Glib::file_test (session_path, Glib::FileTest (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))) {
 
 
@@ -3121,13 +3168,15 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new, stri
                }
        }
 
+       _session_dialog = NULL;
+
        return ret;
 }
 
 void
 ARDOUR_UI::close_session()
 {
-       if (!check_audioengine()) {
+       if (!check_audioengine (_main_window)) {
                return;
        }
 
@@ -3140,8 +3189,6 @@ ARDOUR_UI::close_session()
        if (get_session_parameters (true, false)) {
                exit (1);
        }
-
-       goto_editor_window ();
 }
 
 /** @param snap_name Snapshot name (without .ardour suffix).
@@ -3156,7 +3203,7 @@ ARDOUR_UI::load_session (const std::string& path, const std::string& snap_name,
 
        if (_session) {
                unload_status = unload_session ();
-               
+
                if (unload_status < 0) {
                        goto out;
                } else if (unload_status > 0) {
@@ -3235,7 +3282,7 @@ ARDOUR_UI::load_session (const std::string& path, const std::string& snap_name,
                msg.present ();
 
                dump_errors (cerr);
-               
+
                (void) msg.run ();
                msg.hide ();
 
@@ -3263,7 +3310,7 @@ ARDOUR_UI::load_session (const std::string& path, const std::string& snap_name,
                (void) msg.run ();
                msg.hide ();
        }
-       
+
 
        /* Now the session been created, add the transport controls */
        new_session->add_controllable(roll_controllable);
@@ -3278,8 +3325,6 @@ ARDOUR_UI::load_session (const std::string& path, const std::string& snap_name,
 
        session_loaded = true;
 
-       goto_editor_window ();
-
        if (_session) {
                _session->set_clean ();
        }
@@ -3288,7 +3333,10 @@ ARDOUR_UI::load_session (const std::string& path, const std::string& snap_name,
        fst_stop_threading();
 #endif
 
-       flush_pending ();
+       {
+               Timers::TimerSuspender t;
+               flush_pending ();
+       }
 
 #ifdef WINDOWS_VST_SUPPORT
        fst_start_threading();
@@ -3371,13 +3419,24 @@ ARDOUR_UI::build_session (const std::string& path, const std::string& snap_name,
 void
 ARDOUR_UI::launch_chat ()
 {
+       MessageDialog dialog(_("<b>Just ask and wait for an answer.\nIt may take from minutes to hours.</b>"), true);
+
+       dialog.set_title (_("About the Chat"));
+       dialog.set_secondary_text (_("When you're inside the chat just ask your question and wait for an answer. The chat is occupied by real people with real lives so many of them are passively online and might not read your question before minutes or hours later.\nSo please be patient and wait for an answer.\n\nYou should just leave the chat window open and check back regularly until someone has answered your question."));
+
+       switch (dialog.run()) {
+       case RESPONSE_OK:
 #ifdef __APPLE__
-       open_uri("http://webchat.freenode.net/?channels=ardour-osx");
+               open_uri("http://webchat.freenode.net/?channels=ardour-osx");
 #elif defined PLATFORM_WINDOWS
-       open_uri("http://webchat.freenode.net/?channels=ardour-windows");
+               open_uri("http://webchat.freenode.net/?channels=ardour-windows");
 #else
-       open_uri("http://webchat.freenode.net/?channels=ardour");
+               open_uri("http://webchat.freenode.net/?channels=ardour");
 #endif
+               break;
+       default:
+               break;
+       }
 }
 
 void
@@ -3395,7 +3454,7 @@ ARDOUR_UI::launch_reference ()
 void
 ARDOUR_UI::launch_tracker ()
 {
-       PBD::open_uri ("http://tracker.ardour.org/bug_report_page.php");
+       PBD::open_uri ("http://tracker.ardour.org");
 }
 
 void
@@ -3481,7 +3540,7 @@ ARDOUR_UI::display_cleanup_results (ARDOUR::CleanupReport& rep, const gchar* lis
        removed = rep.paths.size();
 
        if (removed == 0) {
-               MessageDialog msgd (*editor,
+               MessageDialog msgd (_main_window,
                                    _("No files were ready for clean-up"),
                                    true,
                                    Gtk::MESSAGE_INFO,
@@ -3562,7 +3621,7 @@ The following file was deleted from %2,\n\
 releasing %3 %4bytes of disk space", "\
 The following %1 files were deleted from %2,\n\
 releasing %3 %4bytes of disk space", removed),
-                                       removed, Glib::Markup::escape_text (dead_directory), space_adjusted, bprefix, PROGRAM_NAME));
+                                       removed, Gtkmm2ext::markup_escape_text (dead_directory), space_adjusted, bprefix, PROGRAM_NAME));
        } else {
                txt.set_markup (string_compose (P_("\
 The following file was not in use and \n\
@@ -3575,7 +3634,7 @@ have been moved to: %2\n\n\
 After a restart of %5\n\n\
 <span face=\"mono\">Session -> Clean-up -> Flush Wastebasket</span>\n\n\
 will release an additional %3 %4bytes of disk space.\n", removed),
-                                       removed, Glib::Markup::escape_text (dead_directory), space_adjusted, bprefix, PROGRAM_NAME));
+                                       removed, Gtkmm2ext::markup_escape_text (dead_directory), space_adjusted, bprefix, PROGRAM_NAME));
        }
 
        dhbox.pack_start (*dimage, true, false, 5);
@@ -3689,6 +3748,47 @@ ARDOUR_UI::flush_trash ()
        display_cleanup_results (rep, _("deleted file"), true);
 }
 
+void
+ARDOUR_UI::cleanup_peakfiles ()
+{
+       if (_session == 0) {
+               /* shouldn't happen: menu item is insensitive */
+               return;
+       }
+
+       if (! _session->can_cleanup_peakfiles ()) {
+               return;
+       }
+
+       // get all region-views in this session
+       RegionSelection rs;
+       TrackViewList empty;
+       empty.clear();
+       editor->get_regions_after(rs, (framepos_t) 0, empty);
+       std::list<RegionView*> views = rs.by_layer();
+
+       // remove displayed audio-region-views waveforms
+       for (list<RegionView*>::iterator i = views.begin(); i != views.end(); ++i) {
+               AudioRegionView* arv = dynamic_cast<AudioRegionView*> (*i);
+               if (!arv) { continue ; }
+               arv->delete_waves();
+       }
+
+       // cleanup peak files:
+       // - stop pending peakfile threads
+       // - close peakfiles if any
+       // - remove peak dir in session
+       // - setup peakfiles (background thread)
+       _session->cleanup_peakfiles ();
+
+       // re-add waves to ARV
+       for (list<RegionView*>::iterator i = views.begin(); i != views.end(); ++i) {
+               AudioRegionView* arv = dynamic_cast<AudioRegionView*> (*i);
+               if (!arv) { continue ; }
+               arv->create_waves();
+       }
+}
+
 void
 ARDOUR_UI::setup_order_hint (AddRouteDialog::InsertAt place)
 {
@@ -3697,12 +3797,12 @@ ARDOUR_UI::setup_order_hint (AddRouteDialog::InsertAt place)
        if (editor->get_selection().tracks.empty()) {
                return;
        }
-       
+
        /*
-         we want the new routes to have their order keys set starting from 
+         we want the new routes to have their order keys set starting from
          the highest order key in the selection + 1 (if available).
        */
-       
+
        if (place == AddRouteDialog::AfterSelection) {
                RouteTimeAxisView *rtav = dynamic_cast<RouteTimeAxisView*> (editor->get_selection().tracks.back());
                if (rtav) {
@@ -3744,6 +3844,20 @@ ARDOUR_UI::setup_order_hint (AddRouteDialog::InsertAt place)
        }
 }
 
+void
+ARDOUR_UI::start_duplicate_routes ()
+{
+       if (!duplicate_routes_dialog) {
+               duplicate_routes_dialog = new DuplicateRouteDialog;
+       }
+
+       if (duplicate_routes_dialog->restart (_session)) {
+               return;
+       }
+
+       duplicate_routes_dialog->present ();
+}
+
 void
 ARDOUR_UI::add_route (Gtk::Window* /* ignored */)
 {
@@ -4007,6 +4121,9 @@ ARDOUR_UI::add_video (Gtk::Window* float_window)
                return;
        }
 
+       std::string audio_from_video;
+       bool detect_ltc = false;
+
        switch (add_video_dialog->import_option()) {
                case VTL_IMPORT_TRANSCODE:
                        {
@@ -4018,9 +4135,15 @@ ARDOUR_UI::add_video (Gtk::Window* float_window)
                                        delete transcode_video_dialog;
                                        return;
                                }
-                               if (!transcode_video_dialog->get_audiofile().empty()) {
+
+                               audio_from_video = transcode_video_dialog->get_audiofile();
+
+                               if (!audio_from_video.empty() && transcode_video_dialog->detect_ltc()) {
+                                       detect_ltc = true;
+                               }
+                               else if (!audio_from_video.empty()) {
                                        editor->embed_audio_from_video(
-                                                       transcode_video_dialog->get_audiofile(),
+                                                       audio_from_video,
                                                        video_timeline->get_offset(),
                                                        (transcode_video_dialog->import_option() != VTL_IMPORT_NO_VIDEO)
                                                        );
@@ -4053,6 +4176,7 @@ ARDOUR_UI::add_video (Gtk::Window* float_window)
        }
 
        video_timeline->set_update_session_fps(auto_set_session_fps);
+
        if (video_timeline->video_file_info(path, local_file)) {
                XMLNode* node = new XMLNode(X_("Videotimeline"));
                node->add_property (X_("Filename"), path);
@@ -4066,6 +4190,40 @@ ARDOUR_UI::add_video (Gtk::Window* float_window)
                _session->add_extra_xml (*node);
                _session->set_dirty ();
 
+               if (!audio_from_video.empty() && detect_ltc) {
+                       std::vector<LTCFileReader::LTCMap> ltc_seq;
+
+                       try {
+                               /* TODO ask user about TV standard (LTC alignment if any) */
+                               LTCFileReader ltcr (audio_from_video, video_timeline->get_video_file_fps());
+                               /* TODO ASK user which channel:  0 .. ltcr->channels() - 1 */
+
+                               ltc_seq = ltcr.read_ltc (/*channel*/ 0, /*max LTC frames to decode*/ 15);
+
+                               /* TODO seek near end of file, and read LTC until end.
+                                * if it fails to find any LTC frames, scan complete file
+                                *
+                                * calculate drift of LTC compared to video-duration,
+                                * ask user for reference (timecode from start/mid/end)
+                                */
+                       } catch (...) {
+                               // LTCFileReader will have written error messages
+                       }
+
+                       ::g_unlink(audio_from_video.c_str());
+
+                       if (ltc_seq.size() == 0) {
+                               PBD::error << _("No LTC detected, video will not be aligned.") << endmsg;
+                       } else {
+                               /* the very first TC in the file is somteimes not aligned properly */
+                               int i = ltc_seq.size() -1;
+                               ARDOUR::frameoffset_t video_start_offset =
+                                       _session->nominal_frame_rate() * (ltc_seq[i].timecode_sec - ltc_seq[i].framepos_sec);
+                               PBD::info << string_compose (_("Align video-start to %1 [samples]"), video_start_offset) << endmsg;
+                               video_timeline->set_offset(video_start_offset);
+                       }
+               }
+
                _session->maybe_update_session_range(
                        std::max(video_timeline->get_offset(), (ARDOUR::frameoffset_t) 0),
                        std::max(video_timeline->get_offset() + video_timeline->get_duration(), (ARDOUR::frameoffset_t) 0));
@@ -4153,6 +4311,30 @@ ARDOUR_UI::mixer_settings () const
        return node;
 }
 
+XMLNode*
+ARDOUR_UI::main_window_settings () const
+{
+       XMLNode* node = 0;
+
+       if (_session) {
+               node = _session->instant_xml(X_("Main"));
+       } else {
+               node = Config->instant_xml(X_("Main"));
+       }
+
+       if (!node) {
+               if (getenv("ARDOUR_INSTANT_XML_PATH")) {
+                       node = Config->instant_xml(getenv("ARDOUR_INSTANT_XML_PATH"));
+               }
+       }
+
+       if (!node) {
+               node = new XMLNode (X_("Main"));
+       }
+
+       return node;
+}
+
 XMLNode*
 ARDOUR_UI::editor_settings () const
 {
@@ -4204,7 +4386,7 @@ void
 ARDOUR_UI::halt_on_xrun_message ()
 {
         cerr << "HALT on xrun\n";
-       MessageDialog msg (*editor, _("Recording was stopped because your system could not keep up."));
+        MessageDialog msg (_main_window, _("Recording was stopped because your system could not keep up."));
        msg.run ();
 }
 
@@ -4233,7 +4415,7 @@ ARDOUR_UI::disk_overrun_handler ()
 
        if (!have_disk_speed_dialog_displayed) {
                have_disk_speed_dialog_displayed = true;
-               MessageDialog* msg = new MessageDialog (*editor, string_compose (_("\
+               MessageDialog* msg = new MessageDialog (_main_window, string_compose (_("\
 The disk system on your computer\n\
 was not able to keep up with %1.\n\
 \n\
@@ -4290,7 +4472,7 @@ ARDOUR_UI::plugin_scan_dialog (std::string type, std::string plugin, bool can_ca
        }
 
        const bool cancelled = PluginManager::instance().cancelled();
-       if (type != X_("closeme") && (!ui_config->get_show_plugin_scan_window()) && !_initial_verbose_plugin_scan) {
+       if (type != X_("closeme") && (!UIConfiguration::instance().get_show_plugin_scan_window()) && !_initial_verbose_plugin_scan) {
                if (cancelled && scan_dlg->is_mapped()) {
                        scan_dlg->hide();
                        gui_idle_handler();
@@ -4368,7 +4550,7 @@ ARDOUR_UI::disk_underrun_handler ()
        if (!have_disk_speed_dialog_displayed) {
                have_disk_speed_dialog_displayed = true;
                MessageDialog* msg = new MessageDialog (
-                       *editor, string_compose (_("The disk system on your computer\n\
+                       _main_window, string_compose (_("The disk system on your computer\n\
 was not able to keep up with %1.\n\
 \n\
 Specifically, it failed to read data from disk\n\
@@ -4392,12 +4574,7 @@ ARDOUR_UI::session_dialog (std::string msg)
 
        MessageDialog* d;
 
-       if (editor) {
-               d = new MessageDialog (*editor, msg, false, MESSAGE_INFO, BUTTONS_OK, true);
-       } else {
-               d = new MessageDialog (msg, false, MESSAGE_INFO, BUTTONS_OK, true);
-       }
-
+       d = new MessageDialog (msg, false, MESSAGE_INFO, BUTTONS_OK, true);
        d->show_all ();
        d->run ();
        delete d;
@@ -4440,7 +4617,7 @@ what you would like to do.\n"), PROGRAM_NAME));
 int
 ARDOUR_UI::sr_mismatch_dialog (framecnt_t desired, framecnt_t actual)
 {
-       HBox* hbox = new HBox();
+       HBox* hbox = new HBox();
        Image* image = new Image (Stock::DIALOG_WARNING, ICON_SIZE_DIALOG);
        ArdourDialog dialog (_("Sample Rate Mismatch"), true);
        Label  message (string_compose (_("\
@@ -4470,46 +4647,6 @@ audio may be played at the wrong sample rate.\n"), desired, PROGRAM_NAME, actual
         return 1;
 }
 
-int
-ARDOUR_UI::disconnect_from_engine ()
-{
-       /* drop connection to AudioEngine::Halted so that we don't act
-        *  as if the engine unexpectedly shut down
-        */
-
-       halt_connection.disconnect ();
-       
-       if (AudioEngine::instance()->stop ()) {
-               MessageDialog msg (*editor, _("Could not disconnect from Audio/MIDI engine"));
-               msg.run ();
-               return -1;
-       } else {
-               AudioEngine::instance()->Halted.connect_same_thread (halt_connection, boost::bind (&ARDOUR_UI::engine_halted, this, _1, false));
-       }
-       
-       update_sample_rate (0);
-       return 0;
-}
-
-int
-ARDOUR_UI::reconnect_to_engine ()
-{
-       if (AudioEngine::instance()->start ()) {
-               // TODO somehow make this the topmost window (above any dialogs currently visible)
-               if (editor) {
-                       MessageDialog msg (*editor,  _("Could not reconnect to the Audio/MIDI engine"));
-                       msg.run ();
-               } else {
-                       MessageDialog msg (_("Could not reconnect to the Audio/MIDI engine"));
-                       msg.run ();
-               }
-               return -1;
-       }
-       
-       update_sample_rate (0);
-       return 0;
-}
-
 void
 ARDOUR_UI::use_config ()
 {
@@ -4522,13 +4659,13 @@ ARDOUR_UI::use_config ()
 void
 ARDOUR_UI::update_transport_clocks (framepos_t pos)
 {
-       if (ui_config->get_primary_clock_delta_edit_cursor()) {
+       if (UIConfiguration::instance().get_primary_clock_delta_edit_cursor()) {
                primary_clock->set (pos, false, editor->get_preferred_edit_position (EDIT_IGNORE_PHEAD));
        } else {
                primary_clock->set (pos);
        }
 
-       if (ui_config->get_secondary_clock_delta_edit_cursor()) {
+       if (UIConfiguration::instance().get_secondary_clock_delta_edit_cursor()) {
                secondary_clock->set (pos, false, editor->get_preferred_edit_position (EDIT_IGNORE_PHEAD));
        } else {
                secondary_clock->set (pos);
@@ -4594,7 +4731,7 @@ ARDOUR_UI::store_clock_modes ()
 
        for (vector<AudioClock*>::iterator x = AudioClock::clocks.begin(); x != AudioClock::clocks.end(); ++x) {
                XMLNode* child = new XMLNode (X_("Clock"));
-               
+
                child->add_property (X_("name"), (*x)->name());
                child->add_property (X_("mode"), enum_2_string ((*x)->mode()));
                child->add_property (X_("on"), ((*x)->off() ? X_("no") : X_("yes")));
@@ -4613,7 +4750,7 @@ ARDOUR_UI::TransportControllable::TransportControllable (std::string name, ARDOU
 }
 
 void
-ARDOUR_UI::TransportControllable::set_value (double val)
+ARDOUR_UI::TransportControllable::set_value (double val, PBD::Controllable::GroupControlDisposition /*group_override*/)
 {
        if (val < 0.5) {
                /* do nothing: these are radio-style actions */
@@ -4693,11 +4830,6 @@ ARDOUR_UI::setup_profile ()
                Profile->set_small_screen ();
        }
 
-       if (g_getenv ("ARDOUR_SAE")) {
-               Profile->set_sae ();
-               Profile->set_single_package ();
-       }
-
        if (g_getenv ("TRX")) {
                Profile->set_trx ();
        }
@@ -4739,6 +4871,7 @@ ARDOUR_UI::ambiguous_file (std::string file, std::vector<std::string> hits)
        dialog.present ();
 
        dialog.run ();
+
        return dialog.get_which ();
 }
 
@@ -4828,13 +4961,21 @@ ARDOUR_UI::do_audio_midi_setup (uint32_t desired_sample_rate)
        audio_midi_setup->set_desired_sample_rate (desired_sample_rate);
        audio_midi_setup->set_position (WIN_POS_CENTER);
 
-       switch (audio_midi_setup->run()) {
-       case Gtk::RESPONSE_OK:
-               return 0;
-       case Gtk::RESPONSE_APPLY:
-               return 0;
-       default:
-               return -1;
+       int response;
+
+       while (true) {
+               response = audio_midi_setup->run();
+               switch (response) {
+               case Gtk::RESPONSE_OK:
+                       if (!AudioEngine::instance()->running()) {
+                               continue;
+                       } else {
+                               return 0;
+                       }
+                       return 0;
+               default:
+                       return -1;
+               }
        }
 }
 
@@ -4869,15 +5010,15 @@ ARDOUR_UI::transport_numpad_event (int num)
        if ( _numpad_locate_happening ) {
                _pending_locate_num = _pending_locate_num*10 + num;
        } else {
-               switch (num) {          
-                       case 0:  toggle_roll(false, false);             break;
-                       case 1:  transport_rewind(1);                           break;
-                       case 2:  transport_forward(1);                          break;
-                       case 3:  transport_record(true);                        break;
+               switch (num) {
+                       case 0:  toggle_roll(false, false);             break;
+                       case 1:  transport_rewind(1);                           break;
+                       case 2:  transport_forward(1);                          break;
+                       case 3:  transport_record(true);                        break;
                        case 4:  toggle_session_auto_loop();            break;
-                       case 5:  transport_record(false); toggle_session_auto_loop();   break;
-                       case 6:  toggle_punch();                                        break;
-                       case 7:  toggle_click();                                break;
+                       case 5:  transport_record(false); toggle_session_auto_loop();   break;
+                       case 6:  toggle_punch();                                        break;
+                       case 7:  toggle_click();                                break;
                        case 8:  toggle_auto_return();                  break;
                        case 9:  toggle_follow_edits();         break;
                }
@@ -4887,7 +5028,7 @@ ARDOUR_UI::transport_numpad_event (int num)
 void
 ARDOUR_UI::set_flat_buttons ()
 {
-       CairoWidget::set_flat_buttons( config()->get_flat_buttons() );
+       CairoWidget::set_flat_buttons( UIConfiguration::instance().get_flat_buttons() );
 }
 
 void
@@ -4912,21 +5053,21 @@ ARDOUR_UI::audioengine_became_silent ()
        subscribe_button_box.pack_start (subscribe_button, true, false);
 
        bool (*openuri)(const char*) = PBD::open_uri; /* this forces selection of the const char* variant of PBD::open_uri(), which we need to avoid ambiguity below */
-       
+
        pay_button.signal_clicked().connect (sigc::hide_return (sigc::bind (sigc::ptr_fun (openuri), (const char*) "https://ardour.org/download")));
        subscribe_button.signal_clicked().connect (sigc::hide_return (sigc::bind (sigc::ptr_fun (openuri), (const char*) "https://community.ardour.org/s/subscribe")));
-       
+
        msg.get_vbox()->pack_start (pay_label);
        msg.get_vbox()->pack_start (pay_button_box);
        msg.get_vbox()->pack_start (subscribe_label);
        msg.get_vbox()->pack_start (subscribe_button_box);
 
        msg.get_vbox()->show_all ();
-       
+
        msg.add_button (_("Remain silent"), Gtk::RESPONSE_CANCEL);
        msg.add_button (_("Save and quit"), Gtk::RESPONSE_NO);
        msg.add_button (_("Give me more time"), Gtk::RESPONSE_YES);
-       
+
        int r = msg.run ();
 
        switch (r) {
@@ -4946,9 +5087,272 @@ ARDOUR_UI::audioengine_became_silent ()
                break;
        }
 }
-       
+
 void
 ARDOUR_UI::hide_application ()
 {
     Application::instance ()-> hide ();
 }
+
+void
+ARDOUR_UI::setup_toplevel_window (Gtk::Window& window, const string& name, void* owner)
+{
+       /* icons, titles, WM stuff */
+
+       static list<Glib::RefPtr<Gdk::Pixbuf> > window_icons;
+
+       if (window_icons.empty()) {
+               Glib::RefPtr<Gdk::Pixbuf> icon;
+               if ((icon = ::get_icon ("ardour_icon_16px")) != 0) {
+                       window_icons.push_back (icon);
+               }
+               if ((icon = ::get_icon ("ardour_icon_22px")) != 0) {
+                       window_icons.push_back (icon);
+               }
+               if ((icon = ::get_icon ("ardour_icon_32px")) != 0) {
+                       window_icons.push_back (icon);
+               }
+               if ((icon = ::get_icon ("ardour_icon_48px")) != 0) {
+                       window_icons.push_back (icon);
+               }
+       }
+
+       if (!window_icons.empty()) {
+               window.set_default_icon_list (window_icons);
+       }
+
+       Gtkmm2ext::WindowTitle title (Glib::get_application_name());
+
+       if (!name.empty()) {
+               title += name;
+       }
+
+       window.set_title (title.get_string());
+       window.set_wmclass (string_compose (X_("%1_%1"), downcase (PROGRAM_NAME), downcase (name)), PROGRAM_NAME);
+
+       window.set_flags (CAN_FOCUS);
+       window.add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK);
+
+       /* This is a hack to ensure that GTK-accelerators continue to
+        * work. Once we switch over to entirely native bindings, this will be
+        * unnecessary and should be removed
+        */
+       window.add_accel_group (ActionManager::ui_manager->get_accel_group());
+
+       window.signal_configure_event().connect (sigc::mem_fun (*this, &ARDOUR_UI::configure_handler));
+       window.signal_window_state_event().connect (sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::tabbed_window_state_event_handler), owner));
+       window.signal_key_press_event().connect (sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::key_event_handler), &window), false);
+       window.signal_key_release_event().connect (sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::key_event_handler), &window), false);
+}
+
+bool
+ARDOUR_UI::key_event_handler (GdkEventKey* ev, Gtk::Window* event_window)
+{
+       Gtkmm2ext::Bindings* bindings = 0;
+       Gtk::Window* window = 0;
+
+       /* until we get ardour bindings working, we are not handling key
+        * releases yet.
+        */
+
+       if (ev->type != GDK_KEY_PRESS) {
+               return false;
+       }
+
+       if (event_window == &_main_window) {
+
+               window = event_window;
+
+               /* find current tab contents */
+
+               Gtk::Widget* w = _tabs.get_nth_page (_tabs.get_current_page());
+
+               /* see if it uses the ardour binding system */
+
+               if (w) {
+                       bindings = reinterpret_cast<Gtkmm2ext::Bindings*>(w->get_data ("ardour-bindings"));
+               }
+
+               DEBUG_TRACE (DEBUG::Accelerators, string_compose ("main window key event, bindings = %1, global = %2\n", bindings, &global_bindings));
+
+       } else {
+
+               window = event_window;
+
+               /* see if window uses ardour binding system */
+
+               bindings = reinterpret_cast<Gtkmm2ext::Bindings*>(window->get_data ("ardour-bindings"));
+       }
+
+       /* An empty binding set is treated as if it doesn't exist */
+
+       if (bindings && bindings->empty()) {
+               bindings = 0;
+       }
+
+       return key_press_focus_accelerator_handler (*window, ev, bindings);
+}
+
+bool
+ARDOUR_UI::key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey* ev, Gtkmm2ext::Bindings* bindings)
+{
+       GtkWindow* win = window.gobj();
+       GtkWidget* focus = gtk_window_get_focus (win);
+       bool special_handling_of_unmodified_accelerators = false;
+       /* consider all relevant modifiers but not LOCK or SHIFT */
+       const guint mask = (Keyboard::RelevantModifierKeyMask & ~(Gdk::SHIFT_MASK|Gdk::LOCK_MASK));
+
+       GdkModifierType modifier = GdkModifierType (ev->state);
+        modifier = GdkModifierType (modifier & gtk_accelerator_get_default_mod_mask());
+        Gtkmm2ext::possibly_translate_mod_to_make_legal_accelerator(modifier);
+
+        if (focus) {
+
+               /* some widget has keyboard focus */
+
+               if (GTK_IS_ENTRY(focus) || Keyboard::some_magic_widget_has_focus()) {
+
+                       /* A particular kind of focusable widget currently has keyboard
+                        * focus. All unmodified key events should go to that widget
+                        * first and not be used as an accelerator by default
+                        */
+
+                       special_handling_of_unmodified_accelerators = true;
+               }
+       }
+
+        DEBUG_TRACE (DEBUG::Accelerators, string_compose ("Win = %1 focus = %7 (%8) Key event: code = %2  state = %3 special handling ? %4 magic widget focus ? %5 focus widget %6 named %7\n",
+                                                          win,
+                                                          ev->keyval,
+                                                         show_gdk_event_state (ev->state),
+                                                          special_handling_of_unmodified_accelerators,
+                                                          Keyboard::some_magic_widget_has_focus(),
+                                                         focus,
+                                                          (focus ? gtk_widget_get_name (focus) : "no focus widget")));
+
+       /* This exists to allow us to override the way GTK handles
+          key events. The normal sequence is:
+
+          a) event is delivered to a GtkWindow
+          b) accelerators/mnemonics are activated
+          c) if (b) didn't handle the event, propagate to
+              the focus widget and/or focus chain
+
+          The problem with this is that if the accelerators include
+          keys without modifiers, such as the space bar or the
+          letter "e", then pressing the key while typing into
+          a text entry widget results in the accelerator being
+          activated, instead of the desired letter appearing
+          in the text entry.
+
+          There is no good way of fixing this, but this
+          represents a compromise. The idea is that
+          key events involving modifiers (not Shift)
+          get routed into the activation pathway first, then
+          get propagated to the focus widget if necessary.
+
+          If the key event doesn't involve modifiers,
+          we deliver to the focus widget first, thus allowing
+          it to get "normal text" without interference
+          from acceleration.
+
+          Of course, this can also be problematic: if there
+          is a widget with focus, then it will swallow
+          all "normal text" accelerators.
+       */
+
+
+       if (!special_handling_of_unmodified_accelerators || (ev->state & mask)) {
+
+               /* no special handling or there are modifiers in effect: accelerate first */
+
+                DEBUG_TRACE (DEBUG::Accelerators, "\tactivate, then propagate\n");
+               DEBUG_TRACE (DEBUG::Accelerators, string_compose ("\tevent send-event:%1 time:%2 length:%3 name %7 string:%4 hardware_keycode:%5 group:%6\n",
+                                                                 ev->send_event, ev->time, ev->length, ev->string, ev->hardware_keycode, ev->group, gdk_keyval_name (ev->keyval)));
+
+               DEBUG_TRACE (DEBUG::Accelerators, "\tsending to window\n");
+               KeyboardKey k (ev->state, ev->keyval);
+
+               if (bindings) {
+
+                       DEBUG_TRACE (DEBUG::Accelerators, string_compose ("\tusing Ardour bindings %1 for this event\n", bindings));
+
+                       if (bindings->activate (k, Bindings::Press)) {
+                               DEBUG_TRACE (DEBUG::Accelerators, "\t\thandled\n");
+                               return true;
+                       }
+               }
+
+               DEBUG_TRACE (DEBUG::Accelerators, "\tnot yet handled, try global bindings\n");
+
+               if (global_bindings && global_bindings->activate (k, Bindings::Press)) {
+                       DEBUG_TRACE (DEBUG::Accelerators, "\t\thandled\n");
+                       return true;
+               }
+
+                DEBUG_TRACE (DEBUG::Accelerators, "\tnot accelerated, now propagate\n");
+
+                if (gtk_window_propagate_key_event (win, ev)) {
+                       DEBUG_TRACE (DEBUG::Accelerators, "\tpropagate handled\n");
+                       return true;
+                }
+
+       } else {
+
+               /* no modifiers, propagate first */
+
+               DEBUG_TRACE (DEBUG::Accelerators, "\tpropagate, then activate\n");
+
+               if (gtk_window_propagate_key_event (win, ev)) {
+                       DEBUG_TRACE (DEBUG::Accelerators, "\thandled by propagate\n");
+                       return true;
+               }
+
+               DEBUG_TRACE (DEBUG::Accelerators, "\tpropagation didn't handle, so activate\n");
+               KeyboardKey k (ev->state, ev->keyval);
+
+               if (bindings) {
+
+                       DEBUG_TRACE (DEBUG::Accelerators, "\tusing Ardour bindings for this window\n");
+
+
+                       if (bindings->activate (k, Bindings::Press)) {
+                               DEBUG_TRACE (DEBUG::Accelerators, "\t\thandled\n");
+                               return true;
+                       }
+
+               }
+
+               DEBUG_TRACE (DEBUG::Accelerators, "\tnot yet handled, try global bindings\n");
+
+               if (global_bindings && global_bindings->activate (k, Bindings::Press)) {
+                       DEBUG_TRACE (DEBUG::Accelerators, "\t\thandled\n");
+                       return true;
+               }
+       }
+
+       DEBUG_TRACE (DEBUG::Accelerators, "\tnot handled\n");
+       return true;
+}
+
+void
+ARDOUR_UI::load_bindings ()
+{
+       if ((global_bindings = Bindings::get_bindings ("global", global_actions)) == 0) {
+               error << _("Global keybindings are missing") << endmsg;
+       }
+}
+
+void
+ARDOUR_UI::cancel_solo ()
+{
+       if (_session) {
+               if (_session->soloing()) {
+                       _session->set_solo (_session->get_routes(), false);
+               } else if (_session->listening()) {
+                       _session->set_listen (_session->get_routes(), false);
+               }
+
+               _session->clear_all_solo_state (_session->get_routes()); // safeguard, ideally this won't do anything, check the log-window
+       }
+}