major design changes: use glib event loop for MIDI thread/UI; rework design of BaseUI...
[ardour.git] / gtk2_ardour / ardour_ui.cc
index c10b0d73d0e6ab787ba4b57063306e334454e8be..a4675f4a212b92384e42a211b8bfaf5f4ecf21ce 100644 (file)
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 1999-2007 Paul Davis 
+    Copyright (C) 1999-2007 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -25,6 +25,7 @@
 #include <fcntl.h>
 #include <signal.h>
 #include <unistd.h>
+#include <time.h>
 #include <cerrno>
 #include <fstream>
 
 #include <gtkmm/messagedialog.h>
 #include <gtkmm/accelmap.h>
 
-#include <pbd/error.h>
-#include <pbd/misc.h>
-#include <pbd/basename.h>
-#include <pbd/compose.h>
-#include <pbd/failed_constructor.h>
-#include <pbd/enumwriter.h>
-#include <pbd/memento_command.h>
-#include <pbd/file_utils.h>
-
-#include <gtkmm2ext/gtk_ui.h>
-#include <gtkmm2ext/utils.h>
-#include <gtkmm2ext/click_box.h>
-#include <gtkmm2ext/fastmeter.h>
-#include <gtkmm2ext/stop_signal.h>
-#include <gtkmm2ext/popup.h>
-#include <gtkmm2ext/window_title.h>
-
-#include <midi++/manager.h>
-
-#include <ardour/ardour.h>
-#include <ardour/profile.h>
-#include <ardour/session_directory.h>
-#include <ardour/session_route.h>
-#include <ardour/session_state_utils.h>
-#include <ardour/session_utils.h>
-#include <ardour/port.h>
-#include <ardour/audioengine.h>
-#include <ardour/playlist.h>
-#include <ardour/utils.h>
-#include <ardour/audio_diskstream.h>
-#include <ardour/audiofilesource.h>
-#include <ardour/recent_sessions.h>
-#include <ardour/port.h>
-#include <ardour/audio_track.h>
-#include <ardour/midi_track.h>
-#include <ardour/filesystem_paths.h>
-#include <ardour/filename_extensions.h>
+#include "pbd/error.h"
+#include "pbd/basename.h"
+#include "pbd/compose.h"
+#include "pbd/failed_constructor.h"
+#include "pbd/enumwriter.h"
+#include "pbd/memento_command.h"
+#include "pbd/file_utils.h"
+
+#include "gtkmm2ext/gtk_ui.h"
+#include "gtkmm2ext/utils.h"
+#include "gtkmm2ext/click_box.h"
+#include "gtkmm2ext/fastmeter.h"
+#include "gtkmm2ext/stop_signal.h"
+#include "gtkmm2ext/popup.h"
+#include "gtkmm2ext/window_title.h"
+
+#include "midi++/manager.h"
+
+#include "ardour/ardour.h"
+#include "ardour/profile.h"
+#include "ardour/session_directory.h"
+#include "ardour/session_route.h"
+#include "ardour/session_state_utils.h"
+#include "ardour/session_utils.h"
+#include "ardour/port.h"
+#include "ardour/audioengine.h"
+#include "ardour/playlist.h"
+#include "ardour/utils.h"
+#include "ardour/audio_diskstream.h"
+#include "ardour/audiofilesource.h"
+#include "ardour/recent_sessions.h"
+#include "ardour/port.h"
+#include "ardour/audio_track.h"
+#include "ardour/midi_track.h"
+#include "ardour/filesystem_paths.h"
+#include "ardour/filename_extensions.h"
+
+typedef uint64_t microseconds_t;
 
 #include "actions.h"
 #include "ardour_ui.h"
 #include "prompter.h"
 #include "opts.h"
 #include "add_route_dialog.h"
-#include "new_session_dialog.h"
 #include "about.h"
 #include "splash.h"
 #include "utils.h"
 #include "gui_thread.h"
 #include "theme_manager.h"
 #include "bundle_manager.h"
+#include "session_metadata_dialog.h"
+#include "gain_meter.h"
+#include "route_time_axis.h"
+#include "startup.h"
+#include "engine_dialog.h"
+#include "processor_box.h"
 
 #include "i18n.h"
 
@@ -108,16 +115,12 @@ sigc::signal<void,nframes_t, bool, nframes_t> ARDOUR_UI::Clock;
 
 ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
 
-       : Gtkmm2ext::UI (X_("Ardour"), argcp, argvp),
-         
-         primary_clock (X_("primary"), false, X_("TransportClockDisplay"), true, false, true),
-         secondary_clock (X_("secondary"), false, X_("SecondaryClockDisplay"), true, false, true),
-         preroll_clock (X_("preroll"), false, X_("PreRollClock"), true, true),
-         postroll_clock (X_("postroll"), false, X_("PostRollClock"), true, true),
+       : Gtkmm2ext::UI (X_("gui"), argcp, argvp),
 
-         /* adjuster table */
-
-         adjuster_table (3, 3),
+         primary_clock (X_("primary"), false, X_("TransportClockDisplay"), true, true, false, true),
+         secondary_clock (X_("secondary"), false, X_("SecondaryClockDisplay"), true, true, false, true),
+         preroll_clock (X_("preroll"), false, X_("PreRollClock"), true, false, true),
+         postroll_clock (X_("postroll"), false, X_("PostRollClock"), true, false, true),
 
          /* preroll stuff */
 
@@ -126,18 +129,18 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
 
          /* big clock */
 
-         big_clock (X_("bigclock"), false, "BigClockNonRecording", true, false, true),
+         big_clock (X_("bigclock"), false, "BigClockNonRecording", true, true, false, true),
 
          /* transport */
 
-         roll_controllable ("transport roll", *this, TransportControllable::Roll),
-         stop_controllable ("transport stop", *this, TransportControllable::Stop),
-         goto_start_controllable ("transport goto start", *this, TransportControllable::GotoStart),
-         goto_end_controllable ("transport goto end", *this, TransportControllable::GotoEnd),
-         auto_loop_controllable ("transport auto loop", *this, TransportControllable::AutoLoop),
-         play_selection_controllable ("transport play selection", *this, TransportControllable::PlaySelection),
-         rec_controllable ("transport rec-enable", *this, TransportControllable::RecordEnable),
-         shuttle_controllable ("shuttle", *this, TransportControllable::ShuttleControl),
+         roll_controllable (new TransportControllable ("transport roll", *this, TransportControllable::Roll)),
+         stop_controllable (new TransportControllable ("transport stop", *this, TransportControllable::Stop)),
+         goto_start_controllable (new TransportControllable ("transport goto start", *this, TransportControllable::GotoStart)),
+         goto_end_controllable (new TransportControllable ("transport goto end", *this, TransportControllable::GotoEnd)),
+         auto_loop_controllable (new TransportControllable ("transport auto loop", *this, TransportControllable::AutoLoop)),
+         play_selection_controllable (new TransportControllable ("transport play selection", *this, TransportControllable::PlaySelection)),
+         rec_controllable (new TransportControllable ("transport rec-enable", *this, TransportControllable::RecordEnable)),
+         shuttle_controllable (new TransportControllable ("shuttle", *this, TransportControllable::ShuttleControl)),
          shuttle_controller_binding_proxy (shuttle_controllable),
 
          roll_button (roll_controllable),
@@ -147,7 +150,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
          auto_loop_button (auto_loop_controllable),
          play_selection_button (play_selection_controllable),
          rec_button (rec_controllable),
-         
+
          shuttle_units_button (_("% ")),
 
          punch_in_button (_("Punch In")),
@@ -167,18 +170,20 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
        using namespace Gtk::Menu_Helpers;
 
        Gtkmm2ext::init();
-       
+
 
 #ifdef TOP_MENUBAR
-       _auto_display_errors = false;
+       // _auto_display_errors = false;
+       /*
+        * This was commented out as it wasn't defined
+        * in A3 IIRC.  If this is not needed it should
+        * be completely removed.
+        */
 #endif
+
        about = 0;
        splash = 0;
-
-       if (ARDOUR_COMMAND_LINE::session_name.length()) {       
-               /* only show this if we're not going to post the new session dialog */
-               show_splash ();
-       }
+       _startup = 0;
 
        if (theArdourUI == 0) {
                theArdourUI = this;
@@ -186,45 +191,39 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
 
        ui_config = new UIConfiguration();
        theme_manager = new ThemeManager();
-       
+
        editor = 0;
        mixer = 0;
        session = 0;
        editor = 0;
+       engine = 0;
        _session_is_new = false;
        big_clock_window = 0;
        session_selector_window = 0;
        last_key_press_time = 0;
-       connection_editor = 0;
        _will_create_new_session_automatically = false;
-       new_session_dialog = 0;
-       loading_dialog = 0;
        add_route_dialog = 0;
        route_params = 0;
-       option_editor = 0;
+       rc_option_editor = 0;
+       session_option_editor = 0;
        location_ui = 0;
        open_session_selector = 0;
        have_configure_timeout = false;
        have_disk_speed_dialog_displayed = false;
        session_loaded = false;
        last_speed_displayed = -1.0f;
-       
-       sys::path key_bindings_file;
-
-       find_file_in_search_path (ardour_search_path() + system_config_search_path(),
-                       "ardour.bindings", key_bindings_file);
+       ignore_dual_punch = false;
+       _mixer_on_top = false;
 
-       keybindings_path = key_bindings_file.to_string();
+       roll_button.unset_flags (Gtk::CAN_FOCUS);
+       stop_button.unset_flags (Gtk::CAN_FOCUS);
+       goto_start_button.unset_flags (Gtk::CAN_FOCUS);
+       goto_end_button.unset_flags (Gtk::CAN_FOCUS);
+       auto_loop_button.unset_flags (Gtk::CAN_FOCUS);
+       play_selection_button.unset_flags (Gtk::CAN_FOCUS);
+       rec_button.unset_flags (Gtk::CAN_FOCUS);
 
-       /* store all bindings changes in per-user file, no matter where they were loaded from */
-       user_keybindings_path = user_config_directory().to_string ();
-       user_keybindings_path += '/';
-       user_keybindings_path += "ardour.bindings";
-
-       can_save_keybindings = false;
-
-       last_configure_time.tv_sec = 0;
-       last_configure_time.tv_usec = 0;
+       last_configure_time= 0;
 
        shuttle_grabbed = false;
        shuttle_fract = 0.0;
@@ -233,36 +232,56 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
        shuttle_style_menu = 0;
        shuttle_unit_menu = 0;
 
-       gettimeofday (&last_peak_grab, 0);
-       gettimeofday (&last_shuttle_request, 0);
+        // We do not have jack linked in yet so;
+
+       last_shuttle_request = last_peak_grab = 0; //  get_microseconds();
 
        ARDOUR::Diskstream::DiskOverrun.connect (mem_fun(*this, &ARDOUR_UI::disk_overrun_handler));
        ARDOUR::Diskstream::DiskUnderrun.connect (mem_fun(*this, &ARDOUR_UI::disk_underrun_handler));
 
+       /* handle dialog requests */
+
+       ARDOUR::Session::Dialog.connect (mem_fun(*this, &ARDOUR_UI::session_dialog));
+
        /* handle pending state with a dialog */
 
        ARDOUR::Session::AskAboutPendingState.connect (mem_fun(*this, &ARDOUR_UI::pending_state_dialog));
 
+       /* handle sr mismatch with a dialog */
+
+       ARDOUR::Session::AskAboutSampleRateMismatch.connect (mem_fun(*this, &ARDOUR_UI::sr_mismatch_dialog));
+
        /* lets get this party started */
 
-       try {
+       try {
                if (ARDOUR::init (ARDOUR_COMMAND_LINE::use_vst, ARDOUR_COMMAND_LINE::try_hw_optimization)) {
                        throw failed_constructor ();
                }
 
                setup_gtk_ardour_enums ();
-               Config->set_current_owner (ConfigVariableBase::Interface);
                setup_profile ();
 
+               GainMeter::setup_slider_pix ();
+               RouteTimeAxisView::setup_slider_pix ();
+               SendProcessorEntry::setup_slider_pix ();
+               SessionEvent::create_per_thread_pool ("GUI", 512);
+
        } catch (failed_constructor& err) {
                error << _("could not initialize Ardour.") << endmsg;
                // pass it on up
                throw;
-       } 
+       }
 
        /* we like keyboards */
 
-       keyboard = new Keyboard;
+       keyboard = new ArdourKeyboard;
+
+       XMLNode* node = ARDOUR_UI::instance()->keyboard_settings();
+       if (node) {
+               keyboard->set_state (*node, Stateful::loading_state_version);
+       }
+
+       reset_dpi();
 
        starting.connect (mem_fun(*this, &ARDOUR_UI::startup));
        stopping.connect (mem_fun(*this, &ARDOUR_UI::shutdown));
@@ -270,6 +289,29 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
        platform_setup ();
 }
 
+/** @return true if a session was chosen and `apply' clicked, otherwise false if `cancel' was clicked */
+bool
+ARDOUR_UI::run_startup (bool should_be_new)
+{
+       if (_startup == 0) {
+               _startup = new ArdourStartup ();
+       }
+
+       _startup->set_new_only (should_be_new);
+       _startup->present ();
+
+       main().run();
+
+       _startup->hide ();
+
+       switch (_startup->response()) {
+       case RESPONSE_OK:
+               return true;
+       default:
+               return false;
+       }
+}
+
 int
 ARDOUR_UI::create_engine ()
 {
@@ -279,14 +321,9 @@ ARDOUR_UI::create_engine ()
                return 0;
        }
 
-#ifdef __APPLE__
-       // OS X where everything is sllloooowwww
-       loading_dialog->set_message (_("Starting audio engine"));
-       loading_dialog->show_all ();
-       flush_pending ();
-#endif                                 
+       loading_message (_("Starting audio engine"));
 
-       try { 
+       try {
                engine = new ARDOUR::AudioEngine (ARDOUR_COMMAND_LINE::jack_client_name);
 
        } catch (...) {
@@ -307,13 +344,13 @@ ARDOUR_UI::create_engine ()
 void
 ARDOUR_UI::post_engine ()
 {
-       extern int setup_midi ();
-
        /* Things to be done once we create the AudioEngine
         */
 
        MIDI::Manager::instance()->set_api_data (engine->jack());
        setup_midi ();
+       
+       ARDOUR::init_post_engine ();
 
        ActionManager::init ();
        _tooltips.enable();
@@ -345,10 +382,6 @@ ARDOUR_UI::post_engine ()
 
        blink_timeout_tag = -1;
 
-       /* the global configuration object is now valid */
-
-       use_config ();
-
        /* this being a GUI and all, we want peakfiles */
 
        AudioFileSource::set_build_peakfiles (true);
@@ -356,11 +389,16 @@ ARDOUR_UI::post_engine ()
 
        /* set default clock modes */
 
-       primary_clock.set_mode (AudioClock::SMPTE);
-       secondary_clock.set_mode (AudioClock::BBT);
+       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);
+       }
 
        /* start the time-of-day-clock */
-       
+
 #ifndef GTKOSX
        /* OS X provides an always visible wallclock, so don't be stupid */
        update_wall_clock ();
@@ -371,12 +409,15 @@ ARDOUR_UI::post_engine ()
        update_cpu_load ();
        update_sample_rate (engine->frame_rate());
 
+       Config->ParameterChanged.connect (mem_fun (*this, &ARDOUR_UI::parameter_changed));
+       Config->map_parameters (mem_fun (*this, &ARDOUR_UI::parameter_changed));
+
        /* now start and maybe save state */
 
        if (do_engine_start () == 0) {
                if (session && _session_is_new) {
-                       /* we need to retain initial visual 
-                          settings for a new session 
+                       /* we need to retain initial visual
+                          settings for a new session
                        */
                        session->save_state ("");
                }
@@ -387,46 +428,33 @@ ARDOUR_UI::~ARDOUR_UI ()
 {
        save_ardour_state ();
 
-       if (keyboard) {
-               delete keyboard;
-       }
-
-       if (editor) {
-               delete editor;
-       }
-
-       if (mixer) {
-               delete mixer;
-       }
-
-       if (add_route_dialog) {
-               delete add_route_dialog;
-       }
-
+       delete keyboard;
+       delete editor;
+       delete mixer;
+       delete add_route_dialog;
+}
 
-       if (new_session_dialog) {
-               delete new_session_dialog;
+void
+ARDOUR_UI::pop_back_splash ()
+{
+       if (Splash::instance()) {
+               // Splash::instance()->pop_back();
+               Splash::instance()->hide ();
        }
 }
 
 gint
 ARDOUR_UI::configure_timeout ()
 {
-       struct timeval now;
-       struct timeval diff;
-
-       if (last_configure_time.tv_sec == 0 && last_configure_time.tv_usec == 0) {
+       if (last_configure_time == 0) {
                /* no configure events yet */
                return TRUE;
        }
 
-       gettimeofday (&now, 0);
-       timersub (&now, &last_configure_time, &diff);
-
        /* force a gap of 0.5 seconds since the last configure event
         */
 
-       if (diff.tv_sec == 0 && diff.tv_usec < 500000) {
+       if (get_microseconds() - last_configure_time < 500000) {
                return TRUE;
        } else {
                have_configure_timeout = false;
@@ -436,15 +464,15 @@ ARDOUR_UI::configure_timeout ()
 }
 
 gboolean
-ARDOUR_UI::configure_handler (GdkEventConfigure* conf)
+ARDOUR_UI::configure_handler (GdkEventConfigure* /*conf*/)
 {
        if (have_configure_timeout) {
-               gettimeofday (&last_configure_time, 0);
+               last_configure_time = get_microseconds();
        } else {
                Glib::signal_timeout().connect (mem_fun(*this, &ARDOUR_UI::configure_timeout), 100);
                have_configure_timeout = true;
        }
-               
+
        return FALSE;
 }
 
@@ -454,28 +482,28 @@ ARDOUR_UI::set_transport_controllable_state (const XMLNode& node)
        const XMLProperty* prop;
 
        if ((prop = node.property ("roll")) != 0) {
-               roll_controllable.set_id (prop->value());
+               roll_controllable->set_id (prop->value());
        }
        if ((prop = node.property ("stop")) != 0) {
-               stop_controllable.set_id (prop->value());
+               stop_controllable->set_id (prop->value());
        }
-       if ((prop = node.property ("goto_start")) != 0) {
-               goto_start_controllable.set_id (prop->value());
+       if ((prop = node.property ("goto-start")) != 0) {
+               goto_start_controllable->set_id (prop->value());
        }
-       if ((prop = node.property ("goto_end")) != 0) {
-               goto_end_controllable.set_id (prop->value());
+       if ((prop = node.property ("goto-end")) != 0) {
+               goto_end_controllable->set_id (prop->value());
        }
-       if ((prop = node.property ("auto_loop")) != 0) {
-               auto_loop_controllable.set_id (prop->value());
+       if ((prop = node.property ("auto-loop")) != 0) {
+               auto_loop_controllable->set_id (prop->value());
        }
-       if ((prop = node.property ("play_selection")) != 0) {
-               play_selection_controllable.set_id (prop->value());
+       if ((prop = node.property ("play-selection")) != 0) {
+               play_selection_controllable->set_id (prop->value());
        }
        if ((prop = node.property ("rec")) != 0) {
-               rec_controllable.set_id (prop->value());
+               rec_controllable->set_id (prop->value());
        }
        if ((prop = node.property ("shuttle")) != 0) {
-               shuttle_controllable.set_id (prop->value());
+               shuttle_controllable->set_id (prop->value());
        }
 }
 
@@ -485,21 +513,21 @@ ARDOUR_UI::get_transport_controllable_state ()
        XMLNode* node = new XMLNode(X_("TransportControllables"));
        char buf[64];
 
-       roll_controllable.id().print (buf, sizeof (buf));
+       roll_controllable->id().print (buf, sizeof (buf));
        node->add_property (X_("roll"), buf);
-       stop_controllable.id().print (buf, sizeof (buf));
+       stop_controllable->id().print (buf, sizeof (buf));
        node->add_property (X_("stop"), buf);
-       goto_start_controllable.id().print (buf, sizeof (buf));
+       goto_start_controllable->id().print (buf, sizeof (buf));
        node->add_property (X_("goto_start"), buf);
-       goto_end_controllable.id().print (buf, sizeof (buf));
+       goto_end_controllable->id().print (buf, sizeof (buf));
        node->add_property (X_("goto_end"), buf);
-       auto_loop_controllable.id().print (buf, sizeof (buf));
+       auto_loop_controllable->id().print (buf, sizeof (buf));
        node->add_property (X_("auto_loop"), buf);
-       play_selection_controllable.id().print (buf, sizeof (buf));
+       play_selection_controllable->id().print (buf, sizeof (buf));
        node->add_property (X_("play_selection"), buf);
-       rec_controllable.id().print (buf, sizeof (buf));
+       rec_controllable->id().print (buf, sizeof (buf));
        node->add_property (X_("rec"), buf);
-       shuttle_controllable.id().print (buf, sizeof (buf));
+       shuttle_controllable->id().print (buf, sizeof (buf));
        node->add_property (X_("shuttle"), buf);
 
        return *node;
@@ -511,7 +539,7 @@ ARDOUR_UI::save_ardour_state ()
        if (!keyboard || !mixer || !editor) {
                return;
        }
-       
+
        /* XXX this is all a bit dubious. add_extra_xml() uses
           a different lifetime model from add_instant_xml().
        */
@@ -519,6 +547,9 @@ ARDOUR_UI::save_ardour_state ()
        XMLNode* node = new XMLNode (keyboard->get_state());
        Config->add_extra_xml (*node);
        Config->add_extra_xml (get_transport_controllable_state());
+       if (_startup && _startup->engine_control() && _startup->engine_control()->was_used()) {
+               Config->add_extra_xml (_startup->engine_control()->get_state());
+       }
        Config->save_state();
        ui_config->save_state ();
 
@@ -527,25 +558,34 @@ ARDOUR_UI::save_ardour_state ()
 
        if (session) {
                session->add_instant_xml (enode);
-       session->add_instant_xml (mnode);
+               session->add_instant_xml (mnode);
        } else {
                Config->add_instant_xml (enode);
                Config->add_instant_xml (mnode);
        }
 
-       save_keybindings ();
+       Keyboard::save_keybindings ();
 }
 
 gint
 ARDOUR_UI::autosave_session ()
 {
-       if (!Config->get_periodic_safety_backups())
+       if (g_main_depth() > 1) {
+               /* inside a recursive main loop,
+                  give up because we may not be able to
+                  take a lock.
+               */
                return 1;
+       }
 
-       if (session) {
-               session->maybe_write_autosave();
+        if (!Config->get_periodic_safety_backups()) {
+                return 1;
        }
 
+        if (session) {
+                session->maybe_write_autosave();
+        }
+
        return 1;
 }
 
@@ -554,7 +594,7 @@ ARDOUR_UI::update_autosave ()
 {
        ENSURE_GUI_THREAD (mem_fun (*this, &ARDOUR_UI::update_autosave));
 
-       if (session->dirty()) {
+       if (session && session->dirty()) {
                if (_autosave_connection.connected()) {
                        _autosave_connection.disconnect();
                }
@@ -565,7 +605,7 @@ ARDOUR_UI::update_autosave ()
        } else {
                if (_autosave_connection.connected()) {
                        _autosave_connection.disconnect();
-               }               
+               }
        }
 }
 
@@ -583,7 +623,7 @@ ARDOUR_UI::backend_audio_error (bool we_set_params, Gtk::Window* toplevel)
                           false,
                           Gtk::MESSAGE_INFO,
                           Gtk::BUTTONS_NONE);
-       
+
        if (we_set_params) {
                win.set_secondary_text(_("There are several possible reasons:\n\
 \n\
@@ -609,49 +649,37 @@ Please consider the possibilities, and perhaps (re)start JACK."));
                win.add_button (Stock::OK, RESPONSE_CLOSE);
        } else {
                win.add_button (Stock::QUIT, RESPONSE_CLOSE);
-       }
+       }
 
        win.set_default_response (RESPONSE_CLOSE);
-       
+
        win.show_all ();
        win.set_position (Gtk::WIN_POS_CENTER);
-
-       hide_splash ();
+       pop_back_splash ();
 
        /* we just don't care about the result, but we want to block */
 
        win.run ();
 }
 
-static bool
-_hide_splash (gpointer arg)
-{
-       ((ARDOUR_UI*)arg)->hide_splash();
-       return false;
-}
-
 void
 ARDOUR_UI::startup ()
 {
-       string name, path;
+       XMLNode* audio_setup = Config->extra_xml ("AudioSetup");
 
-       new_session_dialog = new NewSessionDialog();
+       if (audio_setup && _startup && _startup->engine_control()) {
+               _startup->engine_control()->set_state (*audio_setup);
+       }
 
-       // in 4 seconds, hide the splash screen 
+       if (get_session_parameters (true, ARDOUR_COMMAND_LINE::new_session)) {
+               exit (1);
+       }
 
-       Glib::signal_timeout().connect (bind (sigc::ptr_fun (_hide_splash), this), 4000);
+       use_config ();
 
-       bool backend_audio_is_running = EngineControl::engine_running();
-       XMLNode* audio_setup = Config->extra_xml ("AudioSetup");
-       
-       if (audio_setup) {
-               new_session_dialog->engine_control.set_state (*audio_setup);
-       }
-       
-       if (!get_session_parameters (backend_audio_is_running, ARDOUR_COMMAND_LINE::new_session)) {
-               return;
-       }
-       
+       goto_editor_window ();
+
+       BootMessage (_("Ardour is ready for use"));
        show ();
 }
 
@@ -687,30 +715,32 @@ ARDOUR_UI::check_memory_locking ()
                if (getrlimit (RLIMIT_MEMLOCK, &limits)) {
                        return;
                }
-               
+
                if (limits.rlim_cur != RLIM_INFINITY) {
 
                        if (ram == 0 || ((double) limits.rlim_cur / ram) < 0.75) {
-                       
+
 
                                MessageDialog msg (_("WARNING: Your system has a limit for maximum amount of locked memory. "
                                                     "This might cause Ardour to run out of memory before your system "
                                                     "runs out of memory. \n\n"
                                                     "You can view the memory limit with 'ulimit -l', "
                                                     "and it is normally controlled by /etc/security/limits.conf"));
-                               
+
                                VBox* vbox = msg.get_vbox();
                                HBox hbox;
                                CheckButton cb (_("Do not show this window again"));
-                               
+
                                cb.signal_toggled().connect (mem_fun (*this, &ARDOUR_UI::no_memory_warning));
-                               
+
                                hbox.pack_start (cb, true, false);
                                vbox->pack_start (hbox);
                                cb.show();
                                vbox->show();
                                hbox.show ();
-                               
+
+                               pop_back_splash ();
+
                                editor->ensure_float (msg);
                                msg.run ();
                        }
@@ -727,7 +757,7 @@ ARDOUR_UI::finish()
 
                if (session->transport_rolling()) {
                        session->request_stop ();
-                       usleep (2500000);
+                       usleep (250000);
                }
 
                if (session->dirty()) {
@@ -739,11 +769,12 @@ ARDOUR_UI::finish()
                                /* use the default name */
                                if (save_state_canfail ("")) {
                                        /* failed - don't quit */
-                                       MessageDialog msg (*editor, 
+                                       MessageDialog msg (*editor,
                                                           _("\
 Ardour was unable to save your session.\n\n\
 If you still wish to quit, please use the\n\n\
 \"Just quit\" option."));
+                                       pop_back_splash();
                                        msg.run ();
                                        return;
                                }
@@ -752,13 +783,21 @@ If you still wish to quit, please use the\n\n\
                                break;
                        }
                }
+
+               second_connection.disconnect ();
+               point_one_second_connection.disconnect ();
+               point_oh_five_second_connection.disconnect ();
+               point_zero_one_second_connection.disconnect();
                
-               session->set_deletion_in_progress ();
+               // session->set_deletion_in_progress ();
+               session->remove_pending_capture_state ();
+               delete session;
+               session = 0;
        }
 
+       ArdourDialog::close_all_dialogs ();
        engine->stop (true);
-       Config->save_state();
-       ARDOUR_UI::config()->save_state();
+       save_ardour_state ();
        quit ();
 }
 
@@ -792,15 +831,14 @@ ARDOUR_UI::ask_about_saving_session (const string & what)
        } else {
                type = _("snapshot");
        }
-       prompt = string_compose(_("The %1\"%2\"\nhas not been saved.\n\nAny changes made this time\nwill be lost unless you save it.\n\nWhat do you want to do?"), 
+       prompt = string_compose(_("The %1 \"%2\"\nhas not been saved.\n\nAny changes made this time\nwill be lost unless you save it.\n\nWhat do you want to do?"),
                         type, session->snap_name());
-       
+
        prompt_label.set_text (prompt);
        prompt_label.set_name (X_("PrompterLabel"));
        prompt_label.set_alignment(ALIGN_LEFT, ALIGN_TOP);
 
-       dimage->set_alignment(ALIGN_CENTER, ALIGN_TOP)
-;
+       dimage->set_alignment(ALIGN_CENTER, ALIGN_TOP);
        dhbox.set_homogeneous (false);
        dhbox.pack_start (*dimage, false, false, 5);
        dhbox.pack_start (prompt_label, true, false, 5);
@@ -815,9 +853,6 @@ ARDOUR_UI::ask_about_saving_session (const string & what)
        prompt_label.show();
        dimage->show();
        window.show();
-
-       save_the_session = 0;
-
        window.set_keep_above (true);
        window.present ();
 
@@ -836,7 +871,7 @@ ARDOUR_UI::ask_about_saving_session (const string & what)
 
        return -1;
 }
-       
+
 gint
 ARDOUR_UI::every_second ()
 {
@@ -877,13 +912,13 @@ ARDOUR_UI::update_sample_rate (nframes_t ignored)
        } else {
 
                nframes_t rate = engine->frame_rate();
-               
+
                if (fmod (rate, 1000.0) != 0.0) {
-                       snprintf (buf, sizeof (buf), _("%.1f kHz / %4.1f ms"), 
+                       snprintf (buf, sizeof (buf), _("%.1f kHz / %4.1f ms"),
                                  (float) rate/1000.0f,
                                  (engine->frames_per_cycle() / (float) rate) * 1000.0f);
                } else {
-                       snprintf (buf, sizeof (buf), _("%u kHz / %4.1f ms"), 
+                       snprintf (buf, sizeof (buf), _("%u kHz / %4.1f ms"),
                                  rate/1000,
                                  (engine->frames_per_cycle() / (float) rate) * 1000.0f);
                }
@@ -904,9 +939,15 @@ void
 ARDOUR_UI::update_buffer_load ()
 {
        char buf[64];
+       uint32_t c, p;
 
        if (session) {
-               snprintf (buf, sizeof (buf), _("Buffers p:%" PRIu32 "%% c:%" PRIu32 "%%"), 
+               c = session->capture_load ();
+               p = session->playback_load ();
+
+               push_buffer_stats (c, p);
+
+               snprintf (buf, sizeof (buf), _("Buffers p:%" PRIu32 "%% c:%" PRIu32 "%%"),
                          session->playback_load(), session->capture_load());
                buffer_load_label.set_text (buf);
        } else {
@@ -932,33 +973,42 @@ ARDOUR_UI::update_disk_space()
 
        nframes_t frames = session->available_capture_duration();
        char buf[64];
+       nframes_t fr = session->frame_rate();
 
        if (frames == max_frames) {
                strcpy (buf, _("Disk: 24hrs+"));
        } else {
-               int hrs;
-               int mins;
-               int secs;
-               nframes_t fr = session->frame_rate();
-               
                rec_enabled_streams = 0;
                session->foreach_route (this, &ARDOUR_UI::count_recenabled_streams);
-               
+
                if (rec_enabled_streams) {
                        frames /= rec_enabled_streams;
                }
-               
+
+               int hrs;
+               int mins;
+               int secs;
+
                hrs  = frames / (fr * 3600);
                frames -= hrs * fr * 3600;
                mins = frames / (fr * 60);
                frames -= mins * fr * 60;
                secs = frames / fr;
-               
+
                snprintf (buf, sizeof(buf), _("Disk: %02dh:%02dm:%02ds"), hrs, mins, secs);
        }
 
        disk_space_label.set_text (buf);
-}                
+
+       // An attempt to make the disk space label flash red when space has run out.
+
+       if (frames < fr * 60 * 5) {
+       /*      disk_space_box.style ("disk_space_label_empty"); */
+       } else {
+       /*      disk_space_box.style ("disk_space_label"); */
+       }
+
+}
 
 gint
 ARDOUR_UI::update_wall_clock ()
@@ -977,7 +1027,7 @@ ARDOUR_UI::update_wall_clock ()
 }
 
 gint
-ARDOUR_UI::session_menu (GdkEventButton *ev)
+ARDOUR_UI::session_menu (GdkEventButton */*ev*/)
 {
        session_popup_menu->popup (0, 0);
        return TRUE;
@@ -988,7 +1038,7 @@ ARDOUR_UI::redisplay_recent_sessions ()
 {
        std::vector<sys::path> session_directories;
        RecentSessionsSorter cmp;
-       
+
        recent_session_display.set_model (Glib::RefPtr<TreeModel>(0));
        recent_session_model->clear ();
 
@@ -1002,34 +1052,51 @@ ARDOUR_UI::redisplay_recent_sessions ()
        //
        // 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<sys::path>::const_iterator i = session_directories.begin();
                        i != session_directories.end(); ++i)
        {
                std::vector<sys::path> state_file_paths;
-           
+
                // now get available states for this session
 
                get_state_files_in_directory (*i, state_file_paths);
 
-               if (state_file_paths.empty()) {
-                       // no state file?
+               vector<string*>* states;
+               vector<const gchar*> item;
+               string fullpath = (*i).to_string();
+
+               /* 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 */
+                       cerr << "skipping non-existent session " << fullpath << endl;
+                       continue;
+               }
+
+               /* now get available states for this session */
+
+               if ((states = Session::possible_states (fullpath)) == 0) {
+                       /* 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());
 
-               const string fullpath = (*i).to_string();
-               
                row[recent_session_columns.visible_name] = Glib::path_get_basename (fullpath);
                row[recent_session_columns.fullpath] = fullpath;
-               
+
                if (state_file_names.size() > 1) {
 
                        // add the children
@@ -1052,10 +1119,10 @@ ARDOUR_UI::redisplay_recent_sessions ()
 void
 ARDOUR_UI::build_session_selector ()
 {
-       session_selector_window = new ArdourDialog ("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);
@@ -1079,7 +1146,7 @@ ARDOUR_UI::build_session_selector ()
 }
 
 void
-ARDOUR_UI::recent_session_row_activated (const TreePath& path, TreeViewColumn* col)
+ARDOUR_UI::recent_session_row_activated (const TreePath& /*path*/, TreeViewColumn* /*col*/)
 {
        session_selector_window->response (RESPONSE_ACCEPT);
 }
@@ -1092,15 +1159,15 @@ ARDOUR_UI::open_recent_session ()
        if (session_selector_window == 0) {
                build_session_selector ();
        }
-       
+
        redisplay_recent_sessions ();
 
        while (true) {
-               
+
                session_selector_window->set_position (WIN_POS_MOUSE);
 
                ResponseType r = (ResponseType) session_selector_window->run ();
-               
+
                switch (r) {
                case RESPONSE_ACCEPT:
                        break;
@@ -1116,20 +1183,20 @@ ARDOUR_UI::open_recent_session ()
                if (recent_session_display.get_selection()->count_selected_rows() == 0) {
                        continue;
                }
-               
+
                session_selector_window->hide();
 
                Gtk::TreeModel::iterator i = recent_session_display.get_selection()->get_selected();
-               
+
                if (i == recent_session_model->children().end()) {
                        return;
                }
-               
+
                Glib::ustring path = (*i)[recent_session_columns.fullpath];
                Glib::ustring state = (*i)[recent_session_columns.visible_name];
-               
+
                _session_is_new = false;
-               
+
                if (load_session (path, state) == 0) {
                        break;
                }
@@ -1138,33 +1205,6 @@ ARDOUR_UI::open_recent_session ()
        }
 }
 
-bool
-ARDOUR_UI::filter_ardour_session_dirs (const FileFilter::Info& info) 
-{
-       struct stat statbuf;
-
-       if (stat (info.filename.c_str(), &statbuf) != 0) {
-               return false;
-       }
-
-       if (!S_ISDIR(statbuf.st_mode)) {
-               return false;
-       }
-
-        // XXX Portability
-        
-       string session_file = info.filename;
-       session_file += '/';
-       session_file += Glib::path_get_basename (info.filename);
-       session_file += ".ardour";
-       
-       if (stat (session_file.c_str(), &statbuf) != 0) {
-               return false;
-       }
-
-       return S_ISREG (statbuf.st_mode);
-}
-
 bool
 ARDOUR_UI::check_audioengine ()
 {
@@ -1172,6 +1212,7 @@ ARDOUR_UI::check_audioengine ()
                if (!engine->connected()) {
                        MessageDialog msg (_("Ardour is not connected to JACK\n"
                                             "You cannot open or close sessions in this condition"));
+                       pop_back_splash ();
                        msg.run ();
                        return false;
                }
@@ -1186,7 +1227,7 @@ ARDOUR_UI::open_session ()
 {
        if (!check_audioengine()) {
                return;
-               
+
        }
 
        /* popup selector window */
@@ -1195,7 +1236,7 @@ ARDOUR_UI::open_session ()
 
                /* ardour sessions are folders */
 
-               open_session_selector = new Gtk::FileChooserDialog (_("open session"), FILE_CHOOSER_ACTION_OPEN);
+               open_session_selector = new Gtk::FileChooserDialog (_("Open Session"), FILE_CHOOSER_ACTION_OPEN);
                open_session_selector->add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
                open_session_selector->add_button (Gtk::Stock::OPEN, Gtk::RESPONSE_ACCEPT);
                open_session_selector->set_default_response(Gtk::RESPONSE_ACCEPT);
@@ -1233,7 +1274,7 @@ ARDOUR_UI::open_session ()
 
 
 void
-ARDOUR_UI::session_add_midi_route (bool disk, uint32_t how_many)
+ARDOUR_UI::session_add_midi_route (bool disk, RouteGroup* route_group, uint32_t how_many)
 {
        list<boost::shared_ptr<MidiTrack> > tracks;
 
@@ -1242,10 +1283,10 @@ ARDOUR_UI::session_add_midi_route (bool disk, uint32_t how_many)
                return;
        }
 
-       try { 
+       try {
                if (disk) {
 
-                       tracks = session->new_midi_track (ARDOUR::Normal, how_many);
+                       tracks = session->new_midi_track (ARDOUR::Normal, route_group, how_many);
 
                        if (tracks.size() != how_many) {
                                if (how_many == 1) {
@@ -1262,7 +1303,7 @@ ARDOUR_UI::session_add_midi_route (bool disk, uint32_t how_many)
        }
 
        catch (...) {
-               MessageDialog msg (*editor, 
+               MessageDialog msg (*editor,
                                   _("There are insufficient JACK ports available\n\
 to create a new track or bus.\n\
 You should save Ardour, exit and\n\
@@ -1273,32 +1314,32 @@ restart JACK with more ports."));
 
 
 void
-ARDOUR_UI::session_add_audio_route (bool track, int32_t input_channels, int32_t output_channels, ARDOUR::TrackMode mode, uint32_t how_many)
+ARDOUR_UI::session_add_audio_route (bool track, bool aux, int32_t input_channels, int32_t output_channels, ARDOUR::TrackMode mode, RouteGroup* route_group, uint32_t how_many)
 {
        list<boost::shared_ptr<AudioTrack> > tracks;
-       Session::RouteList routes;
+       RouteList routes;
 
        if (session == 0) {
                warning << _("You cannot add a track or bus without a session already loaded.") << endmsg;
                return;
        }
 
-       try { 
+       try {
                if (track) {
-                       tracks = session->new_audio_track (input_channels, output_channels, mode, how_many);
+                       tracks = session->new_audio_track (input_channels, output_channels, mode, route_group, how_many);
 
                        if (tracks.size() != how_many) {
                                if (how_many == 1) {
                                        error << _("could not create a new audio track") << endmsg;
                                } else {
-                                       error << string_compose (_("could only create %1 of %2 new audio %3"), 
+                                       error << string_compose (_("could only create %1 of %2 new audio %3"),
                                                                 tracks.size(), how_many, (track ? _("tracks") : _("busses"))) << endmsg;
                                }
                        }
 
                } else {
 
-                       routes = session->new_audio_route (input_channels, output_channels, how_many);
+                       routes = session->new_audio_route (aux, input_channels, output_channels, route_group, how_many);
 
                        if (routes.size() != how_many) {
                                if (how_many == 1) {
@@ -1308,14 +1349,14 @@ ARDOUR_UI::session_add_audio_route (bool track, int32_t input_channels, int32_t
                                }
                        }
                }
-               
+
 #if CONTROLOUTS
                if (need_control_room_outs) {
                        pan_t pans[2];
-                       
+
                        pans[0] = 0.5;
                        pans[1] = 0.5;
-                       
+
                        route->set_stereo_control_outs (control_lr_channels);
                        route->control_outs()->set_stereo_pan (pans, this);
                }
@@ -1323,11 +1364,12 @@ ARDOUR_UI::session_add_audio_route (bool track, int32_t input_channels, int32_t
        }
 
        catch (...) {
-               MessageDialog msg (*editor, 
+               MessageDialog msg (*editor,
                                   _("There are insufficient JACK ports available\n\
 to create a new track or bus.\n\
 You should save Ardour, exit and\n\
 restart JACK with more ports."));
+               pop_back_splash ();
                msg.run ();
        }
 }
@@ -1357,13 +1399,12 @@ ARDOUR_UI::transport_goto_start ()
        if (session) {
                session->goto_start();
 
-               
                /* force displayed area in editor to start no matter
                   what "follow playhead" setting is.
                */
-               
+
                if (editor) {
-                       editor->reset_x_origin (session->current_start_frame());
+                       editor->center_screen (session->current_start_frame ());
                }
        }
 }
@@ -1374,30 +1415,58 @@ ARDOUR_UI::transport_goto_zero ()
        if (session) {
                session->request_locate (0);
 
-               
+
                /* force displayed area in editor to start no matter
                   what "follow playhead" setting is.
                */
-               
+
                if (editor) {
                        editor->reset_x_origin (0);
                }
        }
 }
 
+void
+ARDOUR_UI::transport_goto_wallclock ()
+{
+       if (session && editor) {
+
+               time_t now;
+               struct tm tmnow;
+               nframes64_t frames;
+
+               time (&now);
+               localtime_r (&now, &tmnow);
+
+               frames = tmnow.tm_hour * (60 * 60 * session->frame_rate());
+               frames += tmnow.tm_min * (60 * session->frame_rate());
+               frames += tmnow.tm_sec * session->frame_rate();
+
+               session->request_locate (frames);
+
+               /* force displayed area in editor to start no matter
+                  what "follow playhead" setting is.
+               */
+
+               if (editor) {
+                       editor->center_screen (frames);
+               }
+       }
+}
+
 void
 ARDOUR_UI::transport_goto_end ()
 {
        if (session) {
-               nframes_t frame = session->current_end_frame();
+               nframes_t const frame = session->current_end_frame();
                session->request_locate (frame);
 
                /* force displayed area in editor to start no matter
                   what "follow playhead" setting is.
                */
-               
+
                if (editor) {
-                       editor->reset_x_origin (frame);
+                       editor->center_screen (frame);
                }
        }
 }
@@ -1413,11 +1482,7 @@ ARDOUR_UI::transport_stop ()
                session->cancel_audition ();
                return;
        }
-       
-       if (session->get_play_loop ()) {
-               session->request_play_loop (false);
-       }
-       
+
        session->request_stop ();
 }
 
@@ -1440,6 +1505,7 @@ ARDOUR_UI::remove_last_capture()
 void
 ARDOUR_UI::transport_record (bool roll)
 {
+
        if (session) {
                switch (session->record_status()) {
                case Session::Disabled:
@@ -1465,47 +1531,120 @@ ARDOUR_UI::transport_record (bool roll)
                        session->disable_record (false, true);
                }
        }
+       //cerr << "ARDOUR_UI::transport_record () called roll = " << roll << " session->record_status() = " << session->record_status() << endl;
 }
 
-void
+void 
 ARDOUR_UI::transport_roll ()
 {
-       bool rolling;
-
        if (!session) {
                return;
        }
 
-       rolling = session->transport_rolling ();
+       if (session->is_auditioning()) {
+               return;
+       }
+       
+       if (session->config.get_external_sync()) {
+               switch (session->config.get_sync_source()) {
+               case JACK:
+                       break;
+               default:
+                       /* transport controlled by the master */
+                       return;
+               }
+       }
+
+       bool rolling = session->transport_rolling();
 
        if (session->get_play_loop()) {
-               session->request_play_loop (false);
-               auto_loop_button.set_visual_state (1);
-               roll_button.set_visual_state (1);
+               session->request_play_loop (false, true);
        } else if (session->get_play_range ()) {
-               session->request_play_range (false);
-               play_selection_button.set_visual_state (0);
-       } else if (rolling) {
-               session->request_locate (session->last_transport_start(), true);
+               session->request_play_range (false, true);
+       } 
+
+       if (!rolling) {
+               session->request_transport_speed (1.0f);
        }
 
-       session->request_transport_speed (1.0f);
+       map_transport_state ();
 }
 
 void
-ARDOUR_UI::transport_loop()
+ARDOUR_UI::toggle_roll (bool with_abort, bool roll_out_of_bounded_mode)
 {
-       if (session) {
-               if (session->get_play_loop()) {
-                       if (session->transport_rolling()) {
-                               Location * looploc = session->locations()->auto_loop_location();
-                               if (looploc) {
+       
+       if (!session) {
+               return;
+       }
+
+       if (session->is_auditioning()) {
+               session->cancel_audition ();
+               return;
+       }
+       
+       if (session->config.get_external_sync()) {
+               switch (session->config.get_sync_source()) {
+               case JACK:
+                       break;
+               default:
+                       /* transport controlled by the master */
+                       return;
+               }
+       }
+
+       bool rolling = session->transport_rolling();
+       bool affect_transport = true;
+
+       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;
+                       } else {
+                               /* disk buffers are normal, so we can keep playing */
+                               affect_transport = false;
+                       }
+                       session->request_play_loop (false, true);
+               } else if (session->get_play_range ()) {
+                       affect_transport = false;
+                       session->request_play_range (0, true);
+               } 
+       } 
+
+       if (affect_transport) {
+               if (rolling) {
+                       session->request_stop (with_abort, true);
+               } else {
+                       session->request_transport_speed (1.0f);
+               }
+       }
+
+       map_transport_state (); 
+}
+
+void
+ARDOUR_UI::toggle_session_auto_loop ()
+{
+       if (session) {
+               if (session->get_play_loop()) {
+                       if (session->transport_rolling()) {
+                               Location * looploc = session->locations()->auto_loop_location();
+                               if (looploc) {
                                        session->request_locate (looploc->start(), true);
                                }
+                       } else {
+                               session->request_play_loop (false);
+                       }
+               } else {
+                       Location * looploc = session->locations()->auto_loop_location();
+                       if (looploc) {
+                               session->request_play_loop (true);
                        }
-               }
-               else {
-                       session->request_play_loop (true);
                }
        }
 }
@@ -1517,10 +1656,6 @@ ARDOUR_UI::transport_play_selection ()
                return;
        }
 
-       if (!session->get_play_range()) {
-               session->request_stop ();
-       }
-
        editor->play_selection ();
 }
 
@@ -1528,10 +1663,10 @@ void
 ARDOUR_UI::transport_rewind (int option)
 {
        float current_transport_speed;
+
                if (session) {
                current_transport_speed = session->transport_speed();
-               
+
                if (current_transport_speed >= 0.0f) {
                        switch (option) {
                        case 0:
@@ -1555,10 +1690,10 @@ void
 ARDOUR_UI::transport_forward (int option)
 {
        float current_transport_speed;
-       
+
        if (session) {
                current_transport_speed = session->transport_speed();
-               
+
                if (current_transport_speed <= 0.0f) {
                        switch (option) {
                        case 0:
@@ -1575,6 +1710,7 @@ ARDOUR_UI::transport_forward (int option)
                        /* speed up */
                        session->request_transport_speed (current_transport_speed * 1.5f);
                }
+
        }
 }
 
@@ -1586,7 +1722,7 @@ ARDOUR_UI::toggle_record_enable (uint32_t dstream)
        }
 
        boost::shared_ptr<Route> r;
-       
+
        if ((r = session->route_by_remote_id (dstream)) != 0) {
 
                Track* t;
@@ -1600,33 +1736,61 @@ ARDOUR_UI::toggle_record_enable (uint32_t dstream)
        }
 }
 
-void
-ARDOUR_UI::queue_transport_change ()
-{
-       Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &ARDOUR_UI::map_transport_state));
-}
-
 void
 ARDOUR_UI::map_transport_state ()
 {
+       ENSURE_GUI_THREAD(mem_fun (*this, &ARDOUR_UI::map_transport_state));
+
+       if (!session) {
+               auto_loop_button.set_visual_state (0);
+               play_selection_button.set_visual_state (0);
+               roll_button.set_visual_state (0);
+               stop_button.set_visual_state (1);
+               return;
+       }
+
        float sp = session->transport_speed();
 
        if (sp == 1.0f) {
-               transport_rolling ();
-       } else if (sp < 0.0f) {
-               transport_rewinding ();
-       } else if (sp > 0.0f) {
-               transport_forwarding ();
+               shuttle_fract = SHUTTLE_FRACT_SPEED1;  /* speed = 1.0, believe it or not */
+               shuttle_box.queue_draw ();
+       } else if (sp == 0.0f) {
+               shuttle_fract = 0;
+               shuttle_box.queue_draw ();
+               update_disk_space ();
+       }
+
+       if (sp != 0.0) {
+
+               if (session->get_play_range()) {
+
+                       play_selection_button.set_visual_state (1);
+                       roll_button.set_visual_state (0);
+                       auto_loop_button.set_visual_state (0);
+                       
+               } else if (session->get_play_loop ()) {
+                       
+                       auto_loop_button.set_visual_state (1);
+                       play_selection_button.set_visual_state (0);
+                       roll_button.set_visual_state (0);
+
+               } else {
+                       
+                       roll_button.set_visual_state (1);
+                       play_selection_button.set_visual_state (0);
+                       auto_loop_button.set_visual_state (0);
+               }
+
+               stop_button.set_visual_state (0);
+
        } else {
-               transport_stopped ();
+
+               stop_button.set_visual_state (1);
+               roll_button.set_visual_state (0);
+               play_selection_button.set_visual_state (0);
+               auto_loop_button.set_visual_state (0);
        }
-}
 
-void
-ARDOUR_UI::GlobalClickBox::printer (char buf[32], Adjustment &adj, void *arg)
-{
-       snprintf (buf, sizeof(buf), "%s", ((GlobalClickBox *) arg)->strings[
-               (int) adj.get_value()].c_str());
 }
 
 void
@@ -1680,7 +1844,7 @@ ARDOUR_UI::engine_running ()
        if (action_name) {
 
                action = ActionManager::get_action (X_("JACK"), action_name);
-               
+
                if (action) {
                        Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic (action);
                        ract->set_active ();
@@ -1698,19 +1862,20 @@ ARDOUR_UI::engine_halted ()
 
        update_sample_rate (0);
 
-       MessageDialog msg (*editor, 
+       MessageDialog msg (*editor,
                           _("\
 JACK has either been shutdown or it\n\
 disconnected Ardour because Ardour\n\
-was not fast enough. You can save the\n\
-session and/or try to reconnect to JACK ."));
+was not fast enough. Try to restart\n\
+JACK, reconnect and save the session."));
+       pop_back_splash ();
        msg.run ();
 }
 
 int32_t
 ARDOUR_UI::do_engine_start ()
 {
-       try { 
+       try {
                engine->start();
        }
 
@@ -1721,7 +1886,7 @@ ARDOUR_UI::do_engine_start ()
                unload_session ();
                return -2;
        }
-       
+
        return 0;
 }
 
@@ -1750,7 +1915,7 @@ ARDOUR_UI::stop_clocking ()
 {
        clock_signal_connection.disconnect ();
 }
-       
+
 void
 ARDOUR_UI::toggle_clocking ()
 {
@@ -1785,7 +1950,7 @@ ARDOUR_UI::start_blinking ()
        */
 
        if (blink_timeout_tag < 0) {
-               blink_on = false;       
+               blink_on = false;
                blink_timeout_tag = g_timeout_add (240, _blink, this);
        }
 }
@@ -1799,44 +1964,6 @@ ARDOUR_UI::stop_blinking ()
        }
 }
 
-void
-ARDOUR_UI::name_io_setup (AudioEngine& engine, 
-                         string& buf,
-                         IO& io,
-                         bool in)
-{
-       vector<string> connections;
-
-       if (in) {
-               if (io.n_inputs().n_total() == 0) {
-                       buf = _("none");
-                       return;
-               }
-               
-               /* XXX we're not handling multiple ports yet. */
-
-               if (io.input(0)->get_connections(connections) == 0) {
-                       buf = _("off");
-               } else {
-                       buf = connections.front();
-               }
-
-       } else {
-
-               if (io.n_outputs().n_total() == 0) {
-                       buf = _("none");
-                       return;
-               }
-               
-               /* XXX we're not handling multiple ports yet. */
-
-               if (io.output(0)->get_connections(connections) == 0) {
-                       buf = _("off");
-               } else {
-                       buf = connections.front();
-               }
-       }
-}
 
 /** Ask the user for the name of a new shapshot and then take it.
  */
@@ -1855,16 +1982,39 @@ ARDOUR_UI::snapshot_session ()
 
        prompter.set_name ("Prompter");
        prompter.add_button (Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT);
+       prompter.set_title (_("Take Snapshot"));
        prompter.set_prompt (_("Name of New Snapshot"));
        prompter.set_initial_text (timebuf);
-       
+
        switch (prompter.run()) {
        case RESPONSE_ACCEPT:
+       {
                prompter.get_result (snapname);
-               if (snapname.length()){
+
+               bool do_save = (snapname.length() != 0);
+
+               vector<sys::path> 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;
+                       }
+               }
+
+               if (do_save) {
                        save_state (snapname);
                }
                break;
+       }
 
        default:
                break;
@@ -1876,7 +2026,7 @@ ARDOUR_UI::save_state (const string & name)
 {
        (void) save_state_canfail (name);
 }
-               
+
 int
 ARDOUR_UI::save_state_canfail (string name)
 {
@@ -1895,17 +2045,6 @@ ARDOUR_UI::save_state_canfail (string name)
        return 0;
 }
 
-void
-ARDOUR_UI::restore_state (string name)
-{
-       if (session) {
-               if (name.length() == 0) {
-                       name = session->name();
-               }
-               session->restore_state (name);
-       }
-}
-
 void
 ARDOUR_UI::primary_clock_value_changed ()
 {
@@ -1931,73 +2070,30 @@ ARDOUR_UI::secondary_clock_value_changed ()
 }
 
 void
-ARDOUR_UI::rec_enable_button_blink (bool onoff, AudioDiskstream *dstream, Widget *w)
-{
-       if (session && dstream && dstream->record_enabled()) {
-
-               Session::RecordState rs;
-               
-               rs = session->record_status ();
-
-               switch (rs) {
-               case Session::Disabled:
-               case Session::Enabled:
-                       if (w->get_state() != STATE_SELECTED) {
-                               w->set_state (STATE_SELECTED);
-                       }
-                       break;
-
-               case Session::Recording:
-                       if (w->get_state() != STATE_ACTIVE) {
-                               w->set_state (STATE_ACTIVE);
-                       }
-                       break;
-               }
-
-       } else {
-               if (w->get_state() != STATE_NORMAL) {
-                       w->set_state (STATE_NORMAL);
-               }
-       }
-}
-
-void
-ARDOUR_UI::transport_rec_enable_blink (bool onoff) 
+ARDOUR_UI::transport_rec_enable_blink (bool onoff)
 {
        if (session == 0) {
                return;
        }
-       
-       switch (session->record_status()) {
-       case Session::Enabled:
+
+       Session::RecordState const r = session->record_status ();
+       bool const h = session->have_rec_enabled_diskstream ();
+
+       if (r == Session::Enabled || (r == Session::Recording && !h)) {
                if (onoff) {
                        rec_button.set_visual_state (2);
                } else {
                        rec_button.set_visual_state (0);
                }
-               break;
-
-       case Session::Recording:
+       } else if (r == Session::Recording && h) {
                rec_button.set_visual_state (1);
-               break;
-
-       default:
+       } else {
                rec_button.set_visual_state (0);
-               break;
        }
 }
 
-gint
-ARDOUR_UI::hide_and_quit (GdkEventAny *ev, ArdourDialog *window)
-{
-       window->hide();
-       Gtk::Main::quit ();
-       return TRUE;
-}
-
 void
 ARDOUR_UI::save_template ()
-
 {
        ArdourPrompter prompter (true);
        string name;
@@ -2007,6 +2103,7 @@ ARDOUR_UI::save_template ()
        }
 
        prompter.set_name (X_("Prompter"));
+       prompter.set_title (_("Save Mix Template"));
        prompter.set_prompt (_("Name for mix template:"));
        prompter.set_initial_text(session->name() + _("-template"));
        prompter.add_button (Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT);
@@ -2014,7 +2111,7 @@ ARDOUR_UI::save_template ()
        switch (prompter.run()) {
        case RESPONSE_ACCEPT:
                prompter.get_result (name);
-               
+
                if (name.length()) {
                        session->save_template (name);
                }
@@ -2025,18 +2122,36 @@ ARDOUR_UI::save_template ()
        }
 }
 
+void
+ARDOUR_UI::edit_metadata ()
+{
+       SessionMetadataEditor dialog;
+       dialog.set_session (session);
+       editor->ensure_float (dialog);
+       dialog.run ();
+}
+
+void
+ARDOUR_UI::import_metadata ()
+{
+       SessionMetadataImporter dialog;
+       dialog.set_session (session);
+       editor->ensure_float (dialog);
+       dialog.run ();
+}
+
 void
 ARDOUR_UI::fontconfig_dialog ()
 {
 #ifdef GTKOSX
-       /* X11 users will always have fontconfig info around, but new GTK-OSX users 
+       /* X11 users will always have fontconfig info around, but new GTK-OSX users
           may not and it can take a while to build it. Warn them.
        */
-       
+
        Glib::ustring fontconfig = Glib::build_filename (Glib::get_home_dir(), ".fontconfig");
-       
+
        if (!Glib::file_test (fontconfig, Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_DIR)) {
-               MessageDialog msg (*new_session_dialog,
+               MessageDialog msg (*_startup,
                                   _("Welcome to Ardour.\n\n"
                                     "The program will take a bit longer to start up\n"
                                     "while the system fonts are checked.\n\n"
@@ -2045,6 +2160,7 @@ ARDOUR_UI::fontconfig_dialog ()
                                   true,
                                   Gtk::MESSAGE_INFO,
                                   Gtk::BUTTONS_OK);
+               pop_back_splash ();
                msg.show_all ();
                msg.present ();
                msg.run ();
@@ -2067,7 +2183,7 @@ ARDOUR_UI::parse_cmdline_path (const Glib::ustring& cmdline_path, Glib::ustring&
                /* it doesn't exist, assume the best */
                session_path = Glib::path_get_dirname (string (cmdline_path));
        }
-       
+
        session_name = basename_nosuffix (string (cmdline_path));
 }
 
@@ -2085,22 +2201,22 @@ ARDOUR_UI::load_cmdline_session (const Glib::ustring& session_name, const Glib::
        if (session_name.length() == 0 || session_path.length() == 0) {
                return false;
        }
-       
+
        if (Glib::file_test (session_path, Glib::FILE_TEST_IS_DIR)) {
 
                Glib::ustring predicted_session_file;
-               
+
                predicted_session_file = session_path;
                predicted_session_file += '/';
                predicted_session_file += session_name;
                predicted_session_file += ARDOUR::statefile_suffix;
-               
+
                if (Glib::file_test (predicted_session_file, Glib::FILE_TEST_EXISTS)) {
                        existing_session = true;
                }
-               
+
        } else if (Glib::file_test (session_path, Glib::FILE_TEST_EXISTS)) {
-               
+
                if (session_path.find (ARDOUR::statefile_suffix) == session_path.length() - 7) {
                        /* existing .ardour file */
                        existing_session = true;
@@ -2109,16 +2225,14 @@ ARDOUR_UI::load_cmdline_session (const Glib::ustring& session_name, const Glib::
        } else {
                existing_session = false;
        }
-       
+
        /* lets just try to load it */
-       
+
        if (create_engine ()) {
-               hide_splash ();
-               loading_dialog->hide ();
-               backend_audio_error (false, new_session_dialog);
+               backend_audio_error (false, _startup);
                return -1;
        }
-       
+
        return load_session (session_path, session_name);
 }
 
@@ -2126,18 +2240,20 @@ bool
 ARDOUR_UI::ask_about_loading_existing_session (const Glib::ustring& session_path)
 {
        Glib::ustring str = string_compose (_("This session\n%1\nalready exists. Do you want to open it?"), session_path);
-       
+
        MessageDialog msg (str,
                           false,
                           Gtk::MESSAGE_WARNING,
                           Gtk::BUTTONS_YES_NO,
                           true);
-       
-       
-       msg.set_name (X_("CleanupDialog"));
+
+
+       msg.set_name (X_("OpenExistingDialog"));
+       msg.set_title (_("Open Existing Session"));
        msg.set_wmclass (X_("existing_session"), "Ardour");
        msg.set_position (Gtk::WIN_POS_MOUSE);
-       
+       pop_back_splash ();
+
        switch (msg.run()) {
        case RESPONSE_YES:
                return true;
@@ -2149,59 +2265,61 @@ ARDOUR_UI::ask_about_loading_existing_session (const Glib::ustring& session_path
 int
 ARDOUR_UI::build_session_from_nsd (const Glib::ustring& session_path, const Glib::ustring& session_name)
 {
-       
+
        uint32_t cchns;
        uint32_t mchns;
        AutoConnectOption iconnect;
        AutoConnectOption oconnect;
        uint32_t nphysin;
        uint32_t nphysout;
-       
+
        if (Profile->get_sae()) {
-               
+
                cchns = 0;
                mchns = 2;
                iconnect = AutoConnectPhysical;
                oconnect = AutoConnectMaster;
                nphysin = 0; // use all available
                nphysout = 0; // use all available
-               
+
        } else {
-               
+
                /* get settings from advanced section of NSD */
-               
-               if (new_session_dialog->create_control_bus()) {
-                       cchns = (uint32_t) new_session_dialog->control_channel_count();
+
+               if (_startup->create_control_bus()) {
+                       cchns = (uint32_t) _startup->control_channel_count();
                } else {
                        cchns = 0;
                }
-               
-               if (new_session_dialog->create_master_bus()) {
-                       mchns = (uint32_t) new_session_dialog->master_channel_count();
+
+               if (_startup->create_master_bus()) {
+                       mchns = (uint32_t) _startup->master_channel_count();
                } else {
                        mchns = 0;
                }
-               
-               if (new_session_dialog->connect_inputs()) {
+
+               if (_startup->connect_inputs()) {
                        iconnect = AutoConnectPhysical;
                } else {
                        iconnect = AutoConnectOption (0);
                }
-               
+
                /// @todo some minor tweaks.
-               
-               if (new_session_dialog->connect_outs_to_master()) {
-                       oconnect = AutoConnectMaster;
-               } else if (new_session_dialog->connect_outs_to_physical()) {
-                       oconnect = AutoConnectPhysical;
-               } else {
-                       oconnect = AutoConnectOption (0);
-               } 
-               
-               nphysin = (uint32_t) new_session_dialog->input_limit_count();
-               nphysout = (uint32_t) new_session_dialog->output_limit_count();
+
+               oconnect = AutoConnectOption (0);
+
+               if (_startup->connect_outputs ()) {
+                       if (_startup->connect_outs_to_master()) {
+                               oconnect = AutoConnectMaster;
+                       } else if (_startup->connect_outs_to_physical()) {
+                               oconnect = AutoConnectPhysical;
+                       }
+               }
+
+               nphysin = (uint32_t) _startup->input_limit_count();
+               nphysout = (uint32_t) _startup->output_limit_count();
        }
-       
+
        if (build_session (session_path,
                           session_name,
                           cchns,
@@ -2209,215 +2327,177 @@ ARDOUR_UI::build_session_from_nsd (const Glib::ustring& session_path, const Glib
                           iconnect,
                           oconnect,
                           nphysin,
-                          nphysout, 
+                          nphysout,
                           engine->frame_rate() * 60 * 5)) {
-               
+
                return -1;
        }
 
        return 0;
 }
 
-       
-bool
-ARDOUR_UI::get_session_parameters (bool backend_audio_is_running, bool should_be_new)
+void
+ARDOUR_UI::idle_load (const Glib::ustring& path)
 {
-       bool existing_session = false;
-       Glib::ustring session_name;
-       Glib::ustring session_path;
-       Glib::ustring template_name;
-
-       if (!loading_dialog) {
-               loading_dialog = new MessageDialog (*new_session_dialog, 
-                                                   "",
-                                                   false,
-                                                   Gtk::MESSAGE_INFO,
-                                                   Gtk::BUTTONS_NONE);
-       }
-
-       int response = Gtk::RESPONSE_NONE;
-
-       if (!ARDOUR_COMMAND_LINE::session_name.empty()) {
-
-               parse_cmdline_path (ARDOUR_COMMAND_LINE::session_name, session_name, session_path, existing_session);
-
-               /* don't ever reuse this */
+       if (session) {
+               if (Glib::file_test (path, Glib::FILE_TEST_IS_DIR)) {
+                       /* /path/to/foo => /path/to/foo, foo */
+                       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));
+               }
+       } else {
 
-               ARDOUR_COMMAND_LINE::session_name = string();
+               ARDOUR_COMMAND_LINE::session_name = path;
 
-               if (existing_session && backend_audio_is_running) {
+               /*
+                * new_session_dialog doens't exist in A3
+                * Try to remove all references to it to
+                * see if it will compile.  NOTE: this will
+                * likely cause a runtime issue is my somewhat
+                * uneducated guess.
+                */
 
-                       /* just load the thing already */
+               //if (new_session_dialog) {
 
-                       if (load_cmdline_session (session_name, session_path, existing_session) == 0) {
-                               return true;
-                       }
-               }
 
-               /* make the NSD use whatever information we have */
+                       /* make it break out of Dialog::run() and
+                          start again.
+                        */
 
-               new_session_dialog->set_session_name (session_name);
-               new_session_dialog->set_session_folder (session_path);
+                       //new_session_dialog->response (1);
+               //}
        }
+}
+
+void
+ARDOUR_UI::end_loading_messages ()
+{
+       // hide_splash ();
+}
 
-       /* loading failed, or we need the NSD for something */
+void
+ARDOUR_UI::loading_message (const std::string& /*msg*/)
+{
+       // show_splash ();
+       // splash->message (msg);
+       flush_pending ();
+}
 
-       new_session_dialog->set_modal (false);
-       new_session_dialog->set_position (WIN_POS_CENTER);
-       new_session_dialog->set_current_page (0);
-       new_session_dialog->set_existing_session (existing_session);
-       new_session_dialog->reset_recent();
+/** @param quit_on_cancel true if exit() should be called if the user clicks `cancel' in the new session dialog */
+int
+ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new)
+{
+       Glib::ustring session_name;
+       Glib::ustring session_path;
+       Glib::ustring template_name;
+       int ret = -1;
+       bool likely_new = false;
 
-       /* get this out of the way */
+       while (ret != 0) {
 
-       hide_splash ();
+               if (!should_be_new && !ARDOUR_COMMAND_LINE::session_name.empty()) {
 
-       do {
-               new_session_dialog->set_have_engine (backend_audio_is_running);
-               new_session_dialog->present ();
-               response = new_session_dialog->run ();
-               loading_dialog->hide ();
-               
-               _session_is_new = false;
-               
-               /* handle possible negative responses */
+                       /* if they named a specific statefile, use it, otherwise they are
+                          just giving a session folder, and we want to use it as is
+                          to find the session.
+                       */
 
-               switch (response) {
-               case Gtk::RESPONSE_CANCEL:
-               case Gtk::RESPONSE_DELETE_EVENT:
-                       if (!session) {
-                               quit();
+                       if (ARDOUR_COMMAND_LINE::session_name.find (statefile_suffix) != string::npos) {
+                               session_path = Glib::path_get_dirname (ARDOUR_COMMAND_LINE::session_name);
+                       } else {
+                               session_path = ARDOUR_COMMAND_LINE::session_name;
                        }
-                       new_session_dialog->hide ();
-                       return false;
-                       
-               case Gtk::RESPONSE_NONE:
-                       /* "Clear" was pressed */
-                       goto try_again;
-               }
 
-               fontconfig_dialog();
+                       session_name = Glib::path_get_basename (ARDOUR_COMMAND_LINE::session_name);
 
-               if (!backend_audio_is_running) {
-                       if (new_session_dialog->engine_control.setup_engine ()) {
-                               new_session_dialog->hide ();
-                               return false;
-                       } 
-               }
-               
-               if (create_engine ()) {
+               } else {
 
-                       backend_audio_error (!backend_audio_is_running, new_session_dialog);
-                       loading_dialog->hide ();
-                       flush_pending ();
+                       bool const apply = run_startup (should_be_new);
+                       if (!apply) {
+                               if (quit_on_cancel) {
+                                       exit (1);
+                               } else {
+                                       return ret;
+                               }
+                       }
 
-                       new_session_dialog->set_existing_session (false);
-                       new_session_dialog->set_current_page (2);
+                       /* if we run the startup dialog again, offer more than just "new session" */
 
-                       response = Gtk::RESPONSE_NONE;
-                       goto try_again;
-               }
+                       should_be_new = false;
 
-               loading_dialog->hide ();
-               backend_audio_is_running = true;                
-                       
-               if (response == Gtk::RESPONSE_OK) {
+                       session_name = _startup->session_name (likely_new);
 
-                       session_name = new_session_dialog->session_name();
+                       /* this shouldn't happen, but we catch it just in case it does */
 
                        if (session_name.empty()) {
-                               response = Gtk::RESPONSE_NONE;
-                               goto try_again;
-                       } 
+                               break;
+                       }
+                       if (_startup->use_session_template()) {
+                               template_name = _startup->session_template_name();
+                               _session_is_new = true;
+                       }
 
-                       /* if the user mistakenly typed path information into the session filename entry,
-                          convert what they typed into a path & a name
-                       */
-                       
-                       if (session_name[0] == '/' || 
+                       if (session_name[0] == '/' ||
                            (session_name.length() > 2 && session_name[0] == '.' && session_name[1] == '/') ||
                            (session_name.length() > 3 && session_name[0] == '.' && session_name[1] == '.' && session_name[2] == '/')) {
-                               
+
                                session_path = Glib::path_get_dirname (session_name);
                                session_name = Glib::path_get_basename (session_name);
-                               
+
                        } else {
 
-                               session_path = new_session_dialog->session_folder();
+                               session_path = _startup->session_folder();
                        }
+               }
 
-                       switch (new_session_dialog->which_page()) {
+               if (create_engine ()) {
+                       break;
+               }
 
-                       case NewSessionDialog::OpenPage: 
-                       case NewSessionDialog::EnginePage:
-                               goto loadit;
-                               break;
+               if (Glib::file_test (session_path, Glib::FileTest (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))) {
 
-                       case NewSessionDialog::NewPage: /* nominally the "new" session creator, but could be in use for an old session */
-                               
-                               should_be_new = true;
-                               
-                               //XXX This is needed because session constructor wants a 
-                               //non-existant path. hopefully this will be fixed at some point.
-                               
-                               session_path = Glib::build_filename (session_path, session_name);
-
-                               if (Glib::file_test (session_path, Glib::FileTest (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))) {
-
-                                       if (ask_about_loading_existing_session (session_path)) {
-                                               goto loadit;
-                                       } else {
-                                               response = RESPONSE_NONE;
-                                               goto try_again;
-                                       } 
-                               }
+                       if (likely_new) {
 
-                               _session_is_new = true;
-                                               
-                               if (new_session_dialog->use_session_template()) {
+                               Glib::ustring existing = Glib::build_filename (session_path, session_name);
 
-                                       template_name = new_session_dialog->session_template_name();
-                                       goto loadit;
-                         
-                               } else {
-                                       if (build_session_from_nsd (session_path, session_name)) {
-                                               response = RESPONSE_NONE;
-                                               goto try_again;
-                                       }
-                                       goto done;
+                               if (!ask_about_loading_existing_session (existing)) {
+                                       ARDOUR_COMMAND_LINE::session_name = ""; // cancel that
+                                       continue;
                                }
-                               break;
-                               
-                       default:
-                               break;
-                       }
-                       
-                 loadit:
-                       new_session_dialog->hide ();
-                       
-                       if (load_session (session_path, session_name)) {
-                               /* force a retry */
-                               response = Gtk::RESPONSE_NONE;
                        }
 
-                 try_again:
-                       if (response == Gtk::RESPONSE_NONE) {
-                               loading_dialog->hide ();
-                               new_session_dialog->set_existing_session (false);
-                               new_session_dialog->reset ();
+                       _session_is_new = false;
+
+               } else {
+
+                       if (!likely_new) {
+                               MessageDialog msg (string_compose (_("There is no existing session at \"%1\""), session_path));
+                               msg.run ();
+                               ARDOUR_COMMAND_LINE::session_name = ""; // cancel that
+                               continue;
                        }
+
+                       _session_is_new = true;
                }
 
-       } while (response == Gtk::RESPONSE_NONE);
+               if (likely_new && template_name.empty()) {
 
-  done:
-       show();
-       loading_dialog->hide ();
-       new_session_dialog->hide();
-       new_session_dialog->reset();
-       goto_editor_window ();
-       return true;
-}      
+                       ret = build_session_from_nsd (session_path, session_name);
+
+               } else {
+
+                       ret = load_session (session_path, session_name, template_name);
+                       if (!ARDOUR_COMMAND_LINE::immediate_save.empty()) {
+                               session->save_state (ARDOUR_COMMAND_LINE::immediate_save, false);
+                               exit (1);
+                       }
+               }
+       }
+
+       return ret;
+}
 
 void
 ARDOUR_UI::close_session()
@@ -2428,6 +2508,7 @@ ARDOUR_UI::close_session()
 
        unload_session (true);
 
+       ARDOUR_COMMAND_LINE::session_name = "";
        get_session_parameters (true, false);
 }
 
@@ -2453,24 +2534,7 @@ ARDOUR_UI::load_session (const Glib::ustring& path, const Glib::ustring& snap_na
                goto out;
        }
 
-       /* if it already exists, we must have write access */
-
-       if (Glib::file_test (path.c_str(), Glib::FILE_TEST_EXISTS) && ::access (path.c_str(), W_OK)) {
-               MessageDialog msg (*editor, _("You do not have write access to this session.\n"
-                                             "This prevents the session from being loaded."));
-               msg.run ();
-               goto out;
-       }
-
-#ifdef __APPLE__
-       // OS X where everything is sllloooowwww
-       if (loading_dialog) {
-               loading_dialog->set_markup (_("Please wait while Ardour loads your session"));
-               flush_pending ();
-       }
-#endif
-
-       disable_screen_updates ();
+       loading_message (_("Please wait while Ardour loads your session"));
 
        try {
                new_session = new Session (*engine, path, snap_name, mix_template);
@@ -2483,11 +2547,12 @@ ARDOUR_UI::load_session (const Glib::ustring& path, const Glib::ustring& snap_na
                MessageDialog msg (err.what(),
                                   true,
                                   Gtk::MESSAGE_INFO,
-                                  Gtk::BUTTONS_OK_CANCEL);
-               
-               msg.set_title (_("Loading Error"));
-               msg.set_secondary_text (_("Click the OK button to try again."));
+                                  Gtk::BUTTONS_CLOSE);
+
+               msg.set_title (_("Port Registration Error"));
+               msg.set_secondary_text (_("Click the Close button to try again."));
                msg.set_position (Gtk::WIN_POS_CENTER);
+               pop_back_splash ();
                msg.present ();
 
                int response = msg.run ();
@@ -2508,11 +2573,12 @@ ARDOUR_UI::load_session (const Glib::ustring& path, const Glib::ustring& snap_na
                MessageDialog msg (string_compose(_("Session \"%1 (snapshot %2)\" did not load successfully"), path, snap_name),
                                   true,
                                   Gtk::MESSAGE_INFO,
-                                  Gtk::BUTTONS_OK_CANCEL);
-               
+                                  Gtk::BUTTONS_CLOSE);
+
                msg.set_title (_("Loading Error"));
-               msg.set_secondary_text (_("Click the OK button to try again."));
+               msg.set_secondary_text (_("Click the Close button to try again."));
                msg.set_position (Gtk::WIN_POS_CENTER);
+               pop_back_splash ();
                msg.present ();
 
                int response = msg.run ();
@@ -2530,17 +2596,14 @@ ARDOUR_UI::load_session (const Glib::ustring& path, const Glib::ustring& snap_na
 
        connect_to_session (new_session);
 
-       Config->set_current_owner (ConfigVariableBase::Interface);
-
        session_loaded = true;
-       
+
        goto_editor_window ();
 
        if (session) {
                session->set_clean ();
        }
 
-       enable_screen_updates ();
        flush_pending ();
        retval = 0;
 
@@ -2549,9 +2612,9 @@ ARDOUR_UI::load_session (const Glib::ustring& path, const Glib::ustring& snap_na
 }
 
 int
-ARDOUR_UI::build_session (const Glib::ustring& path, const Glib::ustring& snap_name, 
+ARDOUR_UI::build_session (const Glib::ustring& path, const Glib::ustring& snap_name,
                          uint32_t control_channels,
-                         uint32_t master_channels, 
+                         uint32_t master_channels,
                          AutoConnectOption input_connect,
                          AutoConnectOption output_connect,
                          uint32_t nphysin,
@@ -2574,7 +2637,7 @@ ARDOUR_UI::build_session (const Glib::ustring& path, const Glib::ustring& snap_n
        } else if (x > 0) {
                return 0;
        }
-       
+
        _session_is_new = true;
 
        try {
@@ -2585,6 +2648,7 @@ ARDOUR_UI::build_session (const Glib::ustring& path, const Glib::ustring& snap_n
        catch (...) {
 
                MessageDialog msg (string_compose(_("Could not create session in \"%1\""), path));
+               pop_back_splash ();
                msg.run ();
                return -1;
        }
@@ -2592,6 +2656,9 @@ ARDOUR_UI::build_session (const Glib::ustring& path, const Glib::ustring& snap_n
        connect_to_session (new_session);
 
        session_loaded = true;
+
+       new_session->save_state(new_session->name());
+
        return 0;
 }
 
@@ -2600,7 +2667,7 @@ ARDOUR_UI::show ()
 {
        if (editor) {
                editor->show_window ();
-               
+
                if (!shown_flag) {
                        editor->present ();
                }
@@ -2630,7 +2697,7 @@ ARDOUR_UI::hide_about ()
 }
 
 void
-ARDOUR_UI::about_signal_response(int response)
+ARDOUR_UI::about_signal_response (int /*response*/)
 {
        hide_about();
 }
@@ -2647,6 +2714,8 @@ ARDOUR_UI::show_splash ()
        }
 
        splash->show ();
+       splash->present ();
+       splash->queue_draw ();
        splash->get_window()->process_updates (true);
        flush_pending ();
 }
@@ -2660,7 +2729,8 @@ ARDOUR_UI::hide_splash ()
 }
 
 void
-ARDOUR_UI::display_cleanup_results (Session::cleanup_report& rep, const gchar* list_title, const string & msg)
+ARDOUR_UI::display_cleanup_results (ARDOUR::CleanupReport& rep, const gchar* list_title,
+                                   const string& plural_msg, const string& singular_msg)
 {
        size_t removed;
 
@@ -2668,7 +2738,7 @@ ARDOUR_UI::display_cleanup_results (Session::cleanup_report& rep, const gchar* l
 
        if (removed == 0) {
                MessageDialog msgd (*editor,
-                                   _("No audio files were ready for cleanup"), 
+                                   _("No audio files were ready for cleanup"),
                                    true,
                                    Gtk::MESSAGE_INFO,
                                    (Gtk::ButtonsType)(Gtk::BUTTONS_OK)  );
@@ -2676,15 +2746,15 @@ ARDOUR_UI::display_cleanup_results (Session::cleanup_report& rep, const gchar* l
 check for any existing snapshots.\n\
 These may still include regions that\n\
 require some unused files to continue to exist."));
-       
+
                msgd.run ();
                return;
-       } 
+       }
 
        ArdourDialog results (_("ardour: cleanup"), true, false);
-       
+
        struct CleanupResultsModelColumns : public Gtk::TreeModel::ColumnRecord {
-           CleanupResultsModelColumns() { 
+           CleanupResultsModelColumns() {
                    add (visible_name);
                    add (fullpath);
            }
@@ -2692,11 +2762,11 @@ require some unused files to continue to exist."));
            Gtk::TreeModelColumn<Glib::ustring> fullpath;
        };
 
-       
+
        CleanupResultsModelColumns results_columns;
        Glib::RefPtr<Gtk::ListStore> results_model;
        Gtk::TreeView results_display;
-       
+
        results_model = ListStore::create (results_columns);
        results_display.set_model (results_model);
        results_display.append_column (list_title, results_columns.visible_name);
@@ -2717,18 +2787,30 @@ require some unused files to continue to exist."));
 
        const string dead_sound_directory = session->session_directory().dead_sound_path().to_string();
 
+
+
+
+       /* subst:
+          %1 - number of files removed
+          %2 - location of "dead_sounds"
+          %3 - size of files affected
+          %4 - prefix for "bytes" to produce sensible results (e.g. mega, kilo, giga)
+       */
+
+       const char* bprefix;
+
        if (rep.space < 1048576.0f) {
-               if (removed > 1) {
-                       txt.set_text (string_compose (msg, removed, _("files were"), dead_sound_directory, (float) rep.space / 1024.0f, "kilo"));
-               } else {
-                       txt.set_text (string_compose (msg, removed, _("file was"), dead_sound_directory, (float) rep.space / 1024.0f, "kilo"));
-               }
+               bprefix = X_("kilo");
+       } else if (rep.space < 1048576.0f * 1000) {
+               bprefix = X_("mega");
        } else {
-               if (removed > 1) {
-                       txt.set_text (string_compose (msg, removed, _("files were"), dead_sound_directory, (float) rep.space / 1048576.0f, "mega"));
-               } else {
-                       txt.set_text (string_compose (msg, removed, _("file was"), dead_sound_directory, (float) rep.space / 1048576.0f, "mega"));
-               }
+               bprefix = X_("giga");
+       }
+
+       if (removed > 1) {
+               txt.set_text (string_compose (plural_msg, removed, dead_sound_directory, (float) rep.space / 1024.0f, bprefix));
+       } else {
+               txt.set_text (string_compose (singular_msg, removed, dead_sound_directory, (float) rep.space / 1024.0f, bprefix));
        }
 
        dhbox.pack_start (*dimage, true, false, 5);
@@ -2739,7 +2821,7 @@ require some unused files to continue to exist."));
                row[results_columns.visible_name] = *i;
                row[results_columns.fullpath] = *i;
        }
-       
+
        list_scroller.add (results_display);
        list_scroller.set_size_request (-1, 150);
        list_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
@@ -2786,7 +2868,7 @@ ARDOUR_UI::cleanup ()
 ALL undo/redo information will be lost if you cleanup.\n\
 After cleanup, unused audio files will be moved to a \
 \"dead sounds\" location."));
-       
+
        checker.add_button (Stock::CANCEL, RESPONSE_CANCEL);
        checker.add_button (_("Clean Up"), RESPONSE_ACCEPT);
        checker.set_default_response (RESPONSE_CANCEL);
@@ -2802,7 +2884,7 @@ After cleanup, unused audio files will be moved to a \
                return;
        }
 
-       Session::cleanup_report rep;
+       ARDOUR::CleanupReport rep;
 
        editor->prepare_for_cleanup ();
 
@@ -2814,23 +2896,31 @@ After cleanup, unused audio files will be moved to a \
        }
 
        if (session->cleanup_sources (rep)) {
+               editor->finish_cleanup ();
                return;
        }
 
+       editor->finish_cleanup ();
+
        checker.hide();
-       display_cleanup_results (rep, 
+       display_cleanup_results (rep,
                                 _("cleaned files"),
                                 _("\
-The following %1 %2 not in use and \n\
+The following %1 files were not in use and \n\
 have been moved to:\n\
-%3. \n\n\
+%2. \n\n\
+Flushing the wastebasket will \n\
+release an additional\n\
+%3 %4bytes of disk space.\n"),
+                                _("\
+The following file was not in use and \n       \
+has been moved to:\n                           \
+%2. \n\n\
 Flushing the wastebasket will \n\
 release an additional\n\
-%4 %5bytes of disk space.\n"
+%3 %4bytes of disk space.\n"
                                         ));
 
-
-
 }
 
 void
@@ -2841,17 +2931,20 @@ ARDOUR_UI::flush_trash ()
                return;
        }
 
-       Session::cleanup_report rep;
+       ARDOUR::CleanupReport rep;
 
        if (session->cleanup_trash_sources (rep)) {
                return;
        }
 
-       display_cleanup_results (rep, 
+       display_cleanup_results (rep,
                                 _("deleted file"),
-                                _("The following %1 %2 deleted from\n\
-%3,\n\
-releasing %4 %5bytes of disk space"));
+                                _("The following %1 files were deleted from\n\
+%2,\n\
+releasing %3 %4bytes of disk space"),
+                                _("The following file was deleted from\n\
+%2,\n\
+releasing %3 %4bytes of disk space"));
 }
 
 void
@@ -2864,7 +2957,7 @@ ARDOUR_UI::add_route (Gtk::Window* float_window)
        }
 
        if (add_route_dialog == 0) {
-               add_route_dialog = new AddRouteDialog;
+               add_route_dialog = new AddRouteDialog (*session);
                if (float_window) {
                        add_route_dialog->set_transient_for (*float_window);
                }
@@ -2891,10 +2984,19 @@ ARDOUR_UI::add_route (Gtk::Window* float_window)
                return;
        }
 
+       string template_path = add_route_dialog->track_template();
+
+       if (!template_path.empty()) {
+               session->new_route_from_template (count, template_path);
+               return;
+       }
+
        uint32_t input_chan = add_route_dialog->channels ();
        uint32_t output_chan;
        string name_template = add_route_dialog->name_template ();
        bool track = add_route_dialog->track ();
+       bool aux = !track && add_route_dialog->aux();
+       RouteGroup* route_group = add_route_dialog->route_group ();
 
        AutoConnectOption oac = Config->get_output_auto_connect();
 
@@ -2908,18 +3010,18 @@ ARDOUR_UI::add_route (Gtk::Window* float_window)
 
        if (add_route_dialog->type() == ARDOUR::DataType::MIDI) {
                if (track) {
-                       session_add_midi_track(count);
+                       session_add_midi_track (route_group, count);
                } else  {
                        MessageDialog msg (*editor,
                                        _("Sorry, MIDI Busses are not supported at this time."));
                        msg.run ();
                        //session_add_midi_bus();
                }
-       } else { 
+       } else {
                if (track) {
-                       session_add_audio_track (input_chan, output_chan, add_route_dialog->mode(), count);
+                       session_add_audio_track (input_chan, output_chan, add_route_dialog->mode(), route_group, count);
                } else {
-                       session_add_audio_bus (input_chan, output_chan, count);
+                       session_add_audio_bus (aux, input_chan, output_chan, route_group, count);
                }
        }
 }
@@ -2953,9 +3055,16 @@ ARDOUR_UI::editor_settings () const
                node = Config->instant_xml(X_("Editor"));
        }
 
+       if (!node) {
+               if (getenv("ARDOUR_INSTANT_XML_PATH")) {
+                       node = Config->instant_xml(getenv("ARDOUR_INSTANT_XML_PATH"));
+               }
+       }
+
        if (!node) {
                node = new XMLNode (X_("Editor"));
        }
+
        return node;
 }
 
@@ -2965,7 +3074,7 @@ ARDOUR_UI::keyboard_settings () const
        XMLNode* node = 0;
 
        node = Config->extra_xml(X_("Keyboard"));
-       
+
        if (!node) {
                node = new XMLNode (X_("Keyboard"));
        }
@@ -2973,20 +3082,94 @@ ARDOUR_UI::keyboard_settings () const
 }
 
 void
-ARDOUR_UI::halt_on_xrun_message ()
+ARDOUR_UI::create_xrun_marker(nframes_t where)
 {
-       ENSURE_GUI_THREAD (mem_fun(*this, &ARDOUR_UI::halt_on_xrun_message));
+       editor->mouse_add_new_marker (where, false, true);
+}
 
+void
+ARDOUR_UI::halt_on_xrun_message ()
+{
        MessageDialog msg (*editor,
                           _("Recording was stopped because your system could not keep up."));
        msg.run ();
 }
 
+void
+ARDOUR_UI::xrun_handler(nframes_t where)
+{
+       if (!session) {
+               return;
+       }
+
+       ENSURE_GUI_THREAD (bind(mem_fun(*this, &ARDOUR_UI::xrun_handler), where));
+
+       if (session && Config->get_create_xrun_marker() && session->actively_recording()) {
+               create_xrun_marker(where);
+       }
+
+       if (session && Config->get_stop_recording_on_xrun() && session->actively_recording()) {
+               halt_on_xrun_message ();
+       }
+}
+
+void
+ARDOUR_UI::push_buffer_stats (uint32_t capture, uint32_t playback)
+{
+       time_t now;
+       time (&now);
+
+       while (disk_buffer_stats.size() > 60) {
+               disk_buffer_stats.pop_front ();
+       }
+
+       disk_buffer_stats.push_back (DiskBufferStat (now, capture, playback));
+}
+
+void
+ARDOUR_UI::write_buffer_stats ()
+{
+
+       std::ofstream fout;
+       struct tm tm;
+       char buf[64];
+       char path[PATH_MAX+1];  int fd;
+
+       strcpy (path, "ardourBufferingXXXXXX");
+
+       if ((fd = mkstemp (path )) < 0) {
+               cerr << X_("cannot find temporary name for ardour buffer stats") << endl;
+               return;
+       }
+       
+       fout.open (path);
+       close (fd);
+
+       if (!fout) {
+               cerr << string_compose (X_("cannot open file %1 for ardour buffer stats"), path) << endl;
+               return;
+       }
+
+       for (list<DiskBufferStat>::iterator i = disk_buffer_stats.begin(); i != disk_buffer_stats.end(); ++i) {
+               localtime_r (&(*i).when, &tm);
+               strftime (buf, sizeof (buf), "%T", &tm);
+               fout << buf << ' ' << (*i).capture << ' ' << (*i).playback << endl;
+       }
+       
+       disk_buffer_stats.clear ();
+
+       fout.close ();
+
+       cerr << "Ardour buffering statistics can be found in: " << path << endl;
+}
+
 void
 ARDOUR_UI::disk_overrun_handler ()
 {
        ENSURE_GUI_THREAD (mem_fun(*this, &ARDOUR_UI::disk_overrun_handler));
 
+       write_buffer_stats ();
+
        if (!have_disk_speed_dialog_displayed) {
                have_disk_speed_dialog_displayed = true;
                MessageDialog* msg = new MessageDialog (*editor, _("\
@@ -3005,6 +3188,8 @@ ARDOUR_UI::disk_underrun_handler ()
 {
        ENSURE_GUI_THREAD (mem_fun(*this, &ARDOUR_UI::disk_underrun_handler));
 
+       write_buffer_stats ();
+
        if (!have_disk_speed_dialog_displayed) {
                have_disk_speed_dialog_displayed = true;
                MessageDialog* msg = new MessageDialog (*editor,
@@ -3015,16 +3200,34 @@ Specifically, it failed to read data from disk\n\
 quickly enough to keep up with playback.\n"));
                msg->signal_response().connect (bind (mem_fun (*this, &ARDOUR_UI::disk_speed_dialog_gone), msg));
                msg->show ();
-       } 
+       }
 }
 
 void
-ARDOUR_UI::disk_speed_dialog_gone (int ignored_response, MessageDialog* msg)
+ARDOUR_UI::disk_speed_dialog_gone (int /*ignored_response*/, MessageDialog* msg)
 {
        have_disk_speed_dialog_displayed = false;
        delete msg;
 }
 
+void
+ARDOUR_UI::session_dialog (std::string msg)
+{
+       ENSURE_GUI_THREAD (bind (mem_fun(*this, &ARDOUR_UI::session_dialog), 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->show_all ();
+       d->run ();
+       delete d;
+}
+
 int
 ARDOUR_UI::pending_state_dialog ()
 {
@@ -3058,7 +3261,39 @@ what you would like to do.\n"));
                return 0;
        }
 }
-       
+
+int
+ARDOUR_UI::sr_mismatch_dialog (nframes_t desired, nframes_t actual)
+{
+       HBox* hbox = new HBox();
+       Image* image = new Image (Stock::DIALOG_QUESTION, ICON_SIZE_DIALOG);
+       ArdourDialog dialog (_("Sample Rate Mismatch"), true);
+       Label  message (string_compose (_("\
+This session was created with a sample rate of %1 Hz\n\
+\n\
+The audioengine is currently running at %2 Hz\n"), desired, actual));
+
+       image->set_alignment(ALIGN_CENTER, ALIGN_TOP);
+       hbox->pack_start (*image, PACK_EXPAND_WIDGET, 12);
+       hbox->pack_end (message, PACK_EXPAND_PADDING, 12);
+       dialog.get_vbox()->pack_start(*hbox, PACK_EXPAND_PADDING, 6);
+       dialog.add_button (_("Do not load session"), RESPONSE_REJECT);
+       dialog.add_button (_("Load session anyway"), RESPONSE_ACCEPT);
+       dialog.set_default_response (RESPONSE_ACCEPT);
+       dialog.set_position (WIN_POS_CENTER);
+       message.show();
+       image->show();
+       hbox->show();
+
+       switch (dialog.run ()) {
+       case RESPONSE_ACCEPT:
+               return 0;
+       default:
+               return 1;
+       }
+}
+
+
 void
 ARDOUR_UI::disconnect_from_jack ()
 {
@@ -3088,53 +3323,6 @@ ARDOUR_UI::reconnect_to_jack ()
 void
 ARDOUR_UI::use_config ()
 {
-       Glib::RefPtr<Action> act;
-
-       switch (Config->get_native_file_data_format ()) {
-       case FormatFloat:
-               act = ActionManager::get_action (X_("options"), X_("FileDataFormatFloat"));
-               break;
-       case FormatInt24:
-               act = ActionManager::get_action (X_("options"), X_("FileDataFormat24bit"));
-               break;
-       case FormatInt16:
-               act = ActionManager::get_action (X_("options"), X_("FileDataFormat16bit"));
-               break;
-       }
-
-       if (act) {
-               Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic(act);
-               ract->set_active ();
-       }       
-
-       switch (Config->get_native_file_header_format ()) {
-       case BWF:
-               act = ActionManager::get_action (X_("options"), X_("FileHeaderFormatBWF"));
-               break;
-       case WAVE:
-               act = ActionManager::get_action (X_("options"), X_("FileHeaderFormatWAVE"));
-               break;
-       case WAVE64:
-               act = ActionManager::get_action (X_("options"), X_("FileHeaderFormatWAVE64"));
-               break;
-       case iXML:
-               act = ActionManager::get_action (X_("options"), X_("FileHeaderFormatiXML"));
-               break;
-       case RF64:
-               act = ActionManager::get_action (X_("options"), X_("FileHeaderFormatRF64"));
-               break;
-       case CAF:
-               act = ActionManager::get_action (X_("options"), X_("FileHeaderFormatCAF"));
-               break;
-       case AIFF:
-               act = ActionManager::get_action (X_("options"), X_("FileHeaderFormatAIFF"));
-               break;
-       }
-
-       if (act) {
-               Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic(act);
-               ract->set_active ();
-       }       
 
        XMLNode* node = Config->extra_xml (X_("TransportControllables"));
        if (node) {
@@ -3172,37 +3360,28 @@ ARDOUR_UI::record_state_changed ()
                return;
        }
 
-       switch (session->record_status()) {
-       case Session::Recording:
+       Session::RecordState const r = session->record_status ();
+       bool const h = session->have_rec_enabled_diskstream ();
+
+       if (r == Session::Recording && h)  {
                big_clock.set_widget_name ("BigClockRecording");
-               break;
-       default:
+       } else {
                big_clock.set_widget_name ("BigClockNonRecording");
-               break;
        }
 }
 
-void
-ARDOUR_UI::set_keybindings_path (string path)
-{
-       keybindings_path = path;
-}
-
-void
-ARDOUR_UI::save_keybindings ()
-{
-       if (can_save_keybindings) {
-               AccelMap::save (user_keybindings_path);
-       } 
-}
-
 bool
 ARDOUR_UI::first_idle ()
 {
        if (session) {
                session->allow_auto_play (true);
        }
-       can_save_keybindings = true;
+
+       if (editor) {
+               editor->first_idle();
+       }
+
+       Keyboard::set_can_save_keybindings (true);
        return false;
 }
 
@@ -3220,11 +3399,11 @@ ARDOUR_UI::store_clock_modes ()
 }
 
 
-               
+
 ARDOUR_UI::TransportControllable::TransportControllable (std::string name, ARDOUR_UI& u, ToggleType tp)
        : Controllable (name), ui (u), type(tp)
 {
-       
+
 }
 
 void
@@ -3242,7 +3421,7 @@ ARDOUR_UI::TransportControllable::set_value (float val)
                                fract = ((val - 0.5f)/0.5f);
                        }
                }
-               
+
                ui.set_shuttle_fract (fract);
                return;
        }
@@ -3295,7 +3474,7 @@ float
 ARDOUR_UI::TransportControllable::get_value (void) const
 {
        float val = 0.0f;
-       
+
        switch (type) {
        case Roll:
                break;