initial pass at session-renaming functionality
[ardour.git] / gtk2_ardour / ardour_ui.cc
index dd6da1e24657c54e5cfa8eded95bbd717bc00291..9e34ac0641e30a9234604225565d1dd7d8a4ce99 100644 (file)
 
 */
 
-#define __STDC_FORMAT_MACROS 1
+#ifdef WAF_BUILD
+#include "gtk2ardour-config.h"
+#endif
+
 #include <stdint.h>
 
 #include <algorithm>
@@ -45,6 +48,8 @@
 #include "pbd/openuri.h"
 #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"
 
 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 "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 "i18n.h"
 
@@ -112,60 +126,57 @@ UIConfiguration *ARDOUR_UI::ui_config = 0;
 sigc::signal<void,bool> ARDOUR_UI::Blink;
 sigc::signal<void>      ARDOUR_UI::RapidScreenUpdate;
 sigc::signal<void>      ARDOUR_UI::SuperRapidScreenUpdate;
-sigc::signal<void,nframes_t, bool, nframes_t> ARDOUR_UI::Clock;
+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),
+       : 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),
+       , gui_object_state (new GUIObjectState)
+       , primary_clock (new AudioClock (X_("primary"), false, X_("TransportClockDisplay"), true, true, false, true))
+       , secondary_clock (new AudioClock (X_("secondary"), false, X_("SecondaryClockDisplay"), true, true, false, true))
+       , preroll_clock (new AudioClock (X_("preroll"), false, X_("PreRollClock"), true, false, true))
+       , postroll_clock (new AudioClock (X_("postroll"), false, X_("PostRollClock"), true, false, true))
 
          /* preroll stuff */
 
-         preroll_button (_("pre\nroll")),
-         postroll_button (_("post\nroll")),
+       , preroll_button (_("pre\nroll"))
+       , postroll_button (_("post\nroll"))
 
          /* big clock */
 
-         big_clock (X_("bigclock"), false, "BigClockNonRecording", true, true, false, false),
+       , big_clock (new AudioClock (X_("bigclock"), false, "BigClockNonRecording", 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")),
-         shown_flag (false),
-         error_log_button (_("Errors"))
+       , 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))
+
+       , 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)
+
+       , 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;
@@ -193,6 +204,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;
@@ -206,6 +219,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
        _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;
@@ -213,12 +227,10 @@ 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;
-       _mixer_on_top = false;
-        original_big_clock_width = -1;
-        original_big_clock_height = -1;
-        original_big_clock_font_size = 0;
+       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);
@@ -227,19 +239,9 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
        auto_loop_button.unset_flags (Gtk::CAN_FOCUS);
        play_selection_button.unset_flags (Gtk::CAN_FOCUS);
        rec_button.unset_flags (Gtk::CAN_FOCUS);
-
+       join_play_range_button.unset_flags (Gtk::CAN_FOCUS);
        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());
@@ -256,6 +258,18 @@ 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 ());
+
+       /* handle requests to deal with missing files */
+
+       ARDOUR::Session::MissingFile.connect_same_thread (forever_connections, boost::bind (&ARDOUR_UI::missing_file, this, _1, _2, _3));
+
+       /* and ambiguous files */
+
+       ARDOUR::FileSource::AmbiguousFileName.connect_same_thread (forever_connections, boost::bind (&ARDOUR_UI::ambiguous_file, this, _1, _2, _3));
+
        /* lets get this party started */
 
        try {
@@ -286,14 +300,35 @@ 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 ();
+       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()),
+                       Config->extra_xml (X_("UI")),
+                       string_compose ("toggle-%1-connection-manager", (*i).to_string())
+                       );
+       }
+
+       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 ();
 }
 
 /** @return true if a session was chosen and `apply' clicked, otherwise false if `cancel' was clicked */
@@ -304,15 +339,15 @@ ARDOUR_UI::run_startup (bool should_be_new, string load_template)
        _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 );
-        }
+       if (!load_template.empty()) {
+               _startup->set_load_template( load_template );
+       }
        _startup->present ();
 
        main().run();
@@ -352,7 +387,7 @@ ARDOUR_UI::create_engine ()
 
        engine->Halted.connect_same_thread (forever_connections, boost::bind (&ARDOUR_UI::engine_halted, this, _1, false));
 
-        ARDOUR::Port::set_connecting_blocked (ARDOUR_COMMAND_LINE::no_connect_ports);
+       ARDOUR::Port::set_connecting_blocked (ARDOUR_COMMAND_LINE::no_connect_ports);
 
        post_engine ();
 
@@ -373,7 +408,7 @@ ARDOUR_UI::post_engine ()
        if (setup_windows ()) {
                throw failed_constructor ();
        }
-       
+
        check_memory_locking();
 
        /* this is the first point at which all the keybindings are available */
@@ -381,10 +416,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;
@@ -405,11 +441,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 */
@@ -472,7 +508,7 @@ ARDOUR_UI::configure_timeout ()
                return true;
        } else {
                have_configure_timeout = false;
-                cerr << "config event-driven save\n";
+               cerr << "config event-driven save\n";
                save_ardour_state ();
                return false;
        }
@@ -518,8 +554,9 @@ 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());
        }
+
 }
 
 XMLNode&
@@ -542,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;
@@ -560,13 +597,13 @@ ARDOUR_UI::autosave_session ()
                return 1;
        }
 
-        if (!Config->get_periodic_safety_backups()) {
-                return 1;
+       if (!Config->get_periodic_safety_backups()) {
+               return 1;
        }
 
-        if (_session) {
-                _session->maybe_write_autosave();
-        }
+       if (_session) {
+               _session->maybe_write_autosave();
+       }
 
        return 1;
 }
@@ -647,11 +684,17 @@ Please consider the possibilities, and perhaps (re)start JACK."));
 void
 ARDOUR_UI::startup ()
 {
+       Application* app = Application::instance ();
+
+       app->ShouldQuit.connect (sigc::mem_fun (*this, &ARDOUR_UI::queue_finish));
+       app->ShouldLoad.connect (sigc::mem_fun (*this, &ARDOUR_UI::idle_load));
 
 #ifdef PHONE_HOME
-        call_the_mothership (VERSIONSTRING);
+       call_the_mothership (VERSIONSTRING);
 #endif
 
+       app->ready ();
+
        if (get_session_parameters (true, ARDOUR_COMMAND_LINE::new_session, ARDOUR_COMMAND_LINE::load_template)) {
                exit (1);
        }
@@ -660,8 +703,16 @@ ARDOUR_UI::startup ()
 
        goto_editor_window ();
 
+       /* Add the window proxies here; their addition may cause windows to be opened, and we want them
+          to be opened on top of the editor window that goto_editor_window() just opened.
+       */
+       add_window_proxy (location_ui);
+       add_window_proxy (big_clock_window);
+       for (ARDOUR::DataType::iterator i = ARDOUR::DataType::begin(); i != ARDOUR::DataType::end(); ++i) {
+               add_window_proxy (_global_port_matrix[*i]);
+       }
+
        BootMessage (string_compose (_("%1 is ready for use"), PROGRAM_NAME));
-       show ();
 }
 
 void
@@ -701,14 +752,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());
 
-                               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());
-                                                   
                                VBox* vbox = msg.get_vbox();
                                HBox hbox;
                                CheckButton cb (_("Do not show this window again"));
@@ -749,7 +801,7 @@ void
 ARDOUR_UI::finish()
 {
        if (_session) {
-                int tries = 0;
+               int tries = 0;
 
                if (_session->transport_rolling() && (++tries < 8)) {
                        _session->request_stop (false, true);
@@ -757,7 +809,11 @@ ARDOUR_UI::finish()
                }
 
                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;
@@ -784,24 +840,29 @@ If you still wish to quit, please use the\n\n\
                point_one_second_connection.disconnect ();
                point_oh_five_second_connection.disconnect ();
                point_zero_one_second_connection.disconnect();
-               
-                _session->set_clean ();
+       }
+
+       /* Save state before deleting the session, as that causes some
+          windows to be destroyed before their visible state can be
+          saved.
+       */
+       save_ardour_state ();
+
+       if (_session) {
                // _session->set_deletion_in_progress ();
+               _session->set_clean ();
                _session->remove_pending_capture_state ();
                delete _session;
                _session = 0;
        }
 
-        cerr << "Save before quit\n";
-       save_ardour_state ();
-
        ArdourDialog::close_all_dialogs ();
        engine->stop (true);
        quit ();
 }
 
 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
@@ -810,12 +871,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);
 
@@ -823,15 +883,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"));
@@ -883,7 +942,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;
 }
@@ -898,7 +957,7 @@ ARDOUR_UI::every_point_zero_one_seconds ()
 }
 
 void
-ARDOUR_UI::update_sample_rate (nframes_t)
+ARDOUR_UI::update_sample_rate (framecnt_t)
 {
        char buf[32];
 
@@ -910,14 +969,14 @@ ARDOUR_UI::update_sample_rate (nframes_t)
 
        } else {
 
-               nframes_t rate = engine->frame_rate();
+               framecnt_t rate = engine->frame_rate();
 
                if (fmod (rate, 1000.0) != 0.0) {
                        snprintf (buf, sizeof (buf), _("%.1f kHz / %4.1f ms"),
                                  (float) rate/1000.0f,
                                  (engine->frames_per_cycle() / (float) rate) * 1000.0f);
                } else {
-                       snprintf (buf, sizeof (buf), _("%u kHz / %4.1f ms"),
+                       snprintf (buf, sizeof (buf), _("%" PRId64 " kHz / %4.1f ms"),
                                  rate/1000,
                                  (engine->frames_per_cycle() / (float) rate) * 1000.0f);
                }
@@ -926,6 +985,57 @@ ARDOUR_UI::update_sample_rate (nframes_t)
        sample_rate_label.set_text (buf);
 }
 
+void
+ARDOUR_UI::update_format ()
+{
+       if (!_session) {
+               format_label.set_text ("");
+               return;
+       }
+
+       stringstream s;
+
+       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;
+       }
+
+       format_label.set_text (s.str ());
+}
+
 void
 ARDOUR_UI::update_cpu_load ()
 {
@@ -938,12 +1048,8 @@ void
 ARDOUR_UI::update_buffer_load ()
 {
        char buf[64];
-       uint32_t c, p;
 
        if (_session) {
-               c = _session->capture_load ();
-               p = _session->playback_load ();
-
                snprintf (buf, sizeof (buf), _("Buffers p:%" PRIu32 "%% c:%" PRIu32 "%%"),
                          _session->playback_load(), _session->capture_load());
                buffer_load_label.set_text (buf);
@@ -968,11 +1074,11 @@ ARDOUR_UI::update_disk_space()
                return;
        }
 
-       nframes_t frames = _session->available_capture_duration();
+       framecnt_t frames = _session->available_capture_duration();
        char buf[64];
-       nframes_t fr = _session->frame_rate();
+       framecnt_t fr = _session->frame_rate();
 
-       if (frames == max_frames) {
+       if (frames == max_framecnt) {
                strcpy (buf, _("Disk: 24hrs+"));
        } else {
                rec_enabled_streams = 0;
@@ -1051,7 +1157,7 @@ ARDOUR_UI::redisplay_recent_sessions ()
        sort (rs.begin(), rs.end(), cmp);
 
        for (ARDOUR::RecentSessions::iterator i = rs.begin(); i != rs.end(); ++i) {
-               session_directories.push_back ((*i).second);
+               session_directories.push_back ((*i).second);
        }
 
        for (vector<sys::path>::const_iterator i = session_directories.begin();
@@ -1189,8 +1295,8 @@ ARDOUR_UI::open_recent_session ()
                        return;
                }
 
-               Glib::ustring path = (*i)[recent_session_columns.fullpath];
-               Glib::ustring state = (*i)[recent_session_columns.visible_name];
+               std::string path = (*i)[recent_session_columns.fullpath];
+               std::string state = (*i)[recent_session_columns.visible_name];
 
                _session_is_new = false;
 
@@ -1207,9 +1313,10 @@ 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));
+                       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.run ();
                        return false;
@@ -1272,7 +1379,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, string const & name_template)
 {
        list<boost::shared_ptr<MidiTrack> > tracks;
 
@@ -1284,7 +1391,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 (ARDOUR::Normal, route_group, how_many, name_template);
 
                        if (tracks.size() != how_many) {
                                if (how_many == 1) {
@@ -1312,7 +1419,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;
@@ -1324,7 +1439,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) {
@@ -1337,7 +1452,7 @@ 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) {
@@ -1361,9 +1476,9 @@ restart JACK with more ports."), PROGRAM_NAME));
 }
 
 void
-ARDOUR_UI::do_transport_locate (nframes_t new_position)
+ARDOUR_UI::do_transport_locate (framepos_t new_position, bool with_roll)
 {
-       nframes_t _preroll = 0;
+       framecnt_t _preroll = 0;
 
        if (_session) {
                // XXX CONFIG_CHANGE FIX - requires AnyTime handling
@@ -1375,7 +1490,7 @@ ARDOUR_UI::do_transport_locate (nframes_t new_position)
                        new_position = 0;
                }
 
-               _session->request_locate (new_position);
+               _session->request_locate (new_position, with_roll);
        }
 }
 
@@ -1418,7 +1533,7 @@ ARDOUR_UI::transport_goto_wallclock ()
 
                time_t now;
                struct tm tmnow;
-               nframes64_t frames;
+               framepos_t frames;
 
                time (&now);
                localtime_r (&now, &tmnow);
@@ -1427,7 +1542,7 @@ ARDOUR_UI::transport_goto_wallclock ()
                frames += tmnow.tm_min * (60 * _session->frame_rate());
                frames += tmnow.tm_sec * _session->frame_rate();
 
-               _session->request_locate (frames);
+               _session->request_locate (frames, _session->transport_rolling ());
 
                /* force displayed area in editor to start no matter
                   what "follow playhead" setting is.
@@ -1443,7 +1558,7 @@ void
 ARDOUR_UI::transport_goto_end ()
 {
        if (_session) {
-               nframes_t const frame = _session->current_end_frame();
+               framepos_t const frame = _session->current_end_frame();
                _session->request_locate (frame);
 
                /* force displayed area in editor to start no matter
@@ -1519,7 +1634,7 @@ ARDOUR_UI::transport_record (bool roll)
        //cerr << "ARDOUR_UI::transport_record () called roll = " << roll << " _session->record_status() = " << _session->record_status() << endl;
 }
 
-void 
+void
 ARDOUR_UI::transport_roll ()
 {
        if (!_session) {
@@ -1529,7 +1644,8 @@ ARDOUR_UI::transport_roll ()
        if (_session->is_auditioning()) {
                return;
        }
-       
+
+#if 0
        if (_session->config.get_external_sync()) {
                switch (_session->config.get_sync_source()) {
                case JACK:
@@ -1539,6 +1655,7 @@ ARDOUR_UI::transport_roll ()
                        return;
                }
        }
+#endif
 
        bool rolling = _session->transport_rolling();
 
@@ -1546,9 +1663,9 @@ ARDOUR_UI::transport_roll ()
                /* XXX it is not possible to just leave seamless loop and keep
                   playing at present (nov 4th 2009)
                */
-                if (!Config->get_seamless_loop()) {
-                        _session->request_play_loop (false, true);
-                }
+               if (!Config->get_seamless_loop()) {
+                       _session->request_play_loop (false, true);
+               }
        } else if (_session->get_play_range () && !join_play_range_button.get_active()) {
                /* stop playing a range if we currently are */
                _session->request_play_range (0, true);
@@ -1566,7 +1683,7 @@ ARDOUR_UI::transport_roll ()
 void
 ARDOUR_UI::toggle_roll (bool with_abort, bool roll_out_of_bounded_mode)
 {
-       
+
        if (!_session) {
                return;
        }
@@ -1593,7 +1710,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.
                                */
@@ -1605,9 +1722,9 @@ ARDOUR_UI::toggle_roll (bool with_abort, bool roll_out_of_bounded_mode)
                        _session->request_play_loop (false, true);
                } else if (_session->get_play_range ()) {
                        affect_transport = false;
-                        _session->request_play_range (0, true);
-               } 
-       } 
+                       _session->request_play_range (0, true);
+               }
+       }
 
        if (affect_transport) {
                if (rolling) {
@@ -1616,7 +1733,7 @@ ARDOUR_UI::toggle_roll (bool with_abort, bool roll_out_of_bounded_mode)
                        if (join_play_range_button.get_active()) {
                                _session->request_play_range (&editor->get_selection().time, true);
                        }
-                       
+
                        _session->request_transport_speed (1.0f);
                }
        }
@@ -1625,21 +1742,30 @@ 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);
-                       }
-               } else {
+       if (!_session) {
+               return;
+       }
+
+       if (_session->get_play_loop()) {
+
+               if (_session->transport_rolling()) {
+
                        Location * looploc = _session->locations()->auto_loop_location();
+
                        if (looploc) {
-                               _session->request_play_loop (true);
+                               _session->request_locate (looploc->start(), true);
+                               _session->request_play_loop (false);
                        }
+
+               } else {
+                       _session->request_play_loop (false);
+               }
+       } else {
+
+         Location * looploc = _session->locations()->auto_loop_location();
+
+               if (looploc) {
+                       _session->request_play_loop (true);
                }
        }
 }
@@ -1734,8 +1860,6 @@ ARDOUR_UI::toggle_record_enable (uint32_t rid)
 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);
@@ -1744,18 +1868,11 @@ ARDOUR_UI::map_transport_state ()
                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 */
 
@@ -1766,13 +1883,13 @@ ARDOUR_UI::map_transport_state ()
                        auto_loop_button.set_visual_state (0);
 
                } else if (_session->get_play_loop ()) {
-                       
+
                        auto_loop_button.set_visual_state (1);
                        play_selection_button.set_visual_state (0);
                        roll_button.set_visual_state (0);
 
                } else {
-                       
+
                        roll_button.set_visual_state (1);
                        play_selection_button.set_visual_state (0);
                        auto_loop_button.set_visual_state (0);
@@ -1792,6 +1909,7 @@ ARDOUR_UI::map_transport_state ()
                roll_button.set_visual_state (0);
                play_selection_button.set_visual_state (0);
                auto_loop_button.set_visual_state (0);
+               update_disk_space ();
        }
 }
 
@@ -1857,22 +1975,22 @@ ARDOUR_UI::engine_running ()
 void
 ARDOUR_UI::engine_halted (const char* reason, bool free_reason)
 {
-       if (!Gtkmm2ext::UI::instance()->caller_is_ui_thread()) {
-               /* we can't rely on the original string continuing to exist when we are called
-                  again in the GUI thread, so make a copy and note that we need to
-                  free it later.
-               */
-               char *copy = strdup (reason);
-               Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&ARDOUR_UI::engine_halted, this, copy, true));
-               return;
-       }
+       if (!Gtkmm2ext::UI::instance()->caller_is_ui_thread()) {
+               /* we can't rely on the original string continuing to exist when we are called
+                  again in the GUI thread, so make a copy and note that we need to
+                  free it later.
+               */
+               char *copy = strdup (reason);
+               Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&ARDOUR_UI::engine_halted, this, copy, true));
+               return;
+       }
 
        ActionManager::set_sensitive (ActionManager::jack_sensitive_actions, false);
        ActionManager::set_sensitive (ActionManager::jack_opposite_sensitive_actions, true);
 
        update_sample_rate (0);
 
-        string msgstr;
+       string msgstr;
 
        /* if the reason is a non-empty string, it means that the backend was shutdown
           rather than just Ardour.
@@ -1892,9 +2010,9 @@ JACK, reconnect and save the session."), PROGRAM_NAME);
        pop_back_splash ();
        msg.run ();
 
-        if (free_reason) {
-                free ((char*) reason);
-        }
+       if (free_reason) {
+               free ((char*) reason);
+       }
 }
 
 int32_t
@@ -2002,19 +2120,18 @@ 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);
-                prompter.set_initial_text (timebuf);
-        }
+       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);
+               prompter.set_initial_text (timebuf);
+       }
 
   again:
        switch (prompter.run()) {
@@ -2024,20 +2141,20 @@ 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"));
-                                msg.run ();
-                                goto again;
-                        }
-                }
+               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"));
+                               msg.run ();
+                               goto again;
+                       }
+               }
 
                vector<sys::path> p;
                get_state_files_in_directory (_session->session_directory().root_path(), p);
@@ -2067,9 +2184,88 @@ ARDOUR_UI::snapshot_session (bool switch_to_it)
        }
 }
 
+/** Ask the user for the name of a new shapshot and then take 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) {
+                       if (name.find ('/') != string::npos) {
+                               MessageDialog msg (_("To ensure compatibility with various systems\n"
+                                                    "session names may not contain a '/' character"));
+                               msg.run ();
+                               goto again;
+                       }
+                       if (name.find ('\\') != string::npos) {
+                               MessageDialog msg (_("To ensure compatibility with various systems\n"
+                                                    "session names may not contain a '\\' character"));
+                               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)
 {
+       XMLNode* node = new XMLNode (X_("UI"));
+
+       for (list<WindowProxyBase*>::iterator i = _window_proxies.begin(); i != _window_proxies.end(); ++i) {
+               if (!(*i)->rc_configured()) {
+                       node->add_child_nocopy (*((*i)->get_state ()));
+               }
+       }
+
+       node->add_child_nocopy (gui_object_state->get_state());
+
+       _session->add_extra_xml (*node);
+
        save_state_canfail (name, switch_to_it);
 }
 
@@ -2087,7 +2283,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;
 }
@@ -2096,7 +2292,7 @@ void
 ARDOUR_UI::primary_clock_value_changed ()
 {
        if (_session) {
-               _session->request_locate (primary_clock.current_time ());
+               _session->request_locate (primary_clock->current_time ());
        }
 }
 
@@ -2104,7 +2300,7 @@ void
 ARDOUR_UI::big_clock_value_changed ()
 {
        if (_session) {
-               _session->request_locate (big_clock.current_time ());
+               _session->request_locate (big_clock->current_time ());
        }
 }
 
@@ -2112,7 +2308,7 @@ void
 ARDOUR_UI::secondary_clock_value_changed ()
 {
        if (_session) {
-               _session->request_locate (secondary_clock.current_time ());
+               _session->request_locate (secondary_clock->current_time ());
        }
 }
 
@@ -2123,9 +2319,9 @@ ARDOUR_UI::transport_rec_enable_blink (bool onoff)
                return;
        }
 
-        if (_session->step_editing()) {
-                return;
-        }
+       if (_session->step_editing()) {
+               return;
+       }
 
        Session::RecordState const r = _session->record_status ();
        bool const h = _session->have_rec_enabled_track ();
@@ -2154,8 +2350,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);
 
@@ -2191,106 +2387,10 @@ 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.
-       */
-
-       Glib::ustring fontconfig = Glib::build_filename (Glib::get_home_dir(), ".fontconfig");
-
-       if (!Glib::file_test (fontconfig, Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_DIR)) {
-               MessageDialog msg (*_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 Glib::ustring& cmdline_path, Glib::ustring& session_name, Glib::ustring& 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 Glib::ustring& session_name, const Glib::ustring& 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)) {
-
-               Glib::ustring predicted_session_file;
-
-               predicted_session_file = session_path;
-               predicted_session_file += '/';
-               predicted_session_file += session_name;
-               predicted_session_file += ARDOUR::statefile_suffix;
-
-               if (Glib::file_test (predicted_session_file, Glib::FILE_TEST_EXISTS)) {
-                       existing_session = true;
-               }
-
-       } else if (Glib::file_test (session_path, Glib::FILE_TEST_EXISTS)) {
-
-               if (session_path.find (ARDOUR::statefile_suffix) == session_path.length() - 7) {
-                       /* existing .ardour file */
-                       existing_session = true;
-               }
-
-       } 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 Glib::ustring& session_path)
+ARDOUR_UI::ask_about_loading_existing_session (const std::string& session_path)
 {
-       Glib::ustring str = string_compose (_("This session\n%1\nalready exists. Do you want to open it?"), session_path);
+       std::string str = string_compose (_("This session\n%1\nalready exists. Do you want to open it?"), session_path);
 
        MessageDialog msg (str,
                           false,
@@ -2314,9 +2414,9 @@ ARDOUR_UI::ask_about_loading_existing_session (const Glib::ustring& session_path
 }
 
 int
-ARDOUR_UI::build_session_from_nsd (const Glib::ustring& session_path, const Glib::ustring& session_name)
+ARDOUR_UI::build_session_from_nsd (const std::string& session_path, const std::string& session_name)
 {
-        BusProfile bus_profile;
+       BusProfile bus_profile;
 
        if (Profile->get_sae()) {
 
@@ -2343,7 +2443,7 @@ ARDOUR_UI::build_session_from_nsd (const Glib::ustring& session_path, const Glib
                }
 
                /// @todo some minor tweaks.
-                
+
                bus_profile.output_ac = AutoConnectOption (0);
 
                if (_startup->connect_outputs ()) {
@@ -2366,7 +2466,7 @@ ARDOUR_UI::build_session_from_nsd (const Glib::ustring& session_path, const Glib
 }
 
 void
-ARDOUR_UI::idle_load (const Glib::ustring& path)
+ARDOUR_UI::idle_load (const std::string& path)
 {
        if (_session) {
                if (Glib::file_test (path, Glib::FILE_TEST_IS_DIR)) {
@@ -2418,16 +2518,16 @@ ARDOUR_UI::loading_message (const std::string& /*msg*/)
 int
 ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new, string load_template)
 {
-       Glib::ustring session_name;
-       Glib::ustring session_path;
-       Glib::ustring template_name;
+       string session_name;
+       string session_path;
+       string template_name;
        int ret = -1;
        bool likely_new = false;
 
-        if (! load_template.empty()) {
-            should_be_new = true;
-            template_name = load_template;
-        }
+       if (!load_template.empty()) {
+               should_be_new = true;
+               template_name = load_template;
+       }
 
        while (ret != 0) {
 
@@ -2438,17 +2538,21 @@ 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);
+
                        if (!apply) {
                                if (quit_on_cancel) {
                                        exit (1);
@@ -2466,27 +2570,46 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new, stri
                        /* this shouldn't happen, but we catch it just in case it does */
 
                        if (session_name.empty()) {
-                               break;
+                               continue;
                        }
+
                        if (_startup->use_session_template()) {
                                template_name = _startup->session_template_name();
                                _session_is_new = true;
                        }
 
-                       if (session_name[0] == '/' ||
-                           (session_name.length() > 2 && session_name[0] == '.' && session_name[1] == '/') ||
-                           (session_name.length() > 3 && session_name[0] == '.' && session_name[1] == '.' && session_name[2] == '/')) {
+                       if (session_name[0] == G_DIR_SEPARATOR ||
+                           (session_name.length() > 2 && session_name[0] == '.' && session_name[1] == G_DIR_SEPARATOR) ||
+                           (session_name.length() > 3 && session_name[0] == '.' && session_name[1] == '.' && session_name[2] == G_DIR_SEPARATOR)) {
+
+                               /* absolute path or cwd-relative path specified for session name: infer session folder
+                                  from what was given.
+                               */
 
-                                /* absolute path or cwd-relative path specified for session name: infer session folder
-                                   from what was given.
-                                */
-                                
                                session_path = Glib::path_get_dirname (session_name);
                                session_name = Glib::path_get_basename (session_name);
 
                        } else {
 
                                session_path = _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"));
+                                       msg.run ();
+                                       ARDOUR_COMMAND_LINE::session_name = ""; // cancel that
+                                       continue;
+                               }
                        }
                }
 
@@ -2498,7 +2621,7 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new, stri
 
                        if (likely_new) {
 
-                               Glib::ustring existing = Glib::build_filename (session_path, session_name);
+                               std::string existing = Glib::build_filename (session_path, session_name);
 
                                if (!ask_about_loading_existing_session (existing)) {
                                        ARDOUR_COMMAND_LINE::session_name = ""; // cancel that
@@ -2517,21 +2640,23 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new, stri
                                continue;
                        }
 
-                        if (session_name.find ('/') != Glib::ustring::npos) {
-                                MessageDialog msg (*_startup, _("To ensure compatibility with various systems\n"
-                                                                          "session names may not contain a '/' character"));
-                                msg.run ();
+                       if (session_name.find ('/') != std::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;
-                        }
+                               continue;
+                       }
 
-                        if (session_name.find ('\\') != Glib::ustring::npos) {
-                                MessageDialog msg (*_startup, _("To ensure compatibility with various systems\n"
-                                                                          "session names may not contain a '\\' character"));
-                                msg.run ();
+                       if (session_name.find ('\\') != std::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;
-                        }
+                               continue;
+                       }
 
                        _session_is_new = true;
                }
@@ -2543,6 +2668,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);
@@ -2561,8 +2692,8 @@ ARDOUR_UI::close_session()
        }
 
        if (unload_session (true)) {
-                return;
-        }
+               return;
+       }
 
        ARDOUR_COMMAND_LINE::session_name = "";
 
@@ -2571,11 +2702,13 @@ ARDOUR_UI::close_session()
        }
 
        goto_editor_window ();
-       show ();
 }
 
+/** @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 Glib::ustring& path, const Glib::ustring& snap_name, Glib::ustring mix_template)
+ARDOUR_UI::load_session (const std::string& path, const std::string& snap_name, std::string mix_template)
 {
        Session *new_session;
        int unload_status;
@@ -2584,7 +2717,7 @@ ARDOUR_UI::load_session (const Glib::ustring& path, const Glib::ustring& snap_na
        session_loaded = false;
 
        if (!check_audioengine()) {
-               return -1;
+               return -2;
        }
 
        unload_status = unload_session ();
@@ -2596,7 +2729,7 @@ ARDOUR_UI::load_session (const Glib::ustring& path, const Glib::ustring& snap_na
                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);
@@ -2632,30 +2765,42 @@ ARDOUR_UI::load_session (const Glib::ustring& path, const Glib::ustring& snap_na
 
        catch (...) {
 
-               MessageDialog msg (string_compose(_("Session \"%1 (snapshot %2)\" did not load successfully"), path, snap_name),
-                                  true,
-                                  Gtk::MESSAGE_INFO,
-                                  Gtk::BUTTONS_CLOSE);
+               MessageDialog msg (string_compose(
+                                          _("Session \"%1 (snapshot %2)\" did not load successfully"),
+                                          path, snap_name),
+                                  true,
+                                  Gtk::MESSAGE_INFO,
+                                  BUTTONS_OK);
 
                msg.set_title (_("Loading Error"));
-               msg.set_secondary_text (_("Click the Close button to try again."));
+               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 ();
                msg.present ();
 
                int response = msg.run ();
 
-               msg.hide ();
-
                switch (response) {
-               case RESPONSE_CANCEL:
-                       exit (1);
-               default:
+               case 1:
                        break;
+               default:
+                       exit (1);
                }
+
+               msg.hide ();
+
                goto out;
        }
 
+       {
+               list<string> const u = new_session->unknown_processors ();
+               if (!u.empty()) {
+                       MissingPluginDialog d (_session, u);
+                       d.run ();
+               }
+       }
+
        /* Now the session been created, add the transport controls */
        new_session->add_controllable(roll_controllable);
        new_session->add_controllable(stop_controllable);
@@ -2683,7 +2828,7 @@ ARDOUR_UI::load_session (const Glib::ustring& path, const Glib::ustring& snap_na
 }
 
 int
-ARDOUR_UI::build_session (const Glib::ustring& path, const Glib::ustring& snap_name, BusProfile& bus_profile)
+ARDOUR_UI::build_session (const std::string& path, const std::string& snap_name, BusProfile& bus_profile)
 {
        Session *new_session;
        int x;
@@ -2716,6 +2861,25 @@ ARDOUR_UI::build_session (const Glib::ustring& path, const Glib::ustring& snap_n
                return -1;
        }
 
+       /* Give the new session the default GUI state, if such things exist */
+
+       XMLNode* n;
+       n = Config->instant_xml (X_("Editor"));
+       if (n) {
+               new_session->add_instant_xml (*n, false);
+       }
+       n = Config->instant_xml (X_("Mixer"));
+       if (n) {
+               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;
@@ -2725,27 +2889,13 @@ ARDOUR_UI::build_session (const Glib::ustring& path, const Glib::ustring& snap_n
        return 0;
 }
 
-void
-ARDOUR_UI::show ()
-{
-       if (editor) {
-               editor->show_window ();
-
-               if (!shown_flag) {
-                       editor->present ();
-               }
-
-               shown_flag = true;
-       }
-}
-
 void
 ARDOUR_UI::launch_chat ()
 {
 #ifdef __APPLE__
-        open_uri("http://webchat.freenode.net/?channels=ardour-osx");
+       open_uri("http://webchat.freenode.net/?channels=ardour-osx");
 #else
-        open_uri("http://webchat.freenode.net/?channels=ardour");
+       open_uri("http://webchat.freenode.net/?channels=ardour");
 #endif
 }
 
@@ -2757,7 +2907,7 @@ ARDOUR_UI::show_about ()
                about->signal_response().connect(sigc::mem_fun (*this, &ARDOUR_UI::about_signal_response) );
        }
 
-        about->set_transient_for(*editor);
+       about->set_transient_for(*editor);
        about->show_all ();
 }
 
@@ -2777,7 +2927,7 @@ void
 ARDOUR_UI::hide_about ()
 {
        if (about) {
-               about->get_window()->set_cursor ();
+               about->get_window()->set_cursor ();
                about->hide ();
        }
 }
@@ -2824,10 +2974,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)  );
+               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\
@@ -2844,8 +2995,8 @@ require some unused files to continue to exist."));
                    add (visible_name);
                    add (fullpath);
            }
-           Gtk::TreeModelColumn<Glib::ustring> visible_name;
-           Gtk::TreeModelColumn<Glib::ustring> fullpath;
+           Gtk::TreeModelColumn<std::string> visible_name;
+           Gtk::TreeModelColumn<std::string> fullpath;
        };
 
 
@@ -2871,32 +3022,36 @@ 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)
        */
 
        const char* bprefix;
-        double space_adjusted = 0;
+       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) {
+               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);
+               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));
        } 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));
        }
 
        dhbox.pack_start (*dimage, true, false, 5);
@@ -2945,18 +3100,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));
 
-       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"));
@@ -2990,20 +3146,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 Ardour,\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 Ardour,\n\n\
+Session -> Clean-up -> Flush Wastebasket\n\n\
+will release an additional\n\
 %3 %4bytes of disk space.\n"
                                         ));
 
@@ -3081,7 +3239,6 @@ ARDOUR_UI::add_route (Gtk::Window* float_window)
        uint32_t output_chan;
        string name_template = add_route_dialog->name_template ();
        bool track = add_route_dialog->track ();
-       bool aux = !track && add_route_dialog->aux();
        RouteGroup* route_group = add_route_dialog->route_group ();
 
        AutoConnectOption oac = Config->get_output_auto_connect();
@@ -3096,7 +3253,7 @@ ARDOUR_UI::add_route (Gtk::Window* float_window)
 
        if (add_route_dialog->type() == ARDOUR::DataType::MIDI) {
                if (track) {
-                       session_add_midi_track (route_group, count);
+                       session_add_midi_track (route_group, count, name_template);
                } else  {
                        MessageDialog msg (*editor,
                                        _("Sorry, MIDI Busses are not supported at this time."));
@@ -3105,9 +3262,9 @@ ARDOUR_UI::add_route (Gtk::Window* float_window)
                }
        } else {
                if (track) {
-                       session_add_audio_track (input_chan, output_chan, add_route_dialog->mode(), route_group, count);
+                       session_add_audio_track (input_chan, output_chan, add_route_dialog->mode(), route_group, count, name_template);
                } 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);
                }
        }
 }
@@ -3164,11 +3321,12 @@ ARDOUR_UI::keyboard_settings () const
        if (!node) {
                node = new XMLNode (X_("Keyboard"));
        }
+
        return node;
 }
 
 void
-ARDOUR_UI::create_xrun_marker(nframes_t where)
+ARDOUR_UI::create_xrun_marker (framepos_t where)
 {
        editor->mouse_add_new_marker (where, false, true);
 }
@@ -3182,7 +3340,7 @@ ARDOUR_UI::halt_on_xrun_message ()
 }
 
 void
-ARDOUR_UI::xrun_handler(nframes_t where)
+ARDOUR_UI::xrun_handler (framepos_t where)
 {
        if (!_session) {
                return;
@@ -3224,8 +3382,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\
@@ -3295,7 +3453,7 @@ what you would like to do.\n"));
 }
 
 int
-ARDOUR_UI::sr_mismatch_dialog (nframes_t desired, nframes_t actual)
+ARDOUR_UI::sr_mismatch_dialog (framecnt_t desired, framecnt_t actual)
 {
        HBox* hbox = new HBox();
        Image* image = new Image (Stock::DIALOG_QUESTION, ICON_SIZE_DIALOG);
@@ -3355,41 +3513,29 @@ ARDOUR_UI::reconnect_to_jack ()
 void
 ARDOUR_UI::use_config ()
 {
-
        XMLNode* node = Config->extra_xml (X_("TransportControllables"));
        if (node) {
                set_transport_controllable_state (*node);
        }
-
-       node = Config->extra_xml (X_("UI"));
-
-        if (node) {
-                const XMLProperty* prop = node->property (X_("show-big-clock"));
-                Glib::RefPtr<Action> act = ActionManager::get_action (X_("Common"), X_("ToggleBigClock"));
-                if (act) {
-                        Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
-                        tact->set_active (string_is_affirmative (prop->value()));
-                }
-        }
 }
 
 void
-ARDOUR_UI::update_transport_clocks (nframes_t pos)
+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(), 1);
        } else {
-               primary_clock.set (pos, 0, true);
+               primary_clock->set (pos, 0, true);
        }
 
        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(), 2);
        } else {
-               secondary_clock.set (pos);
+               secondary_clock->set (pos);
        }
 
-       if (big_clock_window) {
-               big_clock.set (pos);
+       if (big_clock_window->get()) {
+               big_clock->set (pos);
        }
 }
 
@@ -3397,16 +3543,16 @@ ARDOUR_UI::update_transport_clocks (nframes_t pos)
 void
 ARDOUR_UI::step_edit_status_change (bool yn)
 {
-        // XXX should really store pre-step edit status of things
-        // we make insensitive
+       // XXX should really store pre-step edit status of things
+       // we make insensitive
 
-        if (yn) {
-                rec_button.set_visual_state (3);
-                rec_button.set_sensitive (false);
-        } else {
-                rec_button.set_visual_state (0);
-                rec_button.set_sensitive (true);
-        }
+       if (yn) {
+               rec_button.set_visual_state (3);
+               rec_button.set_sensitive (false);
+       } else {
+               rec_button.set_visual_state (0);
+               rec_button.set_sensitive (true);
+       }
 }
 
 void
@@ -3414,7 +3560,7 @@ ARDOUR_UI::record_state_changed ()
 {
        ENSURE_GUI_THREAD (*this, &ARDOUR_UI::record_state_changed);
 
-       if (!_session || !big_clock_window) {
+       if (!_session || !big_clock_window->get()) {
                /* why bother - the clock isn't visible */
                return;
        }
@@ -3423,9 +3569,9 @@ ARDOUR_UI::record_state_changed ()
        bool const h = _session->have_rec_enabled_track ();
 
        if (r == Session::Recording && h)  {
-               big_clock.set_widget_name ("BigClockRecording");
+               big_clock->set_widget_name ("BigClockRecording");
        } else {
-               big_clock.set_widget_name ("BigClockNonRecording");
+               big_clock->set_widget_name ("BigClockNonRecording");
        }
 }
 
@@ -3450,15 +3596,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)
 {
@@ -3468,23 +3618,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;
@@ -3549,8 +3682,6 @@ ARDOUR_UI::TransportControllable::get_value (void) const
                break;
        case RecordEnable:
                break;
-       case ShuttleControl:
-               break;
        default:
                break;
        }
@@ -3581,36 +3712,91 @@ ARDOUR_UI::setup_profile ()
 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 ()) {
+       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 */
-                                int fd = ::open (i18n_killer.c_str(), O_RDONLY|O_CREAT, 0644);
-                                close (fd);
-                        } else {
+                               int fd = ::open (i18n_killer.c_str(), O_RDONLY|O_CREAT, 0644);
+                               close (fd);
+                       } else {
 /* 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,
-                                                   Gtk::MESSAGE_WARNING,
-                                                   Gtk::BUTTONS_OK);
-                                win.set_secondary_text (string_compose (_("You must restart %1 for this to take effect."), PROGRAM_NAME));
-                                win.set_position (Gtk::WIN_POS_CENTER);
-                                win.present ();
-                                win.run ();
-                        }
-                }
-        }
-}        
+                               unlink (i18n_killer.c_str());
+                       }
+
+                       if (already_enabled != ract->get_active()) {
+                               MessageDialog win (already_enabled ? _("Translations disabled") : _("Translations enabled"),
+                                                  false,
+                                                  Gtk::MESSAGE_WARNING,
+                                                  Gtk::BUTTONS_OK);
+                               win.set_secondary_text (string_compose (_("You must restart %1 for this to take effect."), PROGRAM_NAME));
+                               win.set_position (Gtk::WIN_POS_CENTER);
+                               win.present ();
+                               win.run ();
+                       }
+               }
+       }
+}
+
+/** 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
+ *  state was saved as `visible'.
+ */
+void
+ARDOUR_UI::add_window_proxy (WindowProxyBase* p)
+{
+       _window_proxies.push_back (p);
+       p->maybe_show ();
+}
+
+/** Remove a window proxy from our list.  Must be called if a WindowProxy
+ *  is deleted, to prevent hanging pointers.
+ */
+void
+ARDOUR_UI::remove_window_proxy (WindowProxyBase* p)
+{
+       _window_proxies.remove (p);
+}
+
+int
+ARDOUR_UI::missing_file (Session*s, std::string str, DataType type)
+{
+       MissingFileDialog dialog (s, str, type);
+
+       dialog.show ();
+       dialog.present ();
+
+       int result = dialog.run ();
+       dialog.hide ();
+
+       switch (result) {
+       case RESPONSE_OK:
+               break;
+       default:
+               return 1; // quit entire session load
+       }
+
+       result = dialog.get_action ();
+
+       return result;
+}
+
+int
+ARDOUR_UI::ambiguous_file (std::string file, std::string path, std::vector<std::string> hits)
+{
+       AmbiguousFileDialog dialog (file, hits);
+
+       dialog.show ();
+       dialog.present ();
+
+       dialog.run ();
+       return dialog.get_which ();
+}