remove all trace of SAE from source code.
[ardour.git] / gtk2_ardour / ardour_ui.cc
index 9cd4ae0294cb74771d368dfa9c5230bff64e18f7..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"
@@ -111,11 +112,12 @@ typedef uint64_t microseconds_t;
 #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"
 #include "gain_meter.h"
-#include "global_signals.h"
 #include "global_port_matrix.h"
 #include "gui_object.h"
 #include "gui_thread.h"
@@ -126,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"
@@ -167,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)
 {
@@ -224,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)
@@ -263,9 +268,8 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir, UIConfi
        , 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"))
@@ -273,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)
@@ -287,9 +292,12 @@ 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 ();
@@ -306,9 +314,9 @@ 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);
@@ -393,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 ();
 
@@ -406,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);
@@ -440,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 ();
 }
@@ -472,11 +480,14 @@ 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;
@@ -491,6 +502,8 @@ ARDOUR_UI::engine_running ()
        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
@@ -527,7 +540,7 @@ 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 ();
 
@@ -560,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 ();
        }
@@ -574,22 +585,32 @@ ARDOUR_UI::post_engine ()
 
        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 ();
@@ -604,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 */
 
@@ -626,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();
 
@@ -790,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();
@@ -844,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 ()
 {
@@ -1016,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
@@ -1026,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;
 }
 
@@ -1093,7 +1127,6 @@ ARDOUR_UI::check_memory_locking ()
 
                                pop_back_splash (msg);
 
-                               editor->ensure_float (msg);
                                msg.run ();
 
                                if (cb.get_active()) {
@@ -1139,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\
@@ -1291,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 );
                        }
                }
@@ -1664,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 ();
@@ -1681,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 */
@@ -1692,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);
@@ -1701,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);
        }
@@ -1759,7 +1787,7 @@ ARDOUR_UI::session_add_mixed_track (const ChanCount& input, const ChanCount& out
        }
 
        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\
@@ -1820,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\
@@ -1966,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;
                        }
@@ -2082,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);
@@ -2103,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
                        }
@@ -2115,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;
        }
 
@@ -2170,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) {
@@ -2230,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);
                }
        }
 }
@@ -2280,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);
@@ -2326,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));
@@ -2383,7 +2429,7 @@ ARDOUR_UI::save_session_as ()
        }
 
 
-       Session::SaveAs sa;
+       Session::SaveAs sa;
 
        sa.new_parent_folder = save_as_dialog->new_parent_folder ();
        sa.new_name = save_as_dialog->new_name ();
@@ -2436,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.
  */
 
@@ -2443,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);
@@ -2455,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;
@@ -2466,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;
        }
 }
 
@@ -2578,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);
@@ -2599,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;
                }
@@ -2663,13 +2736,39 @@ ARDOUR_UI::transport_rec_enable_blink (bool onoff)
        }
 }
 
+bool
+ARDOUR_UI::process_save_template_prompter (ArdourPrompter& prompter)
+{
+       string name;
+
+       prompter.get_result (name);
+
+       if (name.length()) {
+               int failed = _session->save_template (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 (overwrite) {
+                               _session->save_template (name, true);
+                       }
+                       else {
+                               return false;
+                       }
+               }
+       }
+
+       return true;
+}
+
 void
 ARDOUR_UI::save_template ()
 {
        ArdourPrompter prompter (true);
-       string name;
 
-       if (!check_audioengine()) {
+       if (!check_audioengine (_main_window)) {
                return;
        }
 
@@ -2679,17 +2778,17 @@ ARDOUR_UI::save_template ()
        prompter.set_initial_text(_session->name() + _("-template"));
        prompter.add_button (Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT);
 
-       switch (prompter.run()) {
-       case RESPONSE_ACCEPT:
-               prompter.get_result (name);
+       bool finished = false;
+       while (!finished) {
+               switch (prompter.run()) {
+               case RESPONSE_ACCEPT:
+                       finished = process_save_template_prompter (prompter);
+                       break;
 
-               if (name.length()) {
-                       _session->save_template (name);
+               default:
+                       finished = true;
+                       break;
                }
-               break;
-
-       default:
-               break;
        }
 }
 
@@ -2741,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;
@@ -2790,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 ();
        }
 }
 
@@ -2852,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()) {
@@ -2885,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
@@ -3030,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;
        }
 
@@ -3049,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).
@@ -3187,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 ();
        }
@@ -3197,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();
@@ -3280,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
@@ -3304,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
@@ -3390,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,
@@ -3471,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\
@@ -3484,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);
@@ -3694,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 */)
 {
@@ -3957,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:
                        {
@@ -3968,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)
                                                        );
@@ -4003,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);
@@ -4016,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));
@@ -4103,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
 {
@@ -4154,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 ();
 }
 
@@ -4183,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\
@@ -4240,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();
@@ -4318,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\
@@ -4342,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;
@@ -4390,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 (_("\
@@ -4420,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 ()
 {
@@ -4472,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);
@@ -4563,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 */
@@ -4643,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 ();
        }
@@ -4689,6 +4871,7 @@ ARDOUR_UI::ambiguous_file (std::string file, std::vector<std::string> hits)
        dialog.present ();
 
        dialog.run ();
+
        return dialog.get_which ();
 }
 
@@ -4778,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;
+               }
        }
 }
 
@@ -4820,14 +5011,14 @@ ARDOUR_UI::transport_numpad_event (int num)
                _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;
+                       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;
                }
@@ -4837,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
@@ -4902,3 +5093,266 @@ 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
+       }
+}