smooth 0.5 second fade out during quit, plus MIDI panic to turn everything off (someo...
[ardour.git] / gtk2_ardour / ardour_ui.cc
index 43fb42164f80f50c3ceb40cd1bb6cbb37e241b55..e41f71235114296f24ed3d6fb04cc459936ca308 100644 (file)
@@ -49,6 +49,7 @@
 #include "pbd/file_utils.h"
 
 #include "gtkmm2ext/application.h"
+#include "gtkmm2ext/bindings.h"
 #include "gtkmm2ext/gtk_ui.h"
 #include "gtkmm2ext/utils.h"
 #include "gtkmm2ext/click_box.h"
 #include "midi++/manager.h"
 
 #include "ardour/ardour.h"
-#include "ardour/callback.h"
+#include "ardour/audioengine.h"
+#include "ardour/audiofilesource.h"
+#include "ardour/diskstream.h"
+#include "ardour/filename_extensions.h"
+#include "ardour/port.h"
+#include "ardour/process_thread.h"
 #include "ardour/profile.h"
+#include "ardour/recent_sessions.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 "about.h"
 #include "actions.h"
+#include "add_route_dialog.h"
+#include "ambiguous_file_dialog.h"
 #include "ardour_ui.h"
-#include "public_editor.h"
 #include "audio_clock.h"
+#include "bundle_manager.h"
+#include "engine_dialog.h"
+#include "gain_meter.h"
+#include "global_port_matrix.h"
+#include "gui_object.h"
+#include "gui_thread.h"
 #include "keyboard.h"
+#include "location_ui.h"
+#include "main_clock.h"
+#include "missing_file_dialog.h"
+#include "missing_plugin_dialog.h"
 #include "mixer_ui.h"
-#include "prompter.h"
 #include "opts.h"
-#include "add_route_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 "processor_box.h"
+#include "prompter.h"
+#include "public_editor.h"
 #include "route_time_axis.h"
+#include "session_metadata_dialog.h"
+#include "shuttle_control.h"
+#include "speaker_dialog.h"
+#include "splash.h"
 #include "startup.h"
-#include "engine_dialog.h"
-#include "processor_box.h"
+#include "theme_manager.h"
 #include "time_axis_view_item.h"
+#include "utils.h"
 #include "window_proxy.h"
-#include "global_port_matrix.h"
-#include "location_ui.h"
-#include "missing_file_dialog.h"
-#include "missing_plugin_dialog.h"
-#include "ambiguous_file_dialog.h"
 
 #include "i18n.h"
 
@@ -115,6 +114,7 @@ using namespace ARDOUR;
 using namespace PBD;
 using namespace Gtkmm2ext;
 using namespace Gtk;
+using namespace std;
 
 ARDOUR_UI *ARDOUR_UI::theArdourUI = 0;
 UIConfiguration *ARDOUR_UI::ui_config = 0;
@@ -124,75 +124,43 @@ sigc::signal<void>      ARDOUR_UI::RapidScreenUpdate;
 sigc::signal<void>      ARDOUR_UI::SuperRapidScreenUpdate;
 sigc::signal<void, framepos_t, bool, framepos_t> ARDOUR_UI::Clock;
 
-bool could_be_a_valid_path (const string& path);
-
 ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
 
-       : Gtkmm2ext::UI (PROGRAM_NAME, argcp, argvp),
-
-         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),
+       : Gtkmm2ext::UI (PROGRAM_NAME, argcp, argvp)
 
-         /* preroll stuff */
-
-         preroll_button (_("pre\nroll")),
-         postroll_button (_("post\nroll")),
+       , gui_object_state (new GUIObjectState)
+       , primary_clock (new MainClock (X_("primary"), false, X_("transport"), true, true, true, false, true))
+       , secondary_clock (new MainClock (X_("secondary"), false, X_("secondary"), true, true, false, false, true))
 
          /* big clock */
 
-         big_clock (X_("bigclock"), false, "BigClockNonRecording", true, true, false, false),
+       , big_clock (new AudioClock (X_("bigclock"), false, "big", true, true, false, false))
 
          /* transport */
 
-         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),
-         stop_button (stop_controllable),
-         goto_start_button (goto_start_controllable),
-         goto_end_button (goto_end_controllable),
-         auto_loop_button (auto_loop_controllable),
-         play_selection_button (play_selection_controllable),
-         rec_button (rec_controllable),
-
-         shuttle_units_button (_("% ")),
-
-         punch_in_button (_("Punch In")),
-         punch_out_button (_("Punch Out")),
-         auto_return_button (_("Auto Return")),
-         auto_play_button (_("Auto Play")),
-         auto_input_button (_("Auto Input")),
-         click_button (_("Click")),
-         time_master_button (_("time\nmaster")),
-
-         auditioning_alert_button (_("AUDITION")),
-         solo_alert_button (_("SOLO")),
-         
-         error_log_button (_("Errors"))
-
-{
-       using namespace Gtk::Menu_Helpers;
+       , 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))
 
-       Gtkmm2ext::init();
+       , auto_return_button (ArdourButton::led_default_elements)
+       , auto_play_button (ArdourButton::led_default_elements)
+       , auto_input_button (ArdourButton::led_default_elements)
 
+       , auditioning_alert_button (_("audition"))
+       , solo_alert_button (_("solo"))
+       , feedback_alert_button (_("feedback"))
 
-#ifdef TOP_MENUBAR
-       // _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
+       , error_log_button (_("Errors"))
+
+       , _status_bar_visibility (X_("status-bar"))
+       , _feedback_exists (false)
+
+{
+       Gtkmm2ext::init();
 
        about = 0;
        splash = 0;
@@ -205,6 +173,8 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
        ui_config = new UIConfiguration();
        theme_manager = new ThemeManager();
 
+       key_editor = 0;
+
        editor = 0;
        mixer = 0;
        editor = 0;
@@ -215,9 +185,9 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
        big_clock_resize_in_progress = false;
        session_selector_window = 0;
        last_key_press_time = 0;
-       _will_create_new_session_automatically = false;
        add_route_dialog = 0;
        route_params = 0;
+       bundle_manager = 0;
        rc_option_editor = 0;
        session_option_editor = 0;
        location_ui = 0;
@@ -225,39 +195,44 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
        have_configure_timeout = false;
        have_disk_speed_dialog_displayed = false;
        session_loaded = false;
-       last_speed_displayed = -1.0f;
        ignore_dual_punch = false;
        original_big_clock_width = -1;
        original_big_clock_height = -1;
        original_big_clock_font_size = 0;
 
-       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);
-
+       roll_button.set_elements (ArdourButton::Element (ArdourButton::Body|ArdourButton::Text));
+       play_selection_button.set_elements (ArdourButton::Element (ArdourButton::Body|ArdourButton::Text));
+       
+       roll_button.set_controllable (roll_controllable);
+       stop_button.set_controllable (stop_controllable);
+       goto_start_button.set_controllable (goto_start_controllable);
+       goto_end_button.set_controllable (goto_end_controllable);
+       auto_loop_button.set_controllable (auto_loop_controllable);
+       play_selection_button.set_controllable (play_selection_controllable);
+       rec_button.set_controllable (rec_controllable);
+
+       roll_button.set_name ("transport button");
+       stop_button.set_name ("transport button");
+       goto_start_button.set_name ("transport button");
+       goto_end_button.set_name ("transport button");
+       auto_loop_button.set_name ("transport button");
+       play_selection_button.set_name ("transport button");
+       rec_button.set_name ("transport recenable button");
+       midi_panic_button.set_name ("transport button");
+
+       goto_start_button.set_tweaks (ArdourButton::ShowClick);
+       goto_end_button.set_tweaks (ArdourButton::ShowClick);
+       midi_panic_button.set_tweaks (ArdourButton::ShowClick);
+       
        last_configure_time= 0;
-
-       shuttle_grabbed = false;
-       shuttle_fract = 0.0;
-       shuttle_max_speed = 8.0f;
-
-       shuttle_style_menu = 0;
-       shuttle_unit_menu = 0;
-
-       // We do not have jack linked in yet so;
-
-       last_shuttle_request = last_peak_grab = 0; //  get_microseconds();
+       last_peak_grab = 0;
 
        ARDOUR::Diskstream::DiskOverrun.connect (forever_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::disk_overrun_handler, this), gui_context());
        ARDOUR::Diskstream::DiskUnderrun.connect (forever_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::disk_underrun_handler, this), gui_context());
 
        /* handle dialog requests */
 
-       ARDOUR::Session::Dialog.connect (forever_connections, MISSING_INVALIDATOR, ui_bind (&ARDOUR_UI::session_dialog, this, _1), gui_context());
+       ARDOUR::Session::Dialog.connect (forever_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::session_dialog, this, _1), gui_context());
 
        /* handle pending state with a dialog (PROBLEM: needs to return a value and thus cannot be x-thread) */
 
@@ -268,8 +243,13 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
        ARDOUR::Session::AskAboutSampleRateMismatch.connect_same_thread (forever_connections, boost::bind (&ARDOUR_UI::sr_mismatch_dialog, this, _1, _2));
 
        /* handle requests to quit (coming from JACK session) */
-       
-       ARDOUR::Session::Quit.connect (forever_connections, MISSING_INVALIDATOR, ui_bind (&ARDOUR_UI::finish, this), gui_context ());
+
+       ARDOUR::Session::Quit.connect (forever_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::finish, this), gui_context ());
+
+       /* tell the user about feedback */
+
+       ARDOUR::Session::FeedbackDetected.connect (forever_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::feedback_detected, this), gui_context ());
+       ARDOUR::Session::SuccessfulGraphSort.connect (forever_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::successful_graph_sort, this), gui_context ());
 
        /* handle requests to deal with missing files */
 
@@ -291,7 +271,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
 
                GainMeter::setup_slider_pix ();
                RouteTimeAxisView::setup_slider_pix ();
-               SendProcessorEntry::setup_slider_pix ();
+               ProcessorEntry::setup_slider_pix ();
                SessionEvent::create_per_thread_pool ("GUI", 512);
 
        } catch (failed_constructor& err) {
@@ -309,15 +289,19 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
                keyboard->set_state (*node, Stateful::loading_state_version);
        }
 
+       /* we don't like certain modifiers */
+       Bindings::set_ignored_state (GDK_LOCK_MASK|GDK_MOD2_MASK|GDK_MOD3_MASK);
+
        reset_dpi();
 
        TimeAxisViewItem::set_constant_heights ();
 
        /* The following must happen after ARDOUR::init() so that Config is set up */
-       
+
        location_ui = new ActionWindowProxy<LocationUIWindow> (X_("locations"), Config->extra_xml (X_("UI")), X_("ToggleLocations"));
        big_clock_window = new ActionWindowProxy<Gtk::Window> (X_("bigclock"), Config->extra_xml (X_("UI")), X_("ToggleBigClock"));
-       
+       speaker_config_window = new ActionWindowProxy<SpeakerDialog> (X_("speakerconf"), Config->extra_xml (X_("UI")), X_("toggle-speaker-config"));
+
        for (ARDOUR::DataType::iterator i = ARDOUR::DataType::begin(); i != ARDOUR::DataType::end(); ++i) {
                _global_port_matrix[*i] = new ActionWindowProxy<GlobalPortMatrixWindow> (
                        string_compose ("GlobalPortMatrix-%1", (*i).to_string()),
@@ -328,28 +312,35 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
 
        setup_clock ();
 
+       SpeakerDialog* s = new SpeakerDialog ();
+       s->signal_unmap().connect (sigc::bind (sigc::ptr_fun (&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/toggle-speaker-config")));
+       speaker_config_window->set (s);
+
        starting.connect (sigc::mem_fun(*this, &ARDOUR_UI::startup));
        stopping.connect (sigc::mem_fun(*this, &ARDOUR_UI::shutdown));
 
-       platform_setup ();
+       _process_thread = new ProcessThread ();
+       _process_thread->init ();
+
+       DPIReset.connect (sigc::mem_fun (*this, &ARDOUR_UI::resize_text_widgets));
 }
 
 /** @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, string load_template)
+ARDOUR_UI::run_startup (bool should_be_new, std::string load_template)
 {
        delete _startup;
        _startup = new ArdourStartup ();
 
        XMLNode* audio_setup = Config->extra_xml ("AudioSetup");
-       
+
        if (audio_setup && _startup->engine_control()) {
                _startup->engine_control()->set_state (*audio_setup);
        }
 
        _startup->set_new_only (should_be_new);
        if (!load_template.empty()) {
-               _startup->set_load_template( load_template );
+               _startup->set_load_template (load_template);
        }
        _startup->present ();
 
@@ -386,7 +377,7 @@ ARDOUR_UI::create_engine ()
 
        engine->Stopped.connect (forever_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::engine_stopped, this), gui_context());
        engine->Running.connect (forever_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::engine_running, this), gui_context());
-       engine->SampleRateChanged.connect (forever_connections, MISSING_INVALIDATOR, ui_bind (&ARDOUR_UI::update_sample_rate, this, _1), gui_context());
+       engine->SampleRateChanged.connect (forever_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::update_sample_rate, this, _1), gui_context());
 
        engine->Halted.connect_same_thread (forever_connections, boost::bind (&ARDOUR_UI::engine_halted, this, _1, false));
 
@@ -405,12 +396,21 @@ ARDOUR_UI::post_engine ()
 
        ARDOUR::init_post_engine ();
 
+       /* load up the UI manager */
+
        ActionManager::init ();
+
        _tooltips.enable();
 
        if (setup_windows ()) {
                throw failed_constructor ();
        }
+
+       /* Do this after setup_windows (), as that's when the _status_bar_visibility is created */
+       XMLNode* n = Config->extra_xml (X_("UI"));
+       if (n) {
+               _status_bar_visibility.set_state (*n);
+       }
        
        check_memory_locking();
 
@@ -419,10 +419,11 @@ ARDOUR_UI::post_engine ()
        if (ARDOUR_COMMAND_LINE::show_key_actions) {
                vector<string> names;
                vector<string> paths;
+               vector<string> tooltips;
                vector<string> keys;
                vector<AccelKey> bindings;
 
-               ActionManager::get_all_actions (names, paths, keys, bindings);
+               ActionManager::get_all_actions (names, paths, tooltips, keys, bindings);
 
                vector<string>::iterator n;
                vector<string>::iterator k;
@@ -443,11 +444,11 @@ ARDOUR_UI::post_engine ()
        /* set default clock modes */
 
        if (Profile->get_sae()) {
-               primary_clock.set_mode (AudioClock::BBT);
-               secondary_clock.set_mode (AudioClock::MinSec);
+               primary_clock->set_mode (AudioClock::BBT);
+               secondary_clock->set_mode (AudioClock::MinSec);
        }  else {
-               primary_clock.set_mode (AudioClock::Timecode);
-               secondary_clock.set_mode (AudioClock::BBT);
+               primary_clock->set_mode (AudioClock::Timecode);
+               secondary_clock->set_mode (AudioClock::BBT);
        }
 
        /* start the time-of-day-clock */
@@ -462,7 +463,7 @@ ARDOUR_UI::post_engine ()
        update_cpu_load ();
        update_sample_rate (engine->frame_rate());
 
-       Config->ParameterChanged.connect (forever_connections, MISSING_INVALIDATOR, ui_bind (&ARDOUR_UI::parameter_changed, this, _1), gui_context());
+       Config->ParameterChanged.connect (forever_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::parameter_changed, this, _1), gui_context());
        boost::function<void (string)> pc (boost::bind (&ARDOUR_UI::parameter_changed, this, _1));
        Config->map_parameters (pc);
 
@@ -487,11 +488,10 @@ ARDOUR_UI::~ARDOUR_UI ()
 }
 
 void
-ARDOUR_UI::pop_back_splash ()
+ARDOUR_UI::pop_back_splash (Gtk::Window& win)
 {
        if (Splash::instance()) {
-               // Splash::instance()->pop_back();
-               Splash::instance()->hide ();
+               Splash::instance()->pop_back_for (win);
        }
 }
 
@@ -510,7 +510,6 @@ ARDOUR_UI::configure_timeout ()
                return true;
        } else {
                have_configure_timeout = false;
-               cerr << "config event-driven save\n";
                save_ardour_state ();
                return false;
        }
@@ -556,7 +555,7 @@ ARDOUR_UI::set_transport_controllable_state (const XMLNode& node)
                rec_controllable->set_id (prop->value());
        }
        if ((prop = node.property ("shuttle")) != 0) {
-               shuttle_controllable->set_id (prop->value());
+               shuttle_box->controllable()->set_id (prop->value());
        }
 }
 
@@ -580,7 +579,7 @@ ARDOUR_UI::get_transport_controllable_state ()
        node->add_property (X_("play_selection"), buf);
        rec_controllable->id().print (buf, sizeof (buf));
        node->add_property (X_("rec"), buf);
-       shuttle_controllable->id().print (buf, sizeof (buf));
+       shuttle_box->controllable()->id().print (buf, sizeof (buf));
        node->add_property (X_("shuttle"), buf);
 
        return *node;
@@ -629,59 +628,6 @@ ARDOUR_UI::update_autosave ()
        }
 }
 
-void
-ARDOUR_UI::backend_audio_error (bool we_set_params, Gtk::Window* toplevel)
-{
-       string title;
-       if (we_set_params) {
-               title = string_compose (_("%1 could not start JACK"), PROGRAM_NAME);
-       } else {
-               title = string_compose (_("%1 could not connect to JACK."), PROGRAM_NAME);
-       }
-
-       MessageDialog win (title,
-                          false,
-                          Gtk::MESSAGE_INFO,
-                          Gtk::BUTTONS_NONE);
-
-       if (we_set_params) {
-               win.set_secondary_text(_("There are several possible reasons:\n\
-\n\
-1) You requested audio parameters that are not supported..\n\
-2) JACK is running as another user.\n\
-\n\
-Please consider the possibilities, and perhaps try different parameters."));
-       } else {
-               win.set_secondary_text(_("There are several possible reasons:\n\
-\n\
-1) JACK is not running.\n\
-2) JACK is running as another user, perhaps root.\n\
-3) There is already another client called \"ardour\".\n\
-\n\
-Please consider the possibilities, and perhaps (re)start JACK."));
-       }
-
-       if (toplevel) {
-               win.set_transient_for (*toplevel);
-       }
-
-       if (we_set_params) {
-               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);
-       pop_back_splash ();
-
-       /* we just don't care about the result, but we want to block */
-
-       win.run ();
-}
-
 void
 ARDOUR_UI::startup ()
 {
@@ -712,7 +658,12 @@ ARDOUR_UI::startup ()
        for (ARDOUR::DataType::iterator i = ARDOUR::DataType::begin(); i != ARDOUR::DataType::end(); ++i) {
                add_window_proxy (_global_port_matrix[*i]);
        }
-       
+
+       /* We have to do this here since goto_editor_window() ends up calling show_all() on the
+        * editor window, and we may want stuff to be hidden.
+        */
+       _status_bar_visibility.update ();
+
        BootMessage (string_compose (_("%1 is ready for use"), PROGRAM_NAME));
 }
 
@@ -753,15 +704,15 @@ ARDOUR_UI::check_memory_locking ()
 
                        if (ram == 0 || ((double) limits.rlim_cur / ram) < 0.75) {
 
-
                                MessageDialog msg (
-                                       string_compose (_("WARNING: Your system has a limit for maximum amount of locked memory. "
-                                                         "This might cause %1 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"),
-                                                       PROGRAM_NAME).c_str());
-                                                   
+                                       string_compose (
+                                               _("WARNING: Your system has a limit for maximum amount of locked memory. "
+                                                 "This might cause %1 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"),
+                                               PROGRAM_NAME).c_str());
+
                                VBox* vbox = msg.get_vbox();
                                HBox hbox;
                                CheckButton cb (_("Do not show this window again"));
@@ -774,7 +725,7 @@ ARDOUR_UI::check_memory_locking ()
                                vbox->show();
                                hbox.show ();
 
-                               pop_back_splash ();
+                               pop_back_splash (msg);
 
                                editor->ensure_float (msg);
                                msg.run ();
@@ -804,13 +755,12 @@ ARDOUR_UI::finish()
        if (_session) {
                int tries = 0;
 
-               if (_session->transport_rolling() && (++tries < 8)) {
-                       _session->request_stop (false, true);
-                       usleep (10000);
-               }
-
                if (_session->dirty()) {
-                       switch (ask_about_saving_session(_("quit"))) {
+                       vector<string> actions;
+                       actions.push_back (_("Don't quit"));
+                       actions.push_back (_("Just quit"));
+                       actions.push_back (_("Save and quit"));
+                       switch (ask_about_saving_session(actions)) {
                        case -1:
                                return;
                                break;
@@ -819,11 +769,11 @@ ARDOUR_UI::finish()
                                if (save_state_canfail ("")) {
                                        /* failed - don't quit */
                                        MessageDialog msg (*editor,
-                                                          _("\
-Ardour was unable to save your session.\n\n\
+                                                          string_compose (_("\
+%1 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();
+\"Just quit\" option."), PROGRAM_NAME));
+                                       pop_back_splash(msg);
                                        msg.run ();
                                        return;
                                }
@@ -859,7 +809,7 @@ If you still wish to quit, please use the\n\n\
 }
 
 int
-ARDOUR_UI::ask_about_saving_session (const string & what)
+ARDOUR_UI::ask_about_saving_session (const vector<string>& actions)
 {
        ArdourDialog window (_("Unsaved Session"));
        Gtk::HBox dhbox;  // the hbox for the image and text
@@ -868,12 +818,11 @@ ARDOUR_UI::ask_about_saving_session (const string & what)
 
        string msg;
 
-       msg = string_compose(_("Don't %1"), what);
-       window.add_button (msg, RESPONSE_REJECT);
-       msg = string_compose(_("Just %1"), what);
-       window.add_button (msg, RESPONSE_APPLY);
-       msg = string_compose(_("Save and %1"), what);
-       window.add_button (msg, RESPONSE_ACCEPT);
+       assert (actions.size() >= 3);
+
+       window.add_button (actions[0], RESPONSE_REJECT);
+       window.add_button (actions[1], RESPONSE_APPLY);
+       window.add_button (actions[2], RESPONSE_ACCEPT);
 
        window.set_default_response (RESPONSE_ACCEPT);
 
@@ -881,15 +830,14 @@ ARDOUR_UI::ask_about_saving_session (const string & what)
        noquit_button.set_name ("EditorGTKButton");
 
        string prompt;
-       string type;
 
        if (_session->snap_name() == _session->name()) {
-               type = _("session");
+               prompt = string_compose(_("The session \"%1\"\nhas not been saved.\n\nAny changes made this time\nwill be lost unless you save it.\n\nWhat do you want to do?"),
+                                       _session->snap_name());
        } else {
-               type = _("snapshot");
+               prompt = string_compose(_("The snapshot \"%1\"\nhas not been saved.\n\nAny changes made this time\nwill be lost unless you save it.\n\nWhat do you want to do?"),
+                                       _session->snap_name());
        }
-       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"));
@@ -941,7 +889,7 @@ ARDOUR_UI::every_second ()
 gint
 ARDOUR_UI::every_point_one_seconds ()
 {
-       update_speed_display ();
+       shuttle_box->update_speed_display ();
        RapidScreenUpdate(); /* EMIT_SIGNAL */
        return TRUE;
 }
@@ -958,53 +906,124 @@ ARDOUR_UI::every_point_zero_one_seconds ()
 void
 ARDOUR_UI::update_sample_rate (framecnt_t)
 {
-       char buf[32];
+       char buf[64];
 
        ENSURE_GUI_THREAD (*this, &ARDOUR_UI::update_sample_rate, ignored)
 
        if (!engine->connected()) {
 
-               snprintf (buf, sizeof (buf), _("disconnected"));
+               snprintf (buf, sizeof (buf), "%s", _("disconnected"));
 
        } else {
 
                framecnt_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), _("JACK: <span foreground=\"green\">%.1f kHz / %4.1f ms</span>"),
                                  (float) rate/1000.0f,
                                  (engine->frames_per_cycle() / (float) rate) * 1000.0f);
                } else {
-                       snprintf (buf, sizeof (buf), _("%" PRId64 " kHz / %4.1f ms"),
+                       snprintf (buf, sizeof (buf), _("JACK: <span foreground=\"green\">%" PRId64 " kHz / %4.1f ms</span>"),
                                  rate/1000,
                                  (engine->frames_per_cycle() / (float) rate) * 1000.0f);
                }
        }
 
-       sample_rate_label.set_text (buf);
+       sample_rate_label.set_markup (buf);
+}
+
+void
+ARDOUR_UI::update_format ()
+{
+       if (!_session) {
+               format_label.set_text ("");
+               return;
+       }
+
+       stringstream s;
+       s << _("File:") << X_(" <span foreground=\"green\">");
+
+       switch (_session->config.get_native_file_header_format ()) {
+       case BWF:
+               s << _("BWF");
+               break;
+       case WAVE:
+               s << _("WAV");
+               break;
+       case WAVE64:
+               s << _("WAV64");
+               break;
+       case CAF:
+               s << _("CAF");
+               break;
+       case AIFF:
+               s << _("AIFF");
+               break;
+       case iXML:
+               s << _("iXML");
+               break;
+       case RF64:
+               s << _("RF64");
+               break;
+       }
+
+       s << " ";
+       
+       switch (_session->config.get_native_file_data_format ()) {
+       case FormatFloat:
+               s << _("32-float");
+               break;
+       case FormatInt24:
+               s << _("24-int");
+               break;
+       case FormatInt16:
+               s << _("16-int");
+               break;
+       }
+
+       s << X_("</span>");
+
+       format_label.set_markup (s.str ());
 }
 
 void
 ARDOUR_UI::update_cpu_load ()
 {
-       char buf[32];
-       snprintf (buf, sizeof (buf), _("DSP: %5.1f%%"), engine->get_cpu_load());
-       cpu_load_label.set_text (buf);
+       char buf[64];
+
+       /* If this text is changed, the set_size_request_to_display_given_text call in ARDOUR_UI::resize_text_widgets
+          should also be changed.
+       */
+
+       float const c = engine->get_cpu_load ();
+       snprintf (buf, sizeof (buf), _("DSP: <span foreground=\"%s\">%5.1f%%</span>"), c >= 90 ? X_("red") : X_("green"), c);
+       cpu_load_label.set_markup (buf);
 }
 
 void
 ARDOUR_UI::update_buffer_load ()
 {
-       char buf[64];
-       uint32_t c, p;
+       char buf[256];
 
+       uint32_t const playback = _session ? _session->playback_load () : 100;
+       uint32_t const capture = _session ? _session->capture_load () : 100;
+
+       /* If this text is changed, the set_size_request_to_display_given_text call in ARDOUR_UI::resize_text_widgets
+          should also be changed.
+       */
+       
        if (_session) {
-               c = _session->capture_load ();
-               p = _session->playback_load ();
+               snprintf (
+                       buf, sizeof (buf),
+                       _("Buffers: <span foreground=\"green\">p:</span><span foreground=\"%s\">%" PRIu32 "%%</span> "
+                                  "<span foreground=\"green\">c:</span><span foreground=\"%s\">%" PRIu32 "%%</span>"),
+                       playback <= 5 ? X_("red") : X_("green"),
+                       playback,
+                       capture <= 5 ? X_("red") : X_("green"),
+                       capture
+                       );
 
-               snprintf (buf, sizeof (buf), _("Buffers p:%" PRIu32 "%% c:%" PRIu32 "%%"),
-                         _session->playback_load(), _session->capture_load());
-               buffer_load_label.set_text (buf);
+               buffer_load_label.set_markup (buf);
        } else {
                buffer_load_label.set_text ("");
        }
@@ -1026,16 +1045,21 @@ ARDOUR_UI::update_disk_space()
                return;
        }
 
-       framecnt_t frames = _session->available_capture_duration();
+       boost::optional<framecnt_t> opt_frames = _session->available_capture_duration();
        char buf[64];
        framecnt_t fr = _session->frame_rate();
 
-       if (frames == max_framecnt) {
-               strcpy (buf, _("Disk: 24hrs+"));
+       if (!opt_frames) {
+               /* Available space is unknown */
+               snprintf (buf, sizeof (buf), "%s", _("Disk: <span foreground=\"green\">Unknown</span>"));
+       } else if (opt_frames.get_value_or (0) == max_framecnt) {
+               snprintf (buf, sizeof (buf), "%s", _("Disk: <span foreground=\"green\">24hrs+</span>"));
        } else {
                rec_enabled_streams = 0;
                _session->foreach_route (this, &ARDOUR_UI::count_recenabled_streams);
 
+               framecnt_t frames = opt_frames.get_value_or (0);
+
                if (rec_enabled_streams) {
                        frames /= rec_enabled_streams;
                }
@@ -1045,24 +1069,27 @@ ARDOUR_UI::update_disk_space()
                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"); */
+               if (hrs > 24) {
+                       snprintf (buf, sizeof (buf), "%s", _("Disk: <span foreground=\"green\">&gt;24 hrs</span>"));
+               } else {
+                       frames -= hrs * fr * 3600;
+                       mins = frames / (fr * 60);
+                       frames -= mins * fr * 60;
+                       secs = frames / fr;
+                       
+                       bool const low = (hrs == 0 && mins <= 30);
+                       
+                       snprintf (
+                               buf, sizeof(buf),
+                               _("Disk: <span foreground=\"%s\">%02dh:%02dm:%02ds</span>"),
+                               low ? X_("red") : X_("green"),
+                               hrs, mins, secs
+                               );
+               }
        }
 
+       disk_space_label.set_markup (buf);
 }
 
 gint
@@ -1081,13 +1108,6 @@ ARDOUR_UI::update_wall_clock ()
        return TRUE;
 }
 
-gint
-ARDOUR_UI::session_menu (GdkEventButton */*ev*/)
-{
-       session_popup_menu->popup (0, 0);
-       return TRUE;
-}
-
 void
 ARDOUR_UI::redisplay_recent_sessions ()
 {
@@ -1104,7 +1124,7 @@ ARDOUR_UI::redisplay_recent_sessions ()
                recent_session_display.set_model (recent_session_model);
                return;
        }
-       //
+
        // sort them alphabetically
        sort (rs.begin(), rs.end(), cmp);
 
@@ -1123,18 +1143,17 @@ ARDOUR_UI::redisplay_recent_sessions ()
 
                vector<string*>* states;
                vector<const gchar*> item;
-               string fullpath = (*i).to_string();
+               string fullpath = i->to_string();
 
                /* remove any trailing / */
 
-               if (fullpath[fullpath.length()-1] == '/') {
-                       fullpath = fullpath.substr (0, fullpath.length()-1);
+               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;
                }
 
@@ -1168,6 +1187,7 @@ ARDOUR_UI::redisplay_recent_sessions ()
                }
        }
 
+       recent_session_display.set_tooltip_column(1); // recent_session_columns.fullpath
        recent_session_display.set_model (recent_session_model);
 }
 
@@ -1197,7 +1217,6 @@ ARDOUR_UI::build_session_selector ()
 
        recent_session_display.show();
        scroller->show();
-       //session_selector_window->get_vbox()->show();
 }
 
 void
@@ -1265,10 +1284,11 @@ ARDOUR_UI::check_audioengine ()
 {
        if (engine) {
                if (!engine->connected()) {
-                       MessageDialog msg (string_compose (_("%1 is not connected to JACK\n"
-                                                            "You cannot open or close sessions in this condition"),
-                                                          PROGRAM_NAME));
-                       pop_back_splash ();
+                       MessageDialog msg (string_compose (
+                                                  _("%1 is not connected to JACK\n"
+                                                    "You cannot open or close sessions in this condition"),
+                                                  PROGRAM_NAME));
+                       pop_back_splash (msg);
                        msg.run ();
                        return false;
                }
@@ -1296,6 +1316,17 @@ ARDOUR_UI::open_session ()
                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);
+               
+               if (_session) {
+                       string session_parent_dir = Glib::path_get_dirname(_session->path());
+                       string::size_type last_dir_sep = session_parent_dir.rfind(G_DIR_SEPARATOR);
+                       session_parent_dir = session_parent_dir.substr(0, last_dir_sep);
+                       open_session_selector->set_current_folder(session_parent_dir);
+               } else {
+                       open_session_selector->set_current_folder(Config->get_default_session_parent_dir());
+               }
+
+               open_session_selector->add_shortcut_folder (Config->get_default_session_parent_dir());
 
                FileFilter session_filter;
                session_filter.add_pattern ("*.ardour");
@@ -1330,7 +1361,7 @@ ARDOUR_UI::open_session ()
 
 
 void
-ARDOUR_UI::session_add_midi_route (bool disk, RouteGroup* route_group, uint32_t how_many)
+ARDOUR_UI::session_add_midi_route (bool disk, RouteGroup* route_group, uint32_t how_many, const string& name_template, PluginInfoPtr instrument)
 {
        list<boost::shared_ptr<MidiTrack> > tracks;
 
@@ -1342,7 +1373,7 @@ ARDOUR_UI::session_add_midi_route (bool disk, RouteGroup* route_group, uint32_t
        try {
                if (disk) {
 
-                       tracks = _session->new_midi_track (ARDOUR::Normal, route_group, how_many);
+                       tracks = _session->new_midi_track (instrument, ARDOUR::Normal, route_group, how_many, name_template);
 
                        if (tracks.size() != how_many) {
                                if (how_many == 1) {
@@ -1351,11 +1382,8 @@ ARDOUR_UI::session_add_midi_route (bool disk, RouteGroup* route_group, uint32_t
                                        error << string_compose (_("could not create %1 new midi tracks"), how_many) << endmsg;
                                }
                        }
-               } /*else {
-                       if ((route = _session->new_midi_route ()) == 0) {
-                               error << _("could not create new midi bus") << endmsg;
-                       }
-               }*/
+                       
+               }
        }
 
        catch (...) {
@@ -1370,7 +1398,15 @@ restart JACK with more ports."), PROGRAM_NAME));
 
 
 void
-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)
+ARDOUR_UI::session_add_audio_route (
+       bool track,
+       int32_t input_channels,
+       int32_t output_channels,
+       ARDOUR::TrackMode mode,
+       RouteGroup* route_group,
+       uint32_t how_many,
+       string const & name_template
+       )
 {
        list<boost::shared_ptr<AudioTrack> > tracks;
        RouteList routes;
@@ -1382,7 +1418,7 @@ ARDOUR_UI::session_add_audio_route (bool track, bool aux, int32_t input_channels
 
        try {
                if (track) {
-                       tracks = _session->new_audio_track (input_channels, output_channels, mode, route_group, how_many);
+                       tracks = _session->new_audio_track (input_channels, output_channels, mode, route_group, how_many, name_template);
 
                        if (tracks.size() != how_many) {
                                if (how_many == 1) {
@@ -1395,13 +1431,13 @@ ARDOUR_UI::session_add_audio_route (bool track, bool aux, int32_t input_channels
 
                } else {
 
-                       routes = _session->new_audio_route (aux, input_channels, output_channels, route_group, how_many);
+                       routes = _session->new_audio_route (input_channels, output_channels, route_group, how_many, name_template);
 
                        if (routes.size() != how_many) {
                                if (how_many == 1) {
-                                       error << _("could not create a new audio track") << endmsg;
+                                       error << _("could not create a new audio bus") << endmsg;
                                } else {
-                                       error << string_compose (_("could not create %1 new audio tracks"), how_many) << endmsg;
+                                       error << string_compose (_("could not create %1 new audio busses"), how_many) << endmsg;
                                }
                        }
                }
@@ -1413,30 +1449,11 @@ ARDOUR_UI::session_add_audio_route (bool track, bool aux, int32_t input_channels
 to create a new track or bus.\n\
 You should save %1, exit and\n\
 restart JACK with more ports."), PROGRAM_NAME));
-               pop_back_splash ();
+               pop_back_splash (msg);
                msg.run ();
        }
 }
 
-void
-ARDOUR_UI::do_transport_locate (framepos_t new_position, bool with_roll)
-{
-       framecnt_t _preroll = 0;
-
-       if (_session) {
-               // XXX CONFIG_CHANGE FIX - requires AnyTime handling
-               // _preroll = _session->convert_to_frames_at (new_position, Config->get_preroll());
-
-               if (new_position > _preroll) {
-                       new_position -= _preroll;
-               } else {
-                       new_position = 0;
-               }
-
-               _session->request_locate (new_position, with_roll);
-       }
-}
-
 void
 ARDOUR_UI::transport_goto_start ()
 {
@@ -1529,22 +1546,6 @@ ARDOUR_UI::transport_stop ()
        _session->request_stop (false, true);
 }
 
-void
-ARDOUR_UI::transport_stop_and_forget_capture ()
-{
-       if (_session) {
-               _session->request_stop (true, true);
-       }
-}
-
-void
-ARDOUR_UI::remove_last_capture()
-{
-       if (editor) {
-               editor->remove_last_capture();
-       }
-}
-
 void
 ARDOUR_UI::transport_record (bool roll)
 {
@@ -1553,7 +1554,7 @@ ARDOUR_UI::transport_record (bool roll)
                switch (_session->record_status()) {
                case Session::Disabled:
                        if (_session->ntracks() == 0) {
-                               MessageDialog msg (*editor, _("Please create 1 or more track\nbefore trying to record.\nCheck the Session menu."));
+                               MessageDialog msg (*editor, _("Please create one or more tracks before trying to record.\nYou can do this with the \"Add Track or Bus\" option in the Session menu."));
                                msg.run ();
                                return;
                        }
@@ -1574,10 +1575,9 @@ 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 ()
 {
        if (!_session) {
@@ -1609,12 +1609,12 @@ ARDOUR_UI::transport_roll ()
                if (!Config->get_seamless_loop()) {
                        _session->request_play_loop (false, true);
                }
-       } else if (_session->get_play_range () && !join_play_range_button.get_active()) {
+       } else if (_session->get_play_range () && !Config->get_always_play_range()) {
                /* stop playing a range if we currently are */
                _session->request_play_range (0, true);
        }
 
-       if (join_play_range_button.get_active()) {
+       if (Config->get_always_play_range()) {
                _session->request_play_range (&editor->get_selection().time, true);
        }
 
@@ -1626,7 +1626,7 @@ ARDOUR_UI::transport_roll ()
 void
 ARDOUR_UI::toggle_roll (bool with_abort, bool roll_out_of_bounded_mode)
 {
-       
+
        if (!_session) {
                return;
        }
@@ -1636,7 +1636,6 @@ ARDOUR_UI::toggle_roll (bool with_abort, bool roll_out_of_bounded_mode)
                return;
        }
 
-#if 0
        if (_session->config.get_external_sync()) {
                switch (_session->config.get_sync_source()) {
                case JACK:
@@ -1646,7 +1645,6 @@ ARDOUR_UI::toggle_roll (bool with_abort, bool roll_out_of_bounded_mode)
                        return;
                }
        }
-#endif
 
        bool rolling = _session->transport_rolling();
        bool affect_transport = true;
@@ -1655,7 +1653,7 @@ ARDOUR_UI::toggle_roll (bool with_abort, bool 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 
+                               /* 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.
                                */
@@ -1668,17 +1666,17 @@ ARDOUR_UI::toggle_roll (bool with_abort, bool roll_out_of_bounded_mode)
                } 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 {
-                       if (join_play_range_button.get_active()) {
+                       if (Config->get_always_play_range ()) {
                                _session->request_play_range (&editor->get_selection().time, true);
                        }
-                       
+
                        _session->request_transport_speed (1.0f);
                }
        }
@@ -1687,23 +1685,28 @@ ARDOUR_UI::toggle_roll (bool with_abort, bool roll_out_of_bounded_mode)
 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);
-                       }
+       Location * looploc = _session->locations()->auto_loop_location();
+
+       if (!_session || !looploc) {
+               return;
+       }
+
+       if (_session->get_play_loop()) {
+
+               if (_session->transport_rolling()) {
+
+                       _session->request_locate (looploc->start(), true);
+                       _session->request_play_loop (false);
+
                } else {
-                       Location * looploc = _session->locations()->auto_loop_location();
-                       if (looploc) {
-                               _session->request_play_loop (true);
-                       }
+                       _session->request_play_loop (false);
                }
+       } else {
+               _session->request_play_loop (true);
        }
+       
+       //show the loop markers
+       looploc->set_hidden (false, this);
 }
 
 void
@@ -1746,35 +1749,34 @@ ARDOUR_UI::transport_rewind (int option)
 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:
-                               _session->request_transport_speed (1.0f);
-                               break;
-                       case 1:
-                               _session->request_transport_speed (4.0f);
-                               break;
-                       case -1:
-                               _session->request_transport_speed (0.5f);
-                               break;
-                       }
-               } else {
-                       /* speed up */
-                       _session->request_transport_speed (current_transport_speed * 1.5f);
+       if (!_session) {
+               return;
+       }
+       
+       float current_transport_speed = _session->transport_speed();
+       
+       if (current_transport_speed <= 0.0f) {
+               switch (option) {
+               case 0:
+                       _session->request_transport_speed (1.0f);
+                       break;
+               case 1:
+                       _session->request_transport_speed (4.0f);
+                       break;
+               case -1:
+                       _session->request_transport_speed (0.5f);
+                       break;
                }
-
+       } else {
+               /* speed up */
+               _session->request_transport_speed (current_transport_speed * 1.5f);
        }
 }
 
 void
 ARDOUR_UI::toggle_record_enable (uint32_t rid)
 {
-       if (_session == 0) {
+       if (!_session) {
                return;
        }
 
@@ -1788,72 +1790,61 @@ ARDOUR_UI::toggle_record_enable (uint32_t rid)
                        t->set_record_enabled (!t->record_enabled(), this);
                }
        }
-       if (_session == 0) {
-               return;
-       }
 }
 
 void
 ARDOUR_UI::map_transport_state ()
 {
-       ENSURE_GUI_THREAD (*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);
+               auto_loop_button.unset_active_state ();
+               play_selection_button.unset_active_state ();
+               roll_button.unset_active_state ();
+               stop_button.set_active_state (Gtkmm2ext::ExplicitActive);
                return;
        }
 
-       float sp = _session->transport_speed();
+       shuttle_box->map_transport_state ();
 
-       if (sp == 1.0f) {
-               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 ();
-       }
+       float sp = _session->transport_speed();
 
-       if (sp != 0.0) {
+       if (sp != 0.0f) {
 
                /* we're rolling */
 
                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);
+                       play_selection_button.set_active_state (Gtkmm2ext::ExplicitActive);
+                       roll_button.unset_active_state ();
+                       auto_loop_button.unset_active_state ();
 
                } 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);
+
+                       auto_loop_button.set_active (true);
+                       play_selection_button.set_active (false);
+                       roll_button.set_active (false);
 
                } else {
-                       
-                       roll_button.set_visual_state (1);
-                       play_selection_button.set_visual_state (0);
-                       auto_loop_button.set_visual_state (0);
+
+                       roll_button.set_active (true);
+                       play_selection_button.set_active (false);
+                       auto_loop_button.set_active (false);
                }
 
-               if (join_play_range_button.get_active()) {
+               if (Config->get_always_play_range()) {
                        /* light up both roll and play-selection if they are joined */
-                       roll_button.set_visual_state (1);
-                       play_selection_button.set_visual_state (1);
+                       roll_button.set_active (true);
+                       play_selection_button.set_active (true);
                }
 
-               stop_button.set_visual_state (0);
+               stop_button.set_active (false);
 
        } else {
 
-               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);
+               stop_button.set_active (true);
+               roll_button.set_active (false);
+               play_selection_button.set_active (false);
+               auto_loop_button.set_active (false);
+               update_disk_space ();
        }
 }
 
@@ -1951,7 +1942,7 @@ JACK, reconnect and save the session."), PROGRAM_NAME);
        }
 
        MessageDialog msg (*editor, msgstr);
-       pop_back_splash ();
+       pop_back_splash (msg);
        msg.run ();
 
        if (free_reason) {
@@ -1977,12 +1968,6 @@ ARDOUR_UI::do_engine_start ()
        return 0;
 }
 
-void
-ARDOUR_UI::setup_theme ()
-{
-       theme_manager->setup_theme();
-}
-
 void
 ARDOUR_UI::update_clocks ()
 {
@@ -2003,21 +1988,8 @@ ARDOUR_UI::stop_clocking ()
        clock_signal_connection.disconnect ();
 }
 
-void
-ARDOUR_UI::toggle_clocking ()
-{
-#if 0
-       if (clock_button.get_active()) {
-               start_clocking ();
-       } else {
-               stop_clocking ();
-       }
-#endif
-}
-
 gint
 ARDOUR_UI::_blink (void *arg)
-
 {
        ((ARDOUR_UI *) arg)->blink ();
        return TRUE;
@@ -2052,7 +2024,7 @@ ARDOUR_UI::stop_blinking ()
 }
 
 
-/** Ask the user for the name of a new shapshot and then take it.
+/** Ask the user for the name of a new snapshot and then take it.
  */
 
 void
@@ -2064,17 +2036,16 @@ ARDOUR_UI::snapshot_session (bool switch_to_it)
        prompter.set_name ("Prompter");
        prompter.add_button (Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT);
        prompter.set_title (_("Take Snapshot"));
-       prompter.set_title (_("Take Snapshot"));
        prompter.set_prompt (_("Name of new snapshot"));
 
        if (!switch_to_it) {
                char timebuf[128];
                time_t n;
                struct tm local_time;
-                
+
                time (&n);
                localtime_r (&n, &local_time);
-               strftime (timebuf, sizeof(timebuf), "%FT%T", &local_time);
+               strftime (timebuf, sizeof(timebuf), "%FT%H.%M.%S", &local_time);
                prompter.set_initial_text (timebuf);
        }
 
@@ -2087,15 +2058,10 @@ ARDOUR_UI::snapshot_session (bool switch_to_it)
                bool do_save = (snapname.length() != 0);
 
                if (do_save) {
-                       if (snapname.find ('/') != string::npos) {
-                               MessageDialog msg (_("To ensure compatibility with various systems\n"
-                                                    "snapshot names may not contain a '/' character"));
-                               msg.run ();
-                               goto again;
-                       }
-                       if (snapname.find ('\\') != string::npos) {
-                               MessageDialog msg (_("To ensure compatibility with various systems\n"
-                                                    "snapshot names may not contain a '\\' character"));
+                       char illegal = Session::session_name_is_legal(snapname);
+                       if (illegal) {
+                               MessageDialog msg (string_compose (_("To ensure compatibility with various systems\n"
+                                                    "snapshot names may not contain a '%1' character"), illegal));
                                msg.run ();
                                goto again;
                        }
@@ -2129,6 +2095,69 @@ ARDOUR_UI::snapshot_session (bool switch_to_it)
        }
 }
 
+/** Ask the user for a new session name and then rename the session to it.
+ */
+
+void
+ARDOUR_UI::rename_session ()
+{
+       if (!_session) {
+               return;
+       }
+
+       ArdourPrompter prompter (true);
+       string name;
+
+       prompter.set_name ("Prompter");
+       prompter.add_button (Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT);
+       prompter.set_title (_("Rename Session"));
+       prompter.set_prompt (_("New session name"));
+
+  again:
+       switch (prompter.run()) {
+       case RESPONSE_ACCEPT:
+       {
+               prompter.get_result (name);
+
+               bool do_rename = (name.length() != 0);
+
+               if (do_rename) {
+                       char illegal = Session::session_name_is_legal (name);
+
+                       if (illegal) {
+                               MessageDialog msg (string_compose (_("To ensure compatibility with various systems\n"
+                                                                    "session names may not contain a '%1' character"), illegal));
+                               msg.run ();
+                               goto again;
+                       }
+
+                       switch (_session->rename (name)) {
+                       case -1: {
+                               MessageDialog msg (_("That name is already in use by another directory/folder. Please try again."));
+                               msg.set_position (WIN_POS_MOUSE);
+                               msg.run ();
+                               goto again;
+                               break;
+                       }
+                       case 0:
+                               break;
+                       default: {
+                               MessageDialog msg (_("Renaming this session failed.\nThings could be seriously messed up at this point"));
+                               msg.set_position (WIN_POS_MOUSE);
+                               msg.run ();
+                               break;
+                       }
+                       }
+               }
+               
+               break;
+       }
+
+       default:
+               break;
+       }
+}
+
 void
 ARDOUR_UI::save_state (const string & name, bool switch_to_it)
 {
@@ -2140,8 +2169,10 @@ ARDOUR_UI::save_state (const string & name, bool switch_to_it)
                }
        }
 
+       node->add_child_nocopy (gui_object_state->get_state());
+
        _session->add_extra_xml (*node);
-       
+
        save_state_canfail (name, switch_to_it);
 }
 
@@ -2159,7 +2190,7 @@ ARDOUR_UI::save_state_canfail (string name, bool switch_to_it)
                        return ret;
                }
        }
-       cerr << "SS canfail\n";
+
        save_ardour_state (); /* XXX cannot fail? yeah, right ... */
        return 0;
 }
@@ -2168,7 +2199,7 @@ void
 ARDOUR_UI::primary_clock_value_changed ()
 {
        if (_session) {
-               _session->request_locate (primary_clock.current_time ());
+               _session->request_locate (primary_clock->current_time ());
        }
 }
 
@@ -2176,7 +2207,7 @@ void
 ARDOUR_UI::big_clock_value_changed ()
 {
        if (_session) {
-               _session->request_locate (big_clock.current_time ());
+               _session->request_locate (big_clock->current_time ());
        }
 }
 
@@ -2184,7 +2215,7 @@ void
 ARDOUR_UI::secondary_clock_value_changed ()
 {
        if (_session) {
-               _session->request_locate (secondary_clock.current_time ());
+               _session->request_locate (secondary_clock->current_time ());
        }
 }
 
@@ -2204,14 +2235,14 @@ ARDOUR_UI::transport_rec_enable_blink (bool onoff)
 
        if (r == Session::Enabled || (r == Session::Recording && !h)) {
                if (onoff) {
-                       rec_button.set_visual_state (2);
+                       rec_button.set_active_state (Gtkmm2ext::ExplicitActive);
                } else {
-                       rec_button.set_visual_state (0);
+                       rec_button.set_active_state (Gtkmm2ext::ImplicitActive);
                }
        } else if (r == Session::Recording && h) {
-               rec_button.set_visual_state (1);
+               rec_button.set_active_state (Gtkmm2ext::ExplicitActive);
        } else {
-               rec_button.set_visual_state (0);
+               rec_button.unset_active_state ();
        }
 }
 
@@ -2226,8 +2257,8 @@ ARDOUR_UI::save_template ()
        }
 
        prompter.set_name (X_("Prompter"));
-       prompter.set_title (_("Save Mix Template"));
-       prompter.set_prompt (_("Name for mix template:"));
+       prompter.set_title (_("Save Template"));
+       prompter.set_prompt (_("Name for template:"));
        prompter.set_initial_text(_session->name() + _("-template"));
        prompter.add_button (Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT);
 
@@ -2263,102 +2294,6 @@ ARDOUR_UI::import_metadata ()
        dialog.run ();
 }
 
-void
-ARDOUR_UI::fontconfig_dialog ()
-{
-#ifdef GTKOSX
-       /* 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.
-       */
-
-       std::string 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 (*_startup,
-                                  string_compose (_("Welcome to %1.\n\n"
-                                                    "The program will take a bit longer to start up\n"
-                                                    "while the system fonts are checked.\n\n"
-                                                    "This will only be done once, and you will\n"
-                                                    "not see this message again\n"), PROGRAM_NAME),
-                                  true,
-                                  Gtk::MESSAGE_INFO,
-                                  Gtk::BUTTONS_OK);
-               pop_back_splash ();
-               msg.show_all ();
-               msg.present ();
-               msg.run ();
-       }
-#endif
-}
-
-void
-ARDOUR_UI::parse_cmdline_path (const std::string& cmdline_path, std::string& session_name, std::string& session_path, bool& existing_session)
-{
-       existing_session = false;
-
-       if (Glib::file_test (cmdline_path, Glib::FILE_TEST_IS_DIR)) {
-               session_path = cmdline_path;
-               existing_session = true;
-       } else if (Glib::file_test (cmdline_path, Glib::FILE_TEST_IS_REGULAR)) {
-               session_path = Glib::path_get_dirname (string (cmdline_path));
-               existing_session = true;
-       } else {
-               /* it doesn't exist, assume the best */
-               session_path = Glib::path_get_dirname (string (cmdline_path));
-       }
-
-       session_name = basename_nosuffix (string (cmdline_path));
-}
-
-int
-ARDOUR_UI::load_cmdline_session (const std::string& session_name, const std::string& session_path, bool& existing_session)
-{
-       /* when this is called, the backend audio system must be running */
-
-       /* the main idea here is to deal with the fact that a cmdline argument for the session
-          can be interpreted in different ways - it could be a directory or a file, and before
-          we load, we need to know both the session directory and the snapshot (statefile) within it
-          that we are supposed to use.
-       */
-
-       if (session_name.length() == 0 || session_path.length() == 0) {
-               return false;
-       }
-
-       if (Glib::file_test (session_path, Glib::FILE_TEST_IS_DIR)) {
-
-               std::string 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;
-               }
-
-       } else {
-               existing_session = false;
-       }
-
-       /* lets just try to load it */
-
-       if (create_engine ()) {
-               backend_audio_error (false, _startup);
-               return -1;
-       }
-
-       return load_session (session_path, session_name);
-}
-
 bool
 ARDOUR_UI::ask_about_loading_existing_session (const std::string& session_path)
 {
@@ -2375,7 +2310,7 @@ ARDOUR_UI::ask_about_loading_existing_session (const std::string& session_path)
        msg.set_title (_("Open Existing Session"));
        msg.set_wmclass (X_("existing_session"), PROGRAM_NAME);
        msg.set_position (Gtk::WIN_POS_MOUSE);
-       pop_back_splash ();
+       pop_back_splash (msg);
 
        switch (msg.run()) {
        case RESPONSE_YES:
@@ -2414,8 +2349,6 @@ ARDOUR_UI::build_session_from_nsd (const std::string& session_path, const std::s
                        bus_profile.input_ac = AutoConnectOption (0);
                }
 
-               /// @todo some minor tweaks.
-                
                bus_profile.output_ac = AutoConnectOption (0);
 
                if (_startup->connect_outputs ()) {
@@ -2448,42 +2381,24 @@ ARDOUR_UI::idle_load (const std::string& path)
                        /* /path/to/foo/foo.ardour => /path/to/foo, foo */
                        load_session (Glib::path_get_dirname (path), basename_nosuffix (path));
                }
-       } else {
 
+       } else {
                ARDOUR_COMMAND_LINE::session_name = path;
-
-               /*
-                * 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.
-                */
-
-               //if (new_session_dialog) {
-
-
-                       /* make it break out of Dialog::run() and
-                          start again.
-                        */
-
-                       //new_session_dialog->response (1);
-               //}
        }
 }
 
 void
-ARDOUR_UI::end_loading_messages ()
+ARDOUR_UI::loading_message (const std::string& msg)
 {
-       // hide_splash ();
-}
+       if (ARDOUR_COMMAND_LINE::no_splash) {
+               return;
+       }
 
-void
-ARDOUR_UI::loading_message (const std::string& /*msg*/)
-{
-       // show_splash ();
-       // splash->message (msg);
-       flush_pending ();
+       show_splash ();
+       if (splash) {
+               splash->message (msg);
+               flush_pending ();
+       }
 }
 
 /** @param quit_on_cancel true if exit() should be called if the user clicks `cancel' in the new session dialog */
@@ -2496,7 +2411,7 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new, stri
        int ret = -1;
        bool likely_new = false;
 
-       if (! load_template.empty()) {
+       if (!load_template.empty()) {
                should_be_new = true;
                template_name = load_template;
        }
@@ -2510,14 +2425,17 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new, stri
                           to find the session.
                        */
 
-                       if (ARDOUR_COMMAND_LINE::session_name.find (statefile_suffix) != string::npos) {
+                       string::size_type suffix = ARDOUR_COMMAND_LINE::session_name.find (statefile_suffix);
+
+                       if (suffix != string::npos) {
                                session_path = Glib::path_get_dirname (ARDOUR_COMMAND_LINE::session_name);
+                               session_name = ARDOUR_COMMAND_LINE::session_name.substr (0, suffix);
+                               session_name = Glib::path_get_basename (session_name);
                        } else {
                                session_path = ARDOUR_COMMAND_LINE::session_name;
+                               session_name = Glib::path_get_basename (ARDOUR_COMMAND_LINE::session_name);
                        }
 
-                       session_name = Glib::path_get_basename (ARDOUR_COMMAND_LINE::session_name);
-
                } else {
 
                        bool const apply = run_startup (should_be_new, load_template);
@@ -2536,6 +2454,12 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new, stri
 
                        session_name = _startup->session_name (likely_new);
 
+                       string::size_type suffix = session_name.find (statefile_suffix);
+
+                       if (suffix != string::npos) {
+                               session_name = session_name.substr (0, suffix);
+                       }
+
                        /* this shouldn't happen, but we catch it just in case it does */
 
                        if (session_name.empty()) {
@@ -2554,7 +2478,7 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new, stri
                                /* absolute path or cwd-relative path specified for session name: infer session folder
                                   from what was given.
                                */
-                                
+
                                session_path = Glib::path_get_dirname (session_name);
                                session_name = Glib::path_get_basename (session_name);
 
@@ -2562,17 +2486,13 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new, stri
 
                                session_path = _startup->session_folder();
 
-                               if (session_name.find ('/') != string::npos) {
-                                       MessageDialog msg (*_startup, _("To ensure compatibility with various systems\n"
-                                                                       "session names may not contain a '/' character"));
-                                       msg.run ();
-                                       ARDOUR_COMMAND_LINE::session_name = ""; // cancel that
-                                       continue;
-                               }
-                                
-                               if (session_name.find ('\\') != string::npos) {
-                                       MessageDialog msg (*_startup, _("To ensure compatibility with various systems\n"
-                                                                       "session names may not contain a '\\' character"));
+                               char illegal = Session::session_name_is_legal (session_name);
+
+                               if (illegal) {
+                                       MessageDialog msg (*_startup,
+                                                          string_compose (_("To ensure compatibility with various systems\n"
+                                                                            "session names may not contain a '%1' character"),
+                                                                          illegal));
                                        msg.run ();
                                        ARDOUR_COMMAND_LINE::session_name = ""; // cancel that
                                        continue;
@@ -2601,23 +2521,23 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new, stri
                } 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;
-                       }
+                               if (_startup) {
+                                       pop_back_splash (*_startup);
+                               } else {
+                                       hide_splash ();
+                               }
 
-                       if (session_name.find ('/') != std::string::npos) {
-                               MessageDialog msg (*_startup, _("To ensure compatibility with various systems\n"
-                                                               "session names may not contain a '/' character"));
+                               MessageDialog msg (string_compose (_("There is no existing session at \"%1\""), session_path));
                                msg.run ();
                                ARDOUR_COMMAND_LINE::session_name = ""; // cancel that
                                continue;
                        }
 
-                       if (session_name.find ('\\') != std::string::npos) {
-                               MessageDialog msg (*_startup, _("To ensure compatibility with various systems\n"
-                                                               "session names may not contain a '\\' character"));
+                       char illegal = Session::session_name_is_legal(session_name);
+                       if (illegal) {
+                               pop_back_splash (*_startup);
+                               MessageDialog msg (*_startup, string_compose(_("To ensure compatibility with various systems\n"
+                                                    "session names may not contain a '%1' character"), illegal));
                                msg.run ();
                                ARDOUR_COMMAND_LINE::session_name = ""; // cancel that
                                continue;
@@ -2633,6 +2553,12 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new, stri
                } else {
 
                        ret = load_session (session_path, session_name, template_name);
+
+                       if (ret == -2) {
+                               /* not connected to the AudioEngine, so quit to avoid an infinite loop */
+                               exit (1);
+                       }
+
                        if (!ARDOUR_COMMAND_LINE::immediate_save.empty()) {
                                _session->save_state (ARDOUR_COMMAND_LINE::immediate_save, false);
                                exit (1);
@@ -2663,6 +2589,9 @@ ARDOUR_UI::close_session()
        goto_editor_window ();
 }
 
+/** @param snap_name Snapshot name (without .ardour suffix).
+ *  @return -2 if the load failed because we are not connected to the AudioEngine.
+ */
 int
 ARDOUR_UI::load_session (const std::string& path, const std::string& snap_name, std::string mix_template)
 {
@@ -2673,7 +2602,7 @@ ARDOUR_UI::load_session (const std::string& path, const std::string& snap_name,
        session_loaded = false;
 
        if (!check_audioengine()) {
-               return -1;
+               return -2;
        }
 
        unload_status = unload_session ();
@@ -2685,7 +2614,7 @@ ARDOUR_UI::load_session (const std::string& path, const std::string& snap_name,
                goto out;
        }
 
-       loading_message (string_compose (_("Please wait while %1loads your session"), PROGRAM_NAME));
+       loading_message (string_compose (_("Please wait while %1 loads your session"), PROGRAM_NAME));
 
        try {
                new_session = new Session (*engine, path, snap_name, 0, mix_template);
@@ -2703,7 +2632,7 @@ ARDOUR_UI::load_session (const std::string& path, const std::string& snap_name,
                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 ();
+               pop_back_splash (msg);
                msg.present ();
 
                int response = msg.run ();
@@ -2721,7 +2650,9 @@ ARDOUR_UI::load_session (const std::string& path, const std::string& snap_name,
 
        catch (...) {
 
-               MessageDialog msg (string_compose(_("Session \"%1 (snapshot %2)\" did not load successfully"),path, snap_name),
+               MessageDialog msg (string_compose(
+                                          _("Session \"%1 (snapshot %2)\" did not load successfully"),
+                                          path, snap_name),
                                   true,
                                   Gtk::MESSAGE_INFO,
                                   BUTTONS_OK);
@@ -2730,7 +2661,7 @@ ARDOUR_UI::load_session (const std::string& path, const std::string& snap_name,
                msg.set_secondary_text (_("Click the Refresh button to try again."));
                msg.add_button (Stock::REFRESH, 1);
                msg.set_position (Gtk::WIN_POS_CENTER);
-               pop_back_splash ();
+               pop_back_splash (msg);
                msg.present ();
 
                int response = msg.run ();
@@ -2810,7 +2741,7 @@ ARDOUR_UI::build_session (const std::string& path, const std::string& snap_name,
        catch (...) {
 
                MessageDialog msg (string_compose(_("Could not create session in \"%1\""), path));
-               pop_back_splash ();
+               pop_back_splash (msg);
                msg.run ();
                return -1;
        }
@@ -2827,6 +2758,13 @@ ARDOUR_UI::build_session (const std::string& path, const std::string& snap_name,
                new_session->add_instant_xml (*n, false);
        }
 
+       /* Put the playhead at 0 and scroll fully left */
+       n = new_session->instant_xml (X_("Editor"));
+       if (n) {
+               n->add_property (X_("playhead"), X_("0"));
+               n->add_property (X_("left-frame"), X_("0"));
+       }
+
        set_session (new_session);
 
        session_loaded = true;
@@ -2851,7 +2789,7 @@ ARDOUR_UI::show_about ()
 {
        if (about == 0) {
                about = new About;
-               about->signal_response().connect(sigc::mem_fun (*this, &ARDOUR_UI::about_signal_response) );
+               about->signal_response().connect (sigc::mem_fun (*this, &ARDOUR_UI::about_signal_response));
        }
 
        about->set_transient_for(*editor);
@@ -2896,8 +2834,8 @@ ARDOUR_UI::show_splash ()
                }
        }
 
-       splash->show ();
        splash->present ();
+       splash->pop_front ();
        splash->queue_draw ();
        splash->get_window()->process_updates (true);
        flush_pending ();
@@ -2906,9 +2844,8 @@ ARDOUR_UI::show_splash ()
 void
 ARDOUR_UI::hide_splash ()
 {
-       if (splash) {
-               splash->hide();
-       }
+        delete splash;
+        splash = 0;
 }
 
 void
@@ -2921,10 +2858,11 @@ ARDOUR_UI::display_cleanup_results (ARDOUR::CleanupReport& rep, const gchar* lis
 
        if (removed == 0) {
                MessageDialog msgd (*editor,
-                                   _("No audio files were ready for cleanup"),
+                                   _("No files were ready for clean-up"),
                                    true,
                                    Gtk::MESSAGE_INFO,
-                                   (Gtk::ButtonsType)(Gtk::BUTTONS_OK)  );
+                                   Gtk::BUTTONS_OK);
+               msgd.set_title (_("Clean-up"));
                msgd.set_secondary_text (_("If this seems suprising, \n\
 check for any existing snapshots.\n\
 These may still include regions that\n\
@@ -2968,11 +2906,11 @@ require some unused files to continue to exist."));
 
        dimage->set_alignment(ALIGN_LEFT, ALIGN_TOP);
 
-       const string dead_sound_directory = _session->session_directory().dead_sound_path().to_string();
+       const string dead_directory = _session->session_directory().dead_path().to_string();
 
        /* subst:
           %1 - number of files removed
-          %2 - location of "dead_sounds"
+          %2 - location of "dead"
           %3 - size of files affected
           %4 - prefix for "bytes" to produce sensible results (e.g. mega, kilo, giga)
        */
@@ -2980,20 +2918,24 @@ require some unused files to continue to exist."));
        const char* bprefix;
        double space_adjusted = 0;
 
-       if (rep.space < 100000.0f) {
+       if (rep.space < 1000) {
+               bprefix = X_("");
+               space_adjusted = rep.space;
+       } else if (rep.space < 1000000) {
                bprefix = X_("kilo");
-       } else if (rep.space < 1000000.0f * 1000) {
-               bprefix = X_("mega");
                space_adjusted = truncf((float)rep.space / 1000.0);
+       } else if (rep.space < 1000000 * 1000) {
+               bprefix = X_("mega");
+               space_adjusted = truncf((float)rep.space / (1000.0 * 1000.0));
        } else {
                bprefix = X_("giga");
-               space_adjusted = truncf((float)rep.space / (1000000.0 * 1000));
+               space_adjusted = truncf((float)rep.space / (1000.0 * 1000 * 1000.0));
        }
 
        if (removed > 1) {
-               txt.set_text (string_compose (plural_msg, removed, _session->path() + "dead_sounds", space_adjusted, bprefix));
+               txt.set_text (string_compose (plural_msg, removed, dead_directory, space_adjusted, bprefix, PROGRAM_NAME));
        } else {
-               txt.set_text (string_compose (singular_msg, removed, _session->path() + "dead_sounds", space_adjusted, bprefix));
+               txt.set_text (string_compose (singular_msg, removed, dead_directory, space_adjusted, bprefix, PROGRAM_NAME));
        }
 
        dhbox.pack_start (*dimage, true, false, 5);
@@ -3042,18 +2984,19 @@ ARDOUR_UI::cleanup ()
        }
 
 
-       MessageDialog  checker (_("Are you sure you want to cleanup?"),
+       MessageDialog checker (_("Are you sure you want to clean-up?"),
                                true,
                                Gtk::MESSAGE_QUESTION,
-                               (Gtk::ButtonsType)(Gtk::BUTTONS_NONE));
+                               Gtk::BUTTONS_NONE);
 
-       checker.set_secondary_text(_("Cleanup is a destructive operation.\n\
-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.set_title (_("Clean-up"));
+
+       checker.set_secondary_text(_("Clean-up is a destructive operation.\n\
+ALL undo/redo information will be lost if you clean-up.\n\
+Clean-up will move all unused files to a \"dead\" location."));
 
        checker.add_button (Stock::CANCEL, RESPONSE_CANCEL);
-       checker.add_button (_("Clean Up"), RESPONSE_ACCEPT);
+       checker.add_button (_("Clean-up"), RESPONSE_ACCEPT);
        checker.set_default_response (RESPONSE_CANCEL);
 
        checker.set_name (_("CleanupDialog"));
@@ -3087,20 +3030,22 @@ After cleanup, unused audio files will be moved to a \
 
        checker.hide();
        display_cleanup_results (rep,
-                                _("cleaned files"),
+                                _("Cleaned Files"),
                                 _("\
 The following %1 files were not in use and \n\
-have been moved to:\n\
-%2. \n\n\
-Flushing the wastebasket will \n\
-release an additional\n\
+have been moved to:\n\n\
+%2\n\n\
+After a restart of %5,\n\n\
+Session -> Clean-up -> Flush Wastebasket\n\n\
+will release an additional\n\
 %3 %4bytes of disk space.\n"),
                                 _("\
-The following file was not in use and \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\
+%2\n\n\
+After a restart of %5,\n\n\
+Session -> Clean-up -> Flush Wastebasket\n\n\
+will release an additional\n\
 %3 %4bytes of disk space.\n"
                                         ));
 
@@ -3141,6 +3086,7 @@ ARDOUR_UI::add_route (Gtk::Window* float_window)
 
        if (add_route_dialog == 0) {
                add_route_dialog = new AddRouteDialog (_session);
+               add_route_dialog->set_position (WIN_POS_MOUSE);
                if (float_window) {
                        add_route_dialog->set_transient_for (*float_window);
                }
@@ -3177,8 +3123,7 @@ ARDOUR_UI::add_route (Gtk::Window* float_window)
        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();
+       PluginInfoPtr instrument = add_route_dialog->requested_instrument ();
        RouteGroup* route_group = add_route_dialog->route_group ();
 
        AutoConnectOption oac = Config->get_output_auto_connect();
@@ -3191,21 +3136,12 @@ ARDOUR_UI::add_route (Gtk::Window* float_window)
 
        /* XXX do something with name template */
 
-       if (add_route_dialog->type() == ARDOUR::DataType::MIDI) {
-               if (track) {
-                       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();
-               }
+       if (add_route_dialog->midi_tracks_wanted()) {
+               session_add_midi_track (route_group, count, name_template, instrument);
+       } else if (add_route_dialog->audio_tracks_wanted()) {
+               session_add_audio_track (input_chan, output_chan, add_route_dialog->mode(), route_group, count, name_template);
        } else {
-               if (track) {
-                       session_add_audio_track (input_chan, output_chan, add_route_dialog->mode(), route_group, count);
-               } else {
-                       session_add_audio_bus (aux, input_chan, output_chan, route_group, count);
-               }
+               session_add_audio_bus (input_chan, output_chan, route_group, count, name_template);
        }
 }
 
@@ -3237,7 +3173,7 @@ ARDOUR_UI::editor_settings () const
        } else {
                node = Config->instant_xml(X_("Editor"));
        }
-       
+
        if (!node) {
                if (getenv("ARDOUR_INSTANT_XML_PATH")) {
                        node = Config->instant_xml(getenv("ARDOUR_INSTANT_XML_PATH"));
@@ -3261,6 +3197,7 @@ ARDOUR_UI::keyboard_settings () const
        if (!node) {
                node = new XMLNode (X_("Keyboard"));
        }
+
        return node;
 }
 
@@ -3321,8 +3258,8 @@ ARDOUR_UI::disk_underrun_handler ()
 
        if (!have_disk_speed_dialog_displayed) {
                have_disk_speed_dialog_displayed = true;
-               MessageDialog* msg = new MessageDialog (*editor,
-                                                       string_compose (_("The disk system on your computer\n\
+               MessageDialog* msg = new MessageDialog (
+                       *editor, string_compose (_("The disk system on your computer\n\
 was not able to keep up with %1.\n\
 \n\
 Specifically, it failed to read data from disk\n\
@@ -3363,14 +3300,14 @@ ARDOUR_UI::pending_state_dialog ()
        HBox* hbox = new HBox();
        Image* image = new Image (Stock::DIALOG_QUESTION, ICON_SIZE_DIALOG);
        ArdourDialog dialog (_("Crash Recovery"), true);
-       Label  message (_("\
+       Label  message (string_compose (_("\
 This session appears to have been in\n\
 middle of recording when ardour or\n\
 the computer was shutdown.\n\
 \n\
-Ardour can recover any captured audio for\n\
+%1 can recover any captured audio for\n\
 you, or it can ignore it. Please decide\n\
-what you would like to do.\n"));
+what you would like to do.\n"), PROGRAM_NAME));
        image->set_alignment(ALIGN_CENTER, ALIGN_TOP);
        hbox->pack_start (*image, PACK_EXPAND_WIDGET, 12);
        hbox->pack_end (message, PACK_EXPAND_PADDING, 12);
@@ -3398,9 +3335,9 @@ ARDOUR_UI::sr_mismatch_dialog (framecnt_t desired, framecnt_t actual)
        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));
+This session was created with a sample rate of %1 Hz, but\n\
+%2 is currently running at %3 Hz.  If you load this session,\n\
+audio may be played at the wrong sample rate.\n"), desired, PROGRAM_NAME, actual));
 
        image->set_alignment(ALIGN_CENTER, ALIGN_TOP);
        hbox->pack_start (*image, PACK_EXPAND_WIDGET, 12);
@@ -3427,7 +3364,7 @@ void
 ARDOUR_UI::disconnect_from_jack ()
 {
        if (engine) {
-               ifengine->disconnect_from_jack ()) {
+               if (engine->disconnect_from_jack ()) {
                        MessageDialog msg (*editor, _("Could not disconnect from JACK"));
                        msg.run ();
                }
@@ -3462,19 +3399,19 @@ void
 ARDOUR_UI::update_transport_clocks (framepos_t pos)
 {
        if (Config->get_primary_clock_delta_edit_cursor()) {
-               primary_clock.set (pos, false, editor->get_preferred_edit_position(), 1);
+               primary_clock->set (pos, false, editor->get_preferred_edit_position());
        } else {
-               primary_clock.set (pos, 0, true);
+               primary_clock->set (pos);
        }
 
        if (Config->get_secondary_clock_delta_edit_cursor()) {
-               secondary_clock.set (pos, false, editor->get_preferred_edit_position(), 2);
+               secondary_clock->set (pos, false, editor->get_preferred_edit_position());
        } else {
-               secondary_clock.set (pos);
+               secondary_clock->set (pos);
        }
 
        if (big_clock_window->get()) {
-               big_clock.set (pos);
+               big_clock->set (pos);
        }
 }
 
@@ -3486,10 +3423,10 @@ ARDOUR_UI::step_edit_status_change (bool yn)
        // we make insensitive
 
        if (yn) {
-               rec_button.set_visual_state (3);
+               rec_button.set_active_state (Gtkmm2ext::ImplicitActive);
                rec_button.set_sensitive (false);
        } else {
-               rec_button.set_visual_state (0);
+               rec_button.unset_active_state ();;
                rec_button.set_sensitive (true);
        }
 }
@@ -3504,13 +3441,10 @@ ARDOUR_UI::record_state_changed ()
                return;
        }
 
-       Session::RecordState const r = _session->record_status ();
-       bool const h = _session->have_rec_enabled_track ();
-
-       if (r == Session::Recording && h)  {
-               big_clock.set_widget_name ("BigClockRecording");
+       if (_session->record_status () == Session::Recording && _session->have_rec_enabled_track ()) {
+               big_clock->set_active (true);
        } else {
-               big_clock.set_widget_name ("BigClockNonRecording");
+               big_clock->set_active (false);
        }
 }
 
@@ -3535,15 +3469,19 @@ ARDOUR_UI::store_clock_modes ()
        XMLNode* node = new XMLNode(X_("ClockModes"));
 
        for (vector<AudioClock*>::iterator x = AudioClock::clocks.begin(); x != AudioClock::clocks.end(); ++x) {
-               node->add_property ((*x)->name().c_str(), enum_2_string ((*x)->mode()));
+               XMLNode* child = new XMLNode (X_("Clock"));
+               
+               child->add_property (X_("name"), (*x)->name());
+               child->add_property (X_("mode"), enum_2_string ((*x)->mode()));
+               child->add_property (X_("on"), ((*x)->off() ? X_("no") : X_("yes")));
+
+               node->add_child_nocopy (*child);
        }
 
        _session->add_extra_xml (*node);
        _session->set_dirty ();
 }
 
-
-
 ARDOUR_UI::TransportControllable::TransportControllable (std::string name, ARDOUR_UI& u, ToggleType tp)
        : Controllable (name), ui (u), type(tp)
 {
@@ -3553,23 +3491,6 @@ ARDOUR_UI::TransportControllable::TransportControllable (std::string name, ARDOU
 void
 ARDOUR_UI::TransportControllable::set_value (double val)
 {
-       if (type == ShuttleControl) {
-               double fract;
-
-               if (val == 0.5) {
-                       fract = 0.0;
-               } else {
-                       if (val < 0.5) {
-                               fract = -((0.5 - val)/0.5);
-                       } else {
-                               fract = ((val - 0.5)/0.5);
-                       }
-               }
-
-               ui.set_shuttle_fract (fract);
-               return;
-       }
-
        if (val < 0.5) {
                /* do nothing: these are radio-style actions */
                return;
@@ -3634,8 +3555,6 @@ ARDOUR_UI::TransportControllable::get_value (void) const
                break;
        case RecordEnable:
                break;
-       case ShuttleControl:
-               break;
        default:
                break;
        }
@@ -3643,20 +3562,13 @@ ARDOUR_UI::TransportControllable::get_value (void) const
        return val;
 }
 
-void
-ARDOUR_UI::TransportControllable::set_id (const string& str)
-{
-       _id = str;
-}
-
 void
 ARDOUR_UI::setup_profile ()
 {
-       if (gdk_screen_width() < 1200) {
+       if (gdk_screen_width() < 1200 || getenv ("ARDOUR_NARROW_SCREEN")) {
                Profile->set_small_screen ();
        }
 
-
        if (getenv ("ARDOUR_SAE")) {
                Profile->set_sae ();
                Profile->set_single_package ();
@@ -3667,25 +3579,25 @@ void
 ARDOUR_UI::toggle_translations ()
 {
        using namespace Glib;
-        
+
        RefPtr<Action> act = ActionManager::get_action (X_("Main"), X_("EnableTranslation"));
        if (act) {
                RefPtr<ToggleAction> ract = RefPtr<ToggleAction>::cast_dynamic (act);
                if (ract) {
-                        
+
                        string i18n_killer = ARDOUR::translation_kill_path();
-                        
+
                        bool already_enabled = !ARDOUR::translations_are_disabled ();
-                        
+
                        if (ract->get_active ()) {
-/* we don't care about errors */
+                               /* we don't care about errors */
                                int fd = ::open (i18n_killer.c_str(), O_RDONLY|O_CREAT, 0644);
                                close (fd);
                        } else {
-/* we don't care about errors */
+                               /* we don't care about errors */
                                unlink (i18n_killer.c_str());
                        }
-                        
+
                        if (already_enabled != ract->get_active()) {
                                MessageDialog win (already_enabled ? _("Translations disabled") : _("Translations enabled"),
                                                   false,
@@ -3698,7 +3610,7 @@ ARDOUR_UI::toggle_translations ()
                        }
                }
        }
-}        
+}
 
 /** Add a window proxy to our list, so that its state will be saved.
  *  This call also causes the window to be created and opened if its
@@ -3744,7 +3656,7 @@ ARDOUR_UI::missing_file (Session*s, std::string str, DataType type)
 }
 
 int
-ARDOUR_UI::ambiguous_file (std::string file, std::string path, std::vector<std::string> hits)
+ARDOUR_UI::ambiguous_file (std::string file, std::string /*path*/, std::vector<std::string> hits)
 {
        AmbiguousFileDialog dialog (file, hits);
 
@@ -3754,3 +3666,37 @@ ARDOUR_UI::ambiguous_file (std::string file, std::string path, std::vector<std::
        dialog.run ();
        return dialog.get_which ();
 }
+
+/** Allocate our thread-local buffers */
+void
+ARDOUR_UI::get_process_buffers ()
+{
+       _process_thread->get_buffers ();
+}
+
+/** Drop our thread-local buffers */
+void
+ARDOUR_UI::drop_process_buffers ()
+{
+       _process_thread->drop_buffers ();
+}
+
+void
+ARDOUR_UI::feedback_detected ()
+{
+       _feedback_exists = true;
+}
+
+void
+ARDOUR_UI::successful_graph_sort ()
+{
+       _feedback_exists = false;
+}
+
+void
+ARDOUR_UI::midi_panic ()
+{
+       if (_session) {
+               _session->midi_panic();
+       }
+}