2.X commits up to and including 7519
[ardour.git] / gtk2_ardour / ardour_ui.cc
index 28dd679f1052379ae7b5844af8ad720573a356a1..71644109c300f8511d677eec950f3ef1197d0cc8 100644 (file)
 #include "pbd/failed_constructor.h"
 #include "pbd/enumwriter.h"
 #include "pbd/memento_command.h"
+#include "pbd/openuri.h"
 #include "pbd/file_utils.h"
 
+#include "gtkmm2ext/application.h"
 #include "gtkmm2ext/gtk_ui.h"
 #include "gtkmm2ext/utils.h"
 #include "gtkmm2ext/click_box.h"
 #include "gtkmm2ext/fastmeter.h"
-#include "gtkmm2ext/stop_signal.h"
 #include "gtkmm2ext/popup.h"
 #include "gtkmm2ext/window_title.h"
 
 #include "midi++/manager.h"
 
 #include "ardour/ardour.h"
+#include "ardour/callback.h"
 #include "ardour/profile.h"
 #include "ardour/session_directory.h"
 #include "ardour/session_route.h"
@@ -96,6 +98,10 @@ typedef uint64_t microseconds_t;
 #include "startup.h"
 #include "engine_dialog.h"
 #include "processor_box.h"
+#include "time_axis_view_item.h"
+#include "window_proxy.h"
+#include "global_port_matrix.h"
+#include "location_ui.h"
 
 #include "i18n.h"
 
@@ -103,7 +109,6 @@ using namespace ARDOUR;
 using namespace PBD;
 using namespace Gtkmm2ext;
 using namespace Gtk;
-using namespace sigc;
 
 ARDOUR_UI *ARDOUR_UI::theArdourUI = 0;
 UIConfiguration *ARDOUR_UI::ui_config = 0;
@@ -115,7 +120,7 @@ sigc::signal<void,nframes_t, bool, nframes_t> ARDOUR_UI::Clock;
 
 ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
 
-       : Gtkmm2ext::UI (X_("Ardour"), argcp, argvp),
+       : 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),
@@ -129,7 +134,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
 
          /* big clock */
 
-         big_clock (X_("bigclock"), false, "BigClockNonRecording", true, true, false, true),
+         big_clock (X_("bigclock"), false, "BigClockNonRecording", true, true, false, false),
 
          /* transport */
 
@@ -163,7 +168,6 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
 
          auditioning_alert_button (_("AUDITION")),
          solo_alert_button (_("SOLO")),
-         shown_flag (false),
          error_log_button (_("Errors"))
 
 {
@@ -194,11 +198,12 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
 
        editor = 0;
        mixer = 0;
-       session = 0;
        editor = 0;
        engine = 0;
        _session_is_new = false;
        big_clock_window = 0;
+       big_clock_height = 0;
+       big_clock_resize_in_progress = false;
        session_selector_window = 0;
        last_key_press_time = 0;
        _will_create_new_session_automatically = false;
@@ -214,6 +219,9 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
        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;
 
        roll_button.unset_flags (Gtk::CAN_FOCUS);
        stop_button.unset_flags (Gtk::CAN_FOCUS);
@@ -236,20 +244,20 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
 
        last_shuttle_request = last_peak_grab = 0; //  get_microseconds();
 
-       ARDOUR::Diskstream::DiskOverrun.connect (mem_fun(*this, &ARDOUR_UI::disk_overrun_handler));
-       ARDOUR::Diskstream::DiskUnderrun.connect (mem_fun(*this, &ARDOUR_UI::disk_underrun_handler));
+       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 (mem_fun(*this, &ARDOUR_UI::session_dialog));
+       ARDOUR::Session::Dialog.connect (forever_connections, MISSING_INVALIDATOR, ui_bind (&ARDOUR_UI::session_dialog, this, _1), gui_context());
 
-       /* handle pending state with a dialog */
+       /* handle pending state with a dialog (PROBLEM: needs to return a value and thus cannot be x-thread) */
 
-       ARDOUR::Session::AskAboutPendingState.connect (mem_fun(*this, &ARDOUR_UI::pending_state_dialog));
+       ARDOUR::Session::AskAboutPendingState.connect_same_thread (forever_connections, boost::bind (&ARDOUR_UI::pending_state_dialog, this));
 
-       /* handle sr mismatch with a dialog */
+       /* handle sr mismatch with a dialog (PROBLEM: needs to return a value and thus cannot be x-thread) */
 
-       ARDOUR::Session::AskAboutSampleRateMismatch.connect (mem_fun(*this, &ARDOUR_UI::sr_mismatch_dialog));
+       ARDOUR::Session::AskAboutSampleRateMismatch.connect_same_thread (forever_connections, boost::bind (&ARDOUR_UI::sr_mismatch_dialog, this, _1, _2));
 
        /* lets get this party started */
 
@@ -267,14 +275,14 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
                SessionEvent::create_per_thread_pool ("GUI", 512);
 
        } catch (failed_constructor& err) {
-               error << _("could not initialize Ardour.") << endmsg;
+               error << string_compose (_("could not initialize %1."), PROGRAM_NAME) << endmsg;
                // pass it on up
                throw;
        }
 
        /* we like keyboards */
 
-       keyboard = new ArdourKeyboard;
+       keyboard = new ArdourKeyboard(*this);
 
        XMLNode* node = ARDOUR_UI::instance()->keyboard_settings();
        if (node) {
@@ -283,21 +291,46 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
 
        reset_dpi();
 
-       starting.connect (mem_fun(*this, &ARDOUR_UI::startup));
-       stopping.connect (mem_fun(*this, &ARDOUR_UI::shutdown));
+        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"));
+       
+       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 ();
+
+       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 */
 bool
-ARDOUR_UI::run_startup (bool should_be_new)
+ARDOUR_UI::run_startup (bool should_be_new, string load_template)
 {
-       if (_startup == 0) {
-               _startup = new ArdourStartup ();
+       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->present ();
 
        main().run();
@@ -324,17 +357,20 @@ ARDOUR_UI::create_engine ()
        loading_message (_("Starting audio engine"));
 
        try {
-               engine = new ARDOUR::AudioEngine (ARDOUR_COMMAND_LINE::jack_client_name);
+               engine = new ARDOUR::AudioEngine (ARDOUR_COMMAND_LINE::jack_client_name, ARDOUR_COMMAND_LINE::jack_session_uuid);
 
        } catch (...) {
 
                return -1;
        }
 
-       engine->Stopped.connect (mem_fun(*this, &ARDOUR_UI::engine_stopped));
-       engine->Running.connect (mem_fun(*this, &ARDOUR_UI::engine_running));
-       engine->Halted.connect (mem_fun(*this, &ARDOUR_UI::engine_halted));
-       engine->SampleRateChanged.connect (mem_fun(*this, &ARDOUR_UI::update_sample_rate));
+       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->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);
 
        post_engine ();
 
@@ -347,9 +383,6 @@ ARDOUR_UI::post_engine ()
        /* Things to be done once we create the AudioEngine
         */
 
-       MIDI::Manager::instance()->set_api_data (engine->jack());
-       setup_midi ();
-       
        ARDOUR::init_post_engine ();
 
        ActionManager::init ();
@@ -400,34 +433,33 @@ ARDOUR_UI::post_engine ()
        /* start the time-of-day-clock */
 
 #ifndef GTKOSX
-       /* OS X provides aalways visible wallclock, so don't be stupid */
+       /* OS X provides a nearly-always visible wallclock, so don't be stupid */
        update_wall_clock ();
-       Glib::signal_timeout().connect (mem_fun(*this, &ARDOUR_UI::update_wall_clock), 60000);
+       Glib::signal_timeout().connect (sigc::mem_fun(*this, &ARDOUR_UI::update_wall_clock), 60000);
 #endif
 
        update_disk_space ();
        update_cpu_load ();
        update_sample_rate (engine->frame_rate());
 
-       Config->ParameterChanged.connect (mem_fun (*this, &ARDOUR_UI::parameter_changed));
-       Config->map_parameters (mem_fun (*this, &ARDOUR_UI::parameter_changed));
+       Config->ParameterChanged.connect (forever_connections, MISSING_INVALIDATOR, ui_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);
 
        /* now start and maybe save state */
 
        if (do_engine_start () == 0) {
-               if (session && _session_is_new) {
+               if (_session && _session_is_new) {
                        /* we need to retain initial visual
                           settings for a new session
                        */
-                       session->save_state ("");
+                       _session->save_state ("");
                }
        }
 }
 
 ARDOUR_UI::~ARDOUR_UI ()
 {
-       save_ardour_state ();
-
        delete keyboard;
        delete editor;
        delete mixer;
@@ -448,18 +480,19 @@ ARDOUR_UI::configure_timeout ()
 {
        if (last_configure_time == 0) {
                /* no configure events yet */
-               return TRUE;
+               return true;
        }
 
        /* force a gap of 0.5 seconds since the last configure event
         */
 
        if (get_microseconds() - last_configure_time < 500000) {
-               return TRUE;
+               return true;
        } else {
                have_configure_timeout = false;
+                cerr << "config event-driven save\n";
                save_ardour_state ();
-               return FALSE;
+               return false;
        }
 }
 
@@ -469,7 +502,7 @@ ARDOUR_UI::configure_handler (GdkEventConfigure* /*conf*/)
        if (have_configure_timeout) {
                last_configure_time = get_microseconds();
        } else {
-               Glib::signal_timeout().connect (mem_fun(*this, &ARDOUR_UI::configure_timeout), 100);
+               Glib::signal_timeout().connect (sigc::mem_fun(*this, &ARDOUR_UI::configure_timeout), 100);
                have_configure_timeout = true;
        }
 
@@ -533,39 +566,6 @@ ARDOUR_UI::get_transport_controllable_state ()
        return *node;
 }
 
-void
-ARDOUR_UI::save_ardour_state ()
-{
-       if (!keyboard || !mixer || !editor) {
-               return;
-       }
-
-       /* XXX this is all a bit dubious. add_extra_xml() uses
-          a different lifetime model from add_instant_xml().
-       */
-
-       XMLNode* node = new XMLNode (keyboard->get_state());
-       Config->add_extra_xml (*node);
-       Config->add_extra_xml (get_transport_controllable_state());
-       if (_startup && _startup->engine_control() && _startup->engine_control()->was_used()) {
-               Config->add_extra_xml (_startup->engine_control()->get_state());
-       }
-       Config->save_state();
-       ui_config->save_state ();
-
-       XMLNode enode(static_cast<Stateful*>(editor)->get_state());
-       XMLNode mnode(mixer->get_state());
-
-       if (session) {
-               session->add_instant_xml (enode);
-               session->add_instant_xml (mnode);
-       } else {
-               Config->add_instant_xml (enode);
-               Config->add_instant_xml (mnode);
-       }
-
-       Keyboard::save_keybindings ();
-}
 
 gint
 ARDOUR_UI::autosave_session ()
@@ -582,8 +582,8 @@ ARDOUR_UI::autosave_session ()
                 return 1;
        }
 
-        if (session) {
-                session->maybe_write_autosave();
+        if (_session) {
+                _session->maybe_write_autosave();
         }
 
        return 1;
@@ -592,14 +592,14 @@ ARDOUR_UI::autosave_session ()
 void
 ARDOUR_UI::update_autosave ()
 {
-       ENSURE_GUI_THREAD (mem_fun (*this, &ARDOUR_UI::update_autosave));
+       ENSURE_GUI_THREAD (*this, &ARDOUR_UI::update_autosave)
 
-       if (session && session->dirty()) {
+       if (_session && _session->dirty()) {
                if (_autosave_connection.connected()) {
                        _autosave_connection.disconnect();
                }
 
-               _autosave_connection = Glib::signal_timeout().connect (mem_fun (*this, &ARDOUR_UI::autosave_session),
+               _autosave_connection = Glib::signal_timeout().connect (sigc::mem_fun (*this, &ARDOUR_UI::autosave_session),
                                Config->get_periodic_safety_backup_interval() * 1000);
 
        } else {
@@ -614,9 +614,9 @@ ARDOUR_UI::backend_audio_error (bool we_set_params, Gtk::Window* toplevel)
 {
        string title;
        if (we_set_params) {
-               title = _("Ardour could not start JACK");
+               title = string_compose (_("%1 could not start JACK"), PROGRAM_NAME);
        } else {
-               title = _("Ardour could not connect to JACK.");
+               title = string_compose (_("%1 could not connect to JACK."), PROGRAM_NAME);
        }
 
        MessageDialog win (title,
@@ -665,13 +665,18 @@ Please consider the possibilities, and perhaps (re)start JACK."));
 void
 ARDOUR_UI::startup ()
 {
-       XMLNode* audio_setup = Config->extra_xml ("AudioSetup");
+        Application* app = Application::instance ();
 
-       if (audio_setup && _startup && _startup->engine_control()) {
-               _startup->engine_control()->set_state (*audio_setup);
-       }
+        app->ShouldQuit.connect (sigc::mem_fun (*this, &ARDOUR_UI::queue_finish));
+        app->ShouldLoad.connect (sigc::mem_fun (*this, &ARDOUR_UI::idle_load));
 
-       if (get_session_parameters (true, ARDOUR_COMMAND_LINE::new_session)) {
+#ifdef PHONE_HOME
+        call_the_mothership (VERSIONSTRING);
+#endif
+
+        app->ready ();
+
+       if (get_session_parameters (true, ARDOUR_COMMAND_LINE::new_session, ARDOUR_COMMAND_LINE::load_template)) {
                exit (1);
        }
 
@@ -679,8 +684,16 @@ ARDOUR_UI::startup ()
 
        goto_editor_window ();
 
-       BootMessage (_("Ardour is ready for use"));
-       show ();
+       /* 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));
 }
 
 void
@@ -721,17 +734,18 @@ ARDOUR_UI::check_memory_locking ()
                        if (ram == 0 || ((double) limits.rlim_cur / ram) < 0.75) {
 
 
-                               MessageDialog msg (_("WARNING: Your system has a limit for maximum amount of locked memory. "
-                                                    "This might cause Ardour to run out of memory before your system "
-                                                    "runs out of memory. \n\n"
-                                                    "You can view the memory limit with 'ulimit -l', "
-                                                    "and it is normally controlled by /etc/security/limits.conf"));
-
+                               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"));
 
-                               cb.signal_toggled().connect (mem_fun (*this, &ARDOUR_UI::no_memory_warning));
+                               cb.signal_toggled().connect (sigc::mem_fun (*this, &ARDOUR_UI::no_memory_warning));
 
                                hbox.pack_start (cb, true, false);
                                vbox->pack_start (hbox);
@@ -750,17 +764,31 @@ ARDOUR_UI::check_memory_locking ()
 }
 
 
+void
+ARDOUR_UI::queue_finish ()
+{
+       Glib::signal_idle().connect (mem_fun (*this, &ARDOUR_UI::idle_finish));
+}
+
+bool
+ARDOUR_UI::idle_finish ()
+{
+       finish ();
+       return false; /* do not call again */
+}
+
 void
 ARDOUR_UI::finish()
 {
-       if (session) {
+       if (_session) {
+                int tries = 0;
 
-               if (session->transport_rolling()) {
-                       session->request_stop ();
-                       usleep (250000);
+               if (_session->transport_rolling() && (++tries < 8)) {
+                       _session->request_stop (false, true);
+                       usleep (10000);
                }
 
-               if (session->dirty()) {
+               if (_session->dirty()) {
                        switch (ask_about_saving_session(_("quit"))) {
                        case -1:
                                return;
@@ -788,23 +816,31 @@ 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_deletion_in_progress ();
-               session->remove_pending_capture_state ();
-               delete session;
-               session = 0;
+       }
+
+       /* 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;
        }
 
        ArdourDialog::close_all_dialogs ();
        engine->stop (true);
-       save_ardour_state ();
        quit ();
 }
 
 int
 ARDOUR_UI::ask_about_saving_session (const string & what)
 {
-       ArdourDialog window (_("ardour: save session?"));
+       ArdourDialog window (_("Unsaved Session"));
        Gtk::HBox dhbox;  // the hbox for the image and text
        Gtk::Label  prompt_label;
        Gtk::Image* dimage = manage (new Gtk::Image(Stock::DIALOG_WARNING,  Gtk::ICON_SIZE_DIALOG));
@@ -826,13 +862,13 @@ ARDOUR_UI::ask_about_saving_session (const string & what)
        string prompt;
        string type;
 
-       if (session->snap_name() == session->name()) {
+       if (_session->snap_name() == _session->name()) {
                type = _("session");
        } else {
                type = _("snapshot");
        }
        prompt = string_compose(_("The %1 \"%2\"\nhas not been saved.\n\nAny changes made this time\nwill be lost unless you save it.\n\nWhat do you want to do?"),
-                        type, session->snap_name());
+                        type, _session->snap_name());
 
        prompt_label.set_text (prompt);
        prompt_label.set_name (X_("PrompterLabel"));
@@ -899,11 +935,11 @@ ARDOUR_UI::every_point_zero_one_seconds ()
 }
 
 void
-ARDOUR_UI::update_sample_rate (nframes_t ignored)
+ARDOUR_UI::update_sample_rate (nframes_t)
 {
        char buf[32];
 
-       ENSURE_GUI_THREAD (bind (mem_fun(*this, &ARDOUR_UI::update_sample_rate), ignored));
+       ENSURE_GUI_THREAD (*this, &ARDOUR_UI::update_sample_rate, ignored)
 
        if (!engine->connected()) {
 
@@ -941,14 +977,12 @@ ARDOUR_UI::update_buffer_load ()
        char buf[64];
        uint32_t c, p;
 
-       if (session) {
-               c = session->capture_load ();
-               p = session->playback_load ();
-
-               push_buffer_stats (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());
+                         _session->playback_load(), _session->capture_load());
                buffer_load_label.set_text (buf);
        } else {
                buffer_load_label.set_text ("");
@@ -959,7 +993,7 @@ void
 ARDOUR_UI::count_recenabled_streams (Route& route)
 {
        Track* track = dynamic_cast<Track*>(&route);
-       if (track && track->diskstream()->record_enabled()) {
+       if (track && track->record_enabled()) {
                rec_enabled_streams += track->n_inputs().n_total();
        }
 }
@@ -967,19 +1001,19 @@ ARDOUR_UI::count_recenabled_streams (Route& route)
 void
 ARDOUR_UI::update_disk_space()
 {
-       if (session == 0) {
+       if (_session == 0) {
                return;
        }
 
-       nframes_t frames = session->available_capture_duration();
+       nframes_t frames = _session->available_capture_duration();
        char buf[64];
-       nframes_t fr = session->frame_rate();
+       nframes_t fr = _session->frame_rate();
 
        if (frames == max_frames) {
                strcpy (buf, _("Disk: 24hrs+"));
        } else {
                rec_enabled_streams = 0;
-               session->foreach_route (this, &ARDOUR_UI::count_recenabled_streams);
+               _session->foreach_route (this, &ARDOUR_UI::count_recenabled_streams);
 
                if (rec_enabled_streams) {
                        frames /= rec_enabled_streams;
@@ -1131,7 +1165,7 @@ ARDOUR_UI::build_session_selector ()
        recent_session_display.append_column (_("Recent Sessions"), recent_session_columns.visible_name);
        recent_session_display.set_headers_visible (false);
        recent_session_display.get_selection()->set_mode (SELECTION_BROWSE);
-       recent_session_display.signal_row_activated().connect (mem_fun (*this, &ARDOUR_UI::recent_session_row_activated));
+       recent_session_display.signal_row_activated().connect (sigc::mem_fun (*this, &ARDOUR_UI::recent_session_row_activated));
 
        scroller->add (recent_session_display);
        scroller->set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
@@ -1154,7 +1188,7 @@ ARDOUR_UI::recent_session_row_activated (const TreePath& /*path*/, TreeViewColum
 void
 ARDOUR_UI::open_recent_session ()
 {
-       bool can_return = (session != 0);
+       bool can_return = (_session != 0);
 
        if (session_selector_window == 0) {
                build_session_selector ();
@@ -1210,8 +1244,9 @@ ARDOUR_UI::check_audioengine ()
 {
        if (engine) {
                if (!engine->connected()) {
-                       MessageDialog msg (_("Ardour is not connected to JACK\n"
-                                            "You cannot open or close sessions in this condition"));
+                       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;
@@ -1243,7 +1278,7 @@ ARDOUR_UI::open_session ()
 
                FileFilter session_filter;
                session_filter.add_pattern ("*.ardour");
-               session_filter.set_name (_("Ardour sessions"));
+               session_filter.set_name (string_compose (_("%1 sessions"), PROGRAM_NAME));
                open_session_selector->add_filter (session_filter);
                open_session_selector->set_filter (session_filter);
        }
@@ -1278,7 +1313,7 @@ ARDOUR_UI::session_add_midi_route (bool disk, RouteGroup* route_group, uint32_t
 {
        list<boost::shared_ptr<MidiTrack> > tracks;
 
-       if (session == 0) {
+       if (_session == 0) {
                warning << _("You cannot add a track without a session already loaded.") << endmsg;
                return;
        }
@@ -1286,7 +1321,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);
 
                        if (tracks.size() != how_many) {
                                if (how_many == 1) {
@@ -1296,7 +1331,7 @@ ARDOUR_UI::session_add_midi_route (bool disk, RouteGroup* route_group, uint32_t
                                }
                        }
                } /*else {
-                       if ((route = session->new_midi_route ()) == 0) {
+                       if ((route = _session->new_midi_route ()) == 0) {
                                error << _("could not create new midi bus") << endmsg;
                        }
                }*/
@@ -1304,10 +1339,10 @@ ARDOUR_UI::session_add_midi_route (bool disk, RouteGroup* route_group, uint32_t
 
        catch (...) {
                MessageDialog msg (*editor,
-                                  _("There are insufficient JACK ports available\n\
+                                  string_compose (_("There are insufficient JACK ports available\n\
 to create a new track or bus.\n\
-You should save Ardour, exit and\n\
-restart JACK with more ports."));
+You should save %1, exit and\n\
+restart JACK with more ports."), PROGRAM_NAME));
                msg.run ();
        }
 }
@@ -1319,14 +1354,14 @@ ARDOUR_UI::session_add_audio_route (bool track, bool aux, int32_t input_channels
        list<boost::shared_ptr<AudioTrack> > tracks;
        RouteList routes;
 
-       if (session == 0) {
+       if (_session == 0) {
                warning << _("You cannot add a track or bus without a session already loaded.") << endmsg;
                return;
        }
 
        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);
 
                        if (tracks.size() != how_many) {
                                if (how_many == 1) {
@@ -1339,7 +1374,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 (aux, input_channels, output_channels, route_group, how_many);
 
                        if (routes.size() != how_many) {
                                if (how_many == 1) {
@@ -1349,26 +1384,14 @@ ARDOUR_UI::session_add_audio_route (bool track, bool aux, int32_t input_channels
                                }
                        }
                }
-
-#if CONTROLOUTS
-               if (need_control_room_outs) {
-                       pan_t pans[2];
-
-                       pans[0] = 0.5;
-                       pans[1] = 0.5;
-
-                       route->set_stereo_control_outs (control_lr_channels);
-                       route->control_outs()->set_stereo_pan (pans, this);
-               }
-#endif /* CONTROLOUTS */
        }
 
        catch (...) {
                MessageDialog msg (*editor,
-                                  _("There are insufficient JACK ports available\n\
+                                  string_compose (_("There are insufficient JACK ports available\n\
 to create a new track or bus.\n\
-You should save Ardour, exit and\n\
-restart JACK with more ports."));
+You should save %1, exit and\n\
+restart JACK with more ports."), PROGRAM_NAME));
                pop_back_splash ();
                msg.run ();
        }
@@ -1379,9 +1402,9 @@ ARDOUR_UI::do_transport_locate (nframes_t new_position)
 {
        nframes_t _preroll = 0;
 
-       if (session) {
+       if (_session) {
                // XXX CONFIG_CHANGE FIX - requires AnyTime handling
-               // _preroll = session->convert_to_frames_at (new_position, Config->get_preroll());
+               // _preroll = _session->convert_to_frames_at (new_position, Config->get_preroll());
 
                if (new_position > _preroll) {
                        new_position -= _preroll;
@@ -1389,22 +1412,22 @@ ARDOUR_UI::do_transport_locate (nframes_t new_position)
                        new_position = 0;
                }
 
-               session->request_locate (new_position);
+               _session->request_locate (new_position);
        }
 }
 
 void
 ARDOUR_UI::transport_goto_start ()
 {
-       if (session) {
-               session->goto_start();
+       if (_session) {
+               _session->goto_start();
 
                /* force displayed area in editor to start no matter
                   what "follow playhead" setting is.
                */
 
                if (editor) {
-                       editor->center_screen (session->current_start_frame ());
+                       editor->center_screen (_session->current_start_frame ());
                }
        }
 }
@@ -1412,9 +1435,8 @@ ARDOUR_UI::transport_goto_start ()
 void
 ARDOUR_UI::transport_goto_zero ()
 {
-       if (session) {
-               session->request_locate (0);
-
+       if (_session) {
+               _session->request_locate (0);
 
                /* force displayed area in editor to start no matter
                   what "follow playhead" setting is.
@@ -1429,7 +1451,7 @@ ARDOUR_UI::transport_goto_zero ()
 void
 ARDOUR_UI::transport_goto_wallclock ()
 {
-       if (session && editor) {
+       if (_session && editor) {
 
                time_t now;
                struct tm tmnow;
@@ -1438,11 +1460,11 @@ ARDOUR_UI::transport_goto_wallclock ()
                time (&now);
                localtime_r (&now, &tmnow);
 
-               frames = tmnow.tm_hour * (60 * 60 * session->frame_rate());
-               frames += tmnow.tm_min * (60 * session->frame_rate());
-               frames += tmnow.tm_sec * session->frame_rate();
+               frames = tmnow.tm_hour * (60 * 60 * _session->frame_rate());
+               frames += tmnow.tm_min * (60 * _session->frame_rate());
+               frames += tmnow.tm_sec * _session->frame_rate();
 
-               session->request_locate (frames);
+               _session->request_locate (frames, _session->transport_rolling ());
 
                /* force displayed area in editor to start no matter
                   what "follow playhead" setting is.
@@ -1457,9 +1479,9 @@ ARDOUR_UI::transport_goto_wallclock ()
 void
 ARDOUR_UI::transport_goto_end ()
 {
-       if (session) {
-               nframes_t const frame = session->current_end_frame();
-               session->request_locate (frame);
+       if (_session) {
+               nframes_t const frame = _session->current_end_frame();
+               _session->request_locate (frame);
 
                /* force displayed area in editor to start no matter
                   what "follow playhead" setting is.
@@ -1474,23 +1496,23 @@ ARDOUR_UI::transport_goto_end ()
 void
 ARDOUR_UI::transport_stop ()
 {
-       if (!session) {
+       if (!_session) {
                return;
        }
 
-       if (session->is_auditioning()) {
-               session->cancel_audition ();
+       if (_session->is_auditioning()) {
+               _session->cancel_audition ();
                return;
        }
 
-       session->request_stop ();
+       _session->request_stop (false, true);
 }
 
 void
 ARDOUR_UI::transport_stop_and_forget_capture ()
 {
-       if (session) {
-               session->request_stop (true);
+       if (_session) {
+               _session->request_stop (true, true);
        }
 }
 
@@ -1506,47 +1528,47 @@ void
 ARDOUR_UI::transport_record (bool roll)
 {
 
-       if (session) {
-               switch (session->record_status()) {
+       if (_session) {
+               switch (_session->record_status()) {
                case Session::Disabled:
-                       if (session->ntracks() == 0) {
+                       if (_session->ntracks() == 0) {
                                MessageDialog msg (*editor, _("Please create 1 or more track\nbefore trying to record.\nCheck the Session menu."));
                                msg.run ();
                                return;
                        }
-                       session->maybe_enable_record ();
+                       _session->maybe_enable_record ();
                        if (roll) {
                                transport_roll ();
                        }
                        break;
                case Session::Recording:
                        if (roll) {
-                               session->request_stop();
+                               _session->request_stop();
                        } else {
-                               session->disable_record (false, true);
+                               _session->disable_record (false, true);
                        }
                        break;
 
                case Session::Enabled:
-                       session->disable_record (false, true);
+                       _session->disable_record (false, true);
                }
        }
-       //cerr << "ARDOUR_UI::transport_record () called roll = " << roll << " session->record_status() = " << session->record_status() << endl;
+       //cerr << "ARDOUR_UI::transport_record () called roll = " << roll << " _session->record_status() = " << _session->record_status() << endl;
 }
 
 void 
 ARDOUR_UI::transport_roll ()
 {
-       if (!session) {
+       if (!_session) {
                return;
        }
 
-       if (session->is_auditioning()) {
+       if (_session->is_auditioning()) {
                return;
        }
        
-       if (session->config.get_external_sync()) {
-               switch (session->config.get_sync_source()) {
+       if (_session->config.get_external_sync()) {
+               switch (_session->config.get_sync_source()) {
                case JACK:
                        break;
                default:
@@ -1555,36 +1577,44 @@ ARDOUR_UI::transport_roll ()
                }
        }
 
-       bool rolling = session->transport_rolling();
+       bool rolling = _session->transport_rolling();
 
-       if (session->get_play_loop()) {
-               session->request_play_loop (false, true);
-       } else if (session->get_play_range ()) {
-               session->request_play_range (false, true);
-       } 
+       if (_session->get_play_loop()) {
+               /* 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);
+                }
+       } 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);
+       }
 
-       if (!rolling) {
-               session->request_transport_speed (1.0f);
+       if (join_play_range_button.get_active()) {
+               _session->request_play_range (&editor->get_selection().time, true);
        }
 
-       map_transport_state ();
+       if (!rolling) {
+               _session->request_transport_speed (1.0f);
+       }
 }
 
 void
 ARDOUR_UI::toggle_roll (bool with_abort, bool roll_out_of_bounded_mode)
 {
        
-       if (!session) {
+       if (!_session) {
                return;
        }
 
-       if (session->is_auditioning()) {
-               session->cancel_audition ();
+       if (_session->is_auditioning()) {
+               _session->cancel_audition ();
                return;
        }
-       
-       if (session->config.get_external_sync()) {
-               switch (session->config.get_sync_source()) {
+
+       if (_session->config.get_external_sync()) {
+               switch (_session->config.get_sync_source()) {
                case JACK:
                        break;
                default:
@@ -1593,12 +1623,12 @@ ARDOUR_UI::toggle_roll (bool with_abort, bool roll_out_of_bounded_mode)
                }
        }
 
-       bool rolling = session->transport_rolling();
+       bool rolling = _session->transport_rolling();
        bool affect_transport = true;
 
        if (rolling && roll_out_of_bounded_mode) {
                /* drop out of loop/range playback but leave transport rolling */
-               if (session->get_play_loop()) {
+               if (_session->get_play_loop()) {
                        if (Config->get_seamless_loop()) {
                                /* the disk buffers contain copies of the loop - we can't 
                                   just keep playing, so stop the transport. the user
@@ -1609,41 +1639,43 @@ ARDOUR_UI::toggle_roll (bool with_abort, bool roll_out_of_bounded_mode)
                                /* disk buffers are normal, so we can keep playing */
                                affect_transport = false;
                        }
-                       session->request_play_loop (false, true);
-               } else if (session->get_play_range ()) {
+                       _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) {
-                       session->request_stop (with_abort, true);
+                       _session->request_stop (with_abort, true);
                } else {
-                       session->request_transport_speed (1.0f);
+                       if (join_play_range_button.get_active()) {
+                               _session->request_play_range (&editor->get_selection().time, true);
+                       }
+                       
+                       _session->request_transport_speed (1.0f);
                }
        }
-
-       map_transport_state (); 
 }
 
 void
 ARDOUR_UI::toggle_session_auto_loop ()
 {
-       if (session) {
-               if (session->get_play_loop()) {
-                       if (session->transport_rolling()) {
-                               Location * looploc = session->locations()->auto_loop_location();
+       if (_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);
+                                       _session->request_locate (looploc->start(), true);
                                }
                        } else {
-                               session->request_play_loop (false);
+                               _session->request_play_loop (false);
                        }
                } else {
-                       Location * looploc = session->locations()->auto_loop_location();
+                       Location * looploc = _session->locations()->auto_loop_location();
                        if (looploc) {
-                               session->request_play_loop (true);
+                               _session->request_play_loop (true);
                        }
                }
        }
@@ -1652,7 +1684,7 @@ ARDOUR_UI::toggle_session_auto_loop ()
 void
 ARDOUR_UI::transport_play_selection ()
 {
-       if (!session) {
+       if (!_session) {
                return;
        }
 
@@ -1664,24 +1696,24 @@ ARDOUR_UI::transport_rewind (int option)
 {
        float current_transport_speed;
 
-               if (session) {
-               current_transport_speed = session->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);
+                               _session->request_transport_speed (-1.0f);
                                break;
                        case 1:
-                               session->request_transport_speed (-4.0f);
+                               _session->request_transport_speed (-4.0f);
                                break;
                        case -1:
-                               session->request_transport_speed (-0.5f);
+                               _session->request_transport_speed (-0.5f);
                                break;
                        }
                } else {
                        /* speed up */
-                       session->request_transport_speed (current_transport_speed * 1.5f);
+                       _session->request_transport_speed (current_transport_speed * 1.5f);
                }
        }
 }
@@ -1691,47 +1723,47 @@ ARDOUR_UI::transport_forward (int option)
 {
        float current_transport_speed;
 
-       if (session) {
-               current_transport_speed = session->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);
+                               _session->request_transport_speed (1.0f);
                                break;
                        case 1:
-                               session->request_transport_speed (4.0f);
+                               _session->request_transport_speed (4.0f);
                                break;
                        case -1:
-                               session->request_transport_speed (0.5f);
+                               _session->request_transport_speed (0.5f);
                                break;
                        }
                } else {
                        /* speed up */
-                       session->request_transport_speed (current_transport_speed * 1.5f);
+                       _session->request_transport_speed (current_transport_speed * 1.5f);
                }
 
        }
 }
 
 void
-ARDOUR_UI::toggle_record_enable (uint32_t dstream)
+ARDOUR_UI::toggle_record_enable (uint32_t rid)
 {
-       if (session == 0) {
+       if (_session == 0) {
                return;
        }
 
        boost::shared_ptr<Route> r;
 
-       if ((r = session->route_by_remote_id (dstream)) != 0) {
+       if ((r = _session->route_by_remote_id (rid)) != 0) {
 
                Track* t;
 
                if ((t = dynamic_cast<Track*>(r.get())) != 0) {
-                       t->diskstream()->set_record_enabled (!t->diskstream()->record_enabled());
+                       t->set_record_enabled (!t->record_enabled(), this);
                }
        }
-       if (session == 0) {
+       if (_session == 0) {
                return;
        }
 }
@@ -1739,9 +1771,9 @@ ARDOUR_UI::toggle_record_enable (uint32_t dstream)
 void
 ARDOUR_UI::map_transport_state ()
 {
-       ENSURE_GUI_THREAD(mem_fun (*this, &ARDOUR_UI::map_transport_state));
+       ENSURE_GUI_THREAD (*this, &ARDOUR_UI::map_transport_state)
 
-       if (!session) {
+       if (!_session) {
                auto_loop_button.set_visual_state (0);
                play_selection_button.set_visual_state (0);
                roll_button.set_visual_state (0);
@@ -1749,7 +1781,7 @@ ARDOUR_UI::map_transport_state ()
                return;
        }
 
-       float sp = session->transport_speed();
+       float sp = _session->transport_speed();
 
        if (sp == 1.0f) {
                shuttle_fract = SHUTTLE_FRACT_SPEED1;  /* speed = 1.0, believe it or not */
@@ -1762,13 +1794,15 @@ ARDOUR_UI::map_transport_state ()
 
        if (sp != 0.0) {
 
-               if (session->get_play_range()) {
+               /* 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);
-                       
-               } else if (session->get_play_loop ()) {
+
+               } else if (_session->get_play_loop ()) {
                        
                        auto_loop_button.set_visual_state (1);
                        play_selection_button.set_visual_state (0);
@@ -1781,6 +1815,12 @@ ARDOUR_UI::map_transport_state ()
                        auto_loop_button.set_visual_state (0);
                }
 
+               if (join_play_range_button.get_active()) {
+                       /* light up both roll and play-selection if they are joined */
+                       roll_button.set_visual_state (1);
+                       play_selection_button.set_visual_state (1);
+               }
+
                stop_button.set_visual_state (0);
 
        } else {
@@ -1790,13 +1830,12 @@ ARDOUR_UI::map_transport_state ()
                play_selection_button.set_visual_state (0);
                auto_loop_button.set_visual_state (0);
        }
-
 }
 
 void
 ARDOUR_UI::engine_stopped ()
 {
-       ENSURE_GUI_THREAD (mem_fun(*this, &ARDOUR_UI::engine_stopped));
+       ENSURE_GUI_THREAD (*this, &ARDOUR_UI::engine_stopped)
        ActionManager::set_sensitive (ActionManager::jack_sensitive_actions, false);
        ActionManager::set_sensitive (ActionManager::jack_opposite_sensitive_actions, true);
 }
@@ -1804,7 +1843,7 @@ ARDOUR_UI::engine_stopped ()
 void
 ARDOUR_UI::engine_running ()
 {
-       ENSURE_GUI_THREAD (mem_fun(*this, &ARDOUR_UI::engine_running));
+       ENSURE_GUI_THREAD (*this, &ARDOUR_UI::engine_running)
        ActionManager::set_sensitive (ActionManager::jack_sensitive_actions, true);
        ActionManager::set_sensitive (ActionManager::jack_opposite_sensitive_actions, false);
 
@@ -1853,23 +1892,46 @@ ARDOUR_UI::engine_running ()
 }
 
 void
-ARDOUR_UI::engine_halted ()
+ARDOUR_UI::engine_halted (const char* reason, bool free_reason)
 {
-       ENSURE_GUI_THREAD (mem_fun(*this, &ARDOUR_UI::engine_halted));
+       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);
 
-       MessageDialog msg (*editor,
-                          _("\
+        string msgstr;
+
+       /* if the reason is a non-empty string, it means that the backend was shutdown
+          rather than just Ardour.
+       */
+
+       if (strlen (reason)) {
+               msgstr = string_compose (_("The audio backend (JACK) was shutdown because:\n\n%1"), reason);
+       } else {
+               msgstr = string_compose (_("\
 JACK has either been shutdown or it\n\
-disconnected Ardour because Ardour\n\
+disconnected %1 because %1\n\
 was not fast enough. Try to restart\n\
-JACK, reconnect and save the session."));
+JACK, reconnect and save the session."), PROGRAM_NAME);
+       }
+
+       MessageDialog msg (*editor, msgstr);
        pop_back_splash ();
        msg.run ();
+
+        if (free_reason) {
+                free ((char*) reason);
+        }
 }
 
 int32_t
@@ -1900,14 +1962,14 @@ void
 ARDOUR_UI::update_clocks ()
 {
        if (!editor || !editor->dragging_playhead()) {
-               Clock (session->audible_frame(), false, editor->get_preferred_edit_position()); /* EMIT_SIGNAL */
+               Clock (_session->audible_frame(), false, editor->get_preferred_edit_position()); /* EMIT_SIGNAL */
        }
 }
 
 void
 ARDOUR_UI::start_clocking ()
 {
-       clock_signal_connection = RapidScreenUpdate.connect (mem_fun(*this, &ARDOUR_UI::update_clocks));
+       clock_signal_connection = RapidScreenUpdate.connect (sigc::mem_fun(*this, &ARDOUR_UI::update_clocks));
 }
 
 void
@@ -1967,25 +2029,31 @@ ARDOUR_UI::stop_blinking ()
 
 /** Ask the user for the name of a new shapshot and then take it.
  */
+
 void
-ARDOUR_UI::snapshot_session ()
+ARDOUR_UI::snapshot_session (bool switch_to_it)
 {
        ArdourPrompter prompter (true);
        string snapname;
-       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_name ("Prompter");
        prompter.add_button (Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT);
        prompter.set_title (_("Take Snapshot"));
-       prompter.set_prompt (_("Name of New Snapshot"));
-       prompter.set_initial_text (timebuf);
+       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);
+        }
 
+  again:
        switch (prompter.run()) {
        case RESPONSE_ACCEPT:
        {
@@ -1993,12 +2061,27 @@ ARDOUR_UI::snapshot_session ()
 
                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;
+                        }
+                }
+
                vector<sys::path> p;
-               get_state_files_in_directory (session->session_directory().root_path(), p);
+               get_state_files_in_directory (_session->session_directory().root_path(), p);
                vector<string> n = get_file_names_no_extension (p);
                if (find (n.begin(), n.end(), snapname) != n.end()) {
 
-                       ArdourDialog confirm (_("Confirm snapshot overwrite"), true);
+                       ArdourDialog confirm (_("Confirm Snapshot Overwrite"), true);
                        Label m (_("A snapshot already exists with that name.  Do you want to overwrite it?"));
                        confirm.get_vbox()->pack_start (m, true, true);
                        confirm.add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
@@ -2011,7 +2094,7 @@ ARDOUR_UI::snapshot_session ()
                }
 
                if (do_save) {
-                       save_state (snapname);
+                       save_state (snapname, switch_to_it);
                }
                break;
        }
@@ -2022,25 +2105,36 @@ ARDOUR_UI::snapshot_session ()
 }
 
 void
-ARDOUR_UI::save_state (const string & name)
+ARDOUR_UI::save_state (const string & name, bool switch_to_it)
 {
-       (void) save_state_canfail (name);
+       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 ()));
+               }
+       }
+
+       _session->add_extra_xml (*node);
+       
+       save_state_canfail (name, switch_to_it);
 }
 
 int
-ARDOUR_UI::save_state_canfail (string name)
+ARDOUR_UI::save_state_canfail (string name, bool switch_to_it)
 {
-       if (session) {
+       if (_session) {
                int ret;
 
                if (name.length() == 0) {
-                       name = session->snap_name();
+                       name = _session->snap_name();
                }
 
-               if ((ret = session->save_state (name)) != 0) {
+               if ((ret = _session->save_state (name, false, switch_to_it)) != 0) {
                        return ret;
                }
        }
+        cerr << "SS canfail\n";
        save_ardour_state (); /* XXX cannot fail? yeah, right ... */
        return 0;
 }
@@ -2048,36 +2142,40 @@ ARDOUR_UI::save_state_canfail (string name)
 void
 ARDOUR_UI::primary_clock_value_changed ()
 {
-       if (session) {
-               session->request_locate (primary_clock.current_time ());
+       if (_session) {
+               _session->request_locate (primary_clock.current_time ());
        }
 }
 
 void
 ARDOUR_UI::big_clock_value_changed ()
 {
-       if (session) {
-               session->request_locate (big_clock.current_time ());
+       if (_session) {
+               _session->request_locate (big_clock.current_time ());
        }
 }
 
 void
 ARDOUR_UI::secondary_clock_value_changed ()
 {
-       if (session) {
-               session->request_locate (secondary_clock.current_time ());
+       if (_session) {
+               _session->request_locate (secondary_clock.current_time ());
        }
 }
 
 void
 ARDOUR_UI::transport_rec_enable_blink (bool onoff)
 {
-       if (session == 0) {
+       if (_session == 0) {
                return;
        }
 
-       Session::RecordState const r = session->record_status ();
-       bool const h = session->have_rec_enabled_diskstream ();
+        if (_session->step_editing()) {
+                return;
+        }
+
+       Session::RecordState const r = _session->record_status ();
+       bool const h = _session->have_rec_enabled_track ();
 
        if (r == Session::Enabled || (r == Session::Recording && !h)) {
                if (onoff) {
@@ -2105,7 +2203,7 @@ ARDOUR_UI::save_template ()
        prompter.set_name (X_("Prompter"));
        prompter.set_title (_("Save Mix Template"));
        prompter.set_prompt (_("Name for mix template:"));
-       prompter.set_initial_text(session->name() + _("-template"));
+       prompter.set_initial_text(_session->name() + _("-template"));
        prompter.add_button (Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT);
 
        switch (prompter.run()) {
@@ -2113,7 +2211,7 @@ ARDOUR_UI::save_template ()
                prompter.get_result (name);
 
                if (name.length()) {
-                       session->save_template (name);
+                       _session->save_template (name);
                }
                break;
 
@@ -2126,7 +2224,7 @@ void
 ARDOUR_UI::edit_metadata ()
 {
        SessionMetadataEditor dialog;
-       dialog.set_session (session);
+       dialog.set_session (_session);
        editor->ensure_float (dialog);
        dialog.run ();
 }
@@ -2135,7 +2233,7 @@ void
 ARDOUR_UI::import_metadata ()
 {
        SessionMetadataImporter dialog;
-       dialog.set_session (session);
+       dialog.set_session (_session);
        editor->ensure_float (dialog);
        dialog.run ();
 }
@@ -2152,12 +2250,12 @@ ARDOUR_UI::fontconfig_dialog ()
 
        if (!Glib::file_test (fontconfig, Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_DIR)) {
                MessageDialog msg (*_startup,
-                                  _("Welcome to Ardour.\n\n"
-                                    "The program will take a bit longer to start up\n"
-                                    "while the system fonts are checked.\n\n"
-                                    "This will only be done once, and you will\n"
-                                    "not see this message again\n"),
-                                  true,
+                                  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 ();
@@ -2250,7 +2348,7 @@ ARDOUR_UI::ask_about_loading_existing_session (const Glib::ustring& session_path
 
        msg.set_name (X_("OpenExistingDialog"));
        msg.set_title (_("Open Existing Session"));
-       msg.set_wmclass (X_("existing_session"), "Ardour");
+       msg.set_wmclass (X_("existing_session"), PROGRAM_NAME);
        msg.set_position (Gtk::WIN_POS_MOUSE);
        pop_back_splash ();
 
@@ -2265,71 +2363,49 @@ ARDOUR_UI::ask_about_loading_existing_session (const Glib::ustring& session_path
 int
 ARDOUR_UI::build_session_from_nsd (const Glib::ustring& session_path, const Glib::ustring& session_name)
 {
-
-       uint32_t cchns;
-       uint32_t mchns;
-       AutoConnectOption iconnect;
-       AutoConnectOption oconnect;
-       uint32_t nphysin;
-       uint32_t nphysout;
+        BusProfile bus_profile;
 
        if (Profile->get_sae()) {
 
-               cchns = 0;
-               mchns = 2;
-               iconnect = AutoConnectPhysical;
-               oconnect = AutoConnectMaster;
-               nphysin = 0; // use all available
-               nphysout = 0; // use all available
+               bus_profile.master_out_channels = 2;
+               bus_profile.input_ac = AutoConnectPhysical;
+               bus_profile.output_ac = AutoConnectMaster;
+               bus_profile.requested_physical_in = 0; // use all available
+               bus_profile.requested_physical_out = 0; // use all available
 
        } else {
 
                /* get settings from advanced section of NSD */
 
-               if (_startup->create_control_bus()) {
-                       cchns = (uint32_t) _startup->control_channel_count();
-               } else {
-                       cchns = 0;
-               }
-
                if (_startup->create_master_bus()) {
-                       mchns = (uint32_t) _startup->master_channel_count();
+                       bus_profile.master_out_channels = (uint32_t) _startup->master_channel_count();
                } else {
-                       mchns = 0;
+                       bus_profile.master_out_channels = 0;
                }
 
                if (_startup->connect_inputs()) {
-                       iconnect = AutoConnectPhysical;
+                       bus_profile.input_ac = AutoConnectPhysical;
                } else {
-                       iconnect = AutoConnectOption (0);
+                       bus_profile.input_ac = AutoConnectOption (0);
                }
 
                /// @todo some minor tweaks.
-
-               oconnect = AutoConnectOption (0);
+                
+               bus_profile.output_ac = AutoConnectOption (0);
 
                if (_startup->connect_outputs ()) {
                        if (_startup->connect_outs_to_master()) {
-                               oconnect = AutoConnectMaster;
+                               bus_profile.output_ac = AutoConnectMaster;
                        } else if (_startup->connect_outs_to_physical()) {
-                               oconnect = AutoConnectPhysical;
+                               bus_profile.output_ac = AutoConnectPhysical;
                        }
                }
 
-               nphysin = (uint32_t) _startup->input_limit_count();
-               nphysout = (uint32_t) _startup->output_limit_count();
+               bus_profile.requested_physical_in = (uint32_t) _startup->input_limit_count();
+               bus_profile.requested_physical_out = (uint32_t) _startup->output_limit_count();
        }
 
-       if (build_session (session_path,
-                          session_name,
-                          cchns,
-                          mchns,
-                          iconnect,
-                          oconnect,
-                          nphysin,
-                          nphysout,
-                          engine->frame_rate() * 60 * 5)) {
-
+       if (build_session (session_path, session_name, bus_profile)) {
                return -1;
        }
 
@@ -2339,7 +2415,7 @@ ARDOUR_UI::build_session_from_nsd (const Glib::ustring& session_path, const Glib
 void
 ARDOUR_UI::idle_load (const Glib::ustring& path)
 {
-       if (session) {
+       if (_session) {
                if (Glib::file_test (path, Glib::FILE_TEST_IS_DIR)) {
                        /* /path/to/foo => /path/to/foo, foo */
                        load_session (path, basename_nosuffix (path));
@@ -2387,7 +2463,7 @@ ARDOUR_UI::loading_message (const std::string& /*msg*/)
 
 /** @param quit_on_cancel true if exit() should be called if the user clicks `cancel' in the new session dialog */
 int
-ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new)
+ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new, string load_template)
 {
        Glib::ustring session_name;
        Glib::ustring session_path;
@@ -2395,6 +2471,11 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new)
        int ret = -1;
        bool likely_new = false;
 
+        if (! load_template.empty()) {
+            should_be_new = true;
+            template_name = load_template;
+        }
+
        while (ret != 0) {
 
                if (!should_be_new && !ARDOUR_COMMAND_LINE::session_name.empty()) {
@@ -2414,7 +2495,7 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new)
 
                } else {
 
-                       bool const apply = run_startup (should_be_new);
+                       bool const apply = run_startup (should_be_new, load_template);
                        if (!apply) {
                                if (quit_on_cancel) {
                                        exit (1);
@@ -2443,6 +2524,10 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new)
                            (session_name.length() > 2 && session_name[0] == '.' && session_name[1] == '/') ||
                            (session_name.length() > 3 && session_name[0] == '.' && session_name[1] == '.' && session_name[2] == '/')) {
 
+                                /* 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);
 
@@ -2479,6 +2564,22 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new)
                                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 ();
+                               ARDOUR_COMMAND_LINE::session_name = ""; // cancel that
+                                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 ();
+                               ARDOUR_COMMAND_LINE::session_name = ""; // cancel that
+                                continue;
+                        }
+
                        _session_is_new = true;
                }
 
@@ -2490,7 +2591,7 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new)
 
                        ret = load_session (session_path, session_name, template_name);
                        if (!ARDOUR_COMMAND_LINE::immediate_save.empty()) {
-                               session->save_state (ARDOUR_COMMAND_LINE::immediate_save, false);
+                               _session->save_state (ARDOUR_COMMAND_LINE::immediate_save, false);
                                exit (1);
                        }
                }
@@ -2506,10 +2607,17 @@ ARDOUR_UI::close_session()
                return;
        }
 
-       unload_session (true);
+       if (unload_session (true)) {
+                return;
+        }
 
        ARDOUR_COMMAND_LINE::session_name = "";
-       get_session_parameters (true, false);
+
+       if (get_session_parameters (true, false)) {
+               exit (1);
+       }
+
+       goto_editor_window ();
 }
 
 int
@@ -2534,10 +2642,10 @@ ARDOUR_UI::load_session (const Glib::ustring& path, const Glib::ustring& snap_na
                goto out;
        }
 
-       loading_message (_("Please wait while Ardour loads your session"));
+       loading_message (string_compose (_("Please wait while %1loads your session"), PROGRAM_NAME));
 
        try {
-               new_session = new Session (*engine, path, snap_name, mix_template);
+               new_session = new Session (*engine, path, snap_name, 0, mix_template);
        }
 
        /* this one is special */
@@ -2594,14 +2702,23 @@ ARDOUR_UI::load_session (const Glib::ustring& path, const Glib::ustring& snap_na
                goto out;
        }
 
-       connect_to_session (new_session);
+       /* Now the session been created, add the transport controls */
+       new_session->add_controllable(roll_controllable);
+       new_session->add_controllable(stop_controllable);
+       new_session->add_controllable(goto_start_controllable);
+       new_session->add_controllable(goto_end_controllable);
+       new_session->add_controllable(auto_loop_controllable);
+       new_session->add_controllable(play_selection_controllable);
+       new_session->add_controllable(rec_controllable);
+
+       set_session (new_session);
 
        session_loaded = true;
 
        goto_editor_window ();
 
-       if (session) {
-               session->set_clean ();
+       if (_session) {
+               _session->set_clean ();
        }
 
        flush_pending ();
@@ -2612,14 +2729,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,
-                         uint32_t control_channels,
-                         uint32_t master_channels,
-                         AutoConnectOption input_connect,
-                         AutoConnectOption output_connect,
-                         uint32_t nphysin,
-                         uint32_t nphysout,
-                         nframes_t initial_length)
+ARDOUR_UI::build_session (const Glib::ustring& path, const Glib::ustring& snap_name, BusProfile& bus_profile)
 {
        Session *new_session;
        int x;
@@ -2641,8 +2751,7 @@ ARDOUR_UI::build_session (const Glib::ustring& path, const Glib::ustring& snap_n
        _session_is_new = true;
 
        try {
-               new_session = new Session (*engine, path, snap_name, input_connect, output_connect,
-                                          control_channels, master_channels, nphysin, nphysout, initial_length);
+               new_session = new Session (*engine, path, snap_name, &bus_profile);
        }
 
        catch (...) {
@@ -2653,7 +2762,7 @@ ARDOUR_UI::build_session (const Glib::ustring& path, const Glib::ustring& snap_n
                return -1;
        }
 
-       connect_to_session (new_session);
+       set_session (new_session);
 
        session_loaded = true;
 
@@ -2663,17 +2772,13 @@ ARDOUR_UI::build_session (const Glib::ustring& path, const Glib::ustring& snap_n
 }
 
 void
-ARDOUR_UI::show ()
+ARDOUR_UI::launch_chat ()
 {
-       if (editor) {
-               editor->show_window ();
-
-               if (!shown_flag) {
-                       editor->present ();
-               }
-
-               shown_flag = true;
-       }
+#ifdef __APPLE__
+        open_uri("http://webchat.freenode.net/?channels=ardour-osx");
+#else
+        open_uri("http://webchat.freenode.net/?channels=ardour");
+#endif
 }
 
 void
@@ -2681,12 +2786,25 @@ ARDOUR_UI::show_about ()
 {
        if (about == 0) {
                about = new About;
-               about->signal_response().connect(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);
        about->show_all ();
 }
 
+void
+ARDOUR_UI::launch_manual ()
+{
+       PBD::open_uri("http://ardour.org/flossmanual");
+}
+
+void
+ARDOUR_UI::launch_reference ()
+{
+       PBD::open_uri("http://ardour.org/refmanual");
+}
+
 void
 ARDOUR_UI::hide_about ()
 {
@@ -2751,7 +2869,7 @@ require some unused files to continue to exist."));
                return;
        }
 
-       ArdourDialog results (_("ardour: cleanup"), true, false);
+       ArdourDialog results (_("Clean-up"), true, false);
 
        struct CleanupResultsModelColumns : public Gtk::TreeModel::ColumnRecord {
            CleanupResultsModelColumns() {
@@ -2785,10 +2903,7 @@ 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_sound_directory = _session->session_directory().dead_sound_path().to_string();
 
        /* subst:
           %1 - number of files removed
@@ -2798,19 +2913,22 @@ require some unused files to continue to exist."));
        */
 
        const char* bprefix;
+        double space_adjusted = 0;
 
-       if (rep.space < 1048576.0f) {
+       if (rep.space < 100000.0f) {
                bprefix = X_("kilo");
-       } else if (rep.space < 1048576.0f * 1000) {
+       } else if (rep.space < 1000000.0f * 1000) {
                bprefix = X_("mega");
+                space_adjusted = truncf((float)rep.space / 1000.0);
        } else {
                bprefix = X_("giga");
+                space_adjusted = truncf((float)rep.space / (1000000.0 * 1000));
        }
 
        if (removed > 1) {
-               txt.set_text (string_compose (plural_msg, removed, dead_sound_directory, (float) rep.space / 1024.0f, bprefix));
+                txt.set_text (string_compose (plural_msg, removed, _session->path() + "dead_sounds", space_adjusted, bprefix));
        } else {
-               txt.set_text (string_compose (singular_msg, removed, dead_sound_directory, (float) rep.space / 1024.0f, bprefix));
+                txt.set_text (string_compose (singular_msg, removed, _session->path() + "dead_sounds", space_adjusted, bprefix));
        }
 
        dhbox.pack_start (*dimage, true, false, 5);
@@ -2853,7 +2971,7 @@ require some unused files to continue to exist."));
 void
 ARDOUR_UI::cleanup ()
 {
-       if (session == 0) {
+       if (_session == 0) {
                /* shouldn't happen: menu item is insensitive */
                return;
        }
@@ -2874,7 +2992,7 @@ After cleanup, unused audio files will be moved to a \
        checker.set_default_response (RESPONSE_CANCEL);
 
        checker.set_name (_("CleanupDialog"));
-       checker.set_wmclass (X_("ardour_cleanup"), "Ardour");
+       checker.set_wmclass (X_("ardour_cleanup"), PROGRAM_NAME);
        checker.set_position (Gtk::WIN_POS_MOUSE);
 
        switch (checker.run()) {
@@ -2895,7 +3013,7 @@ After cleanup, unused audio files will be moved to a \
                act->set_sensitive (false);
        }
 
-       if (session->cleanup_sources (rep)) {
+       if (_session->cleanup_sources (rep)) {
                editor->finish_cleanup ();
                return;
        }
@@ -2926,14 +3044,14 @@ release an additional\n\
 void
 ARDOUR_UI::flush_trash ()
 {
-       if (session == 0) {
+       if (_session == 0) {
                /* shouldn't happen: menu item is insensitive */
                return;
        }
 
        ARDOUR::CleanupReport rep;
 
-       if (session->cleanup_trash_sources (rep)) {
+       if (_session->cleanup_trash_sources (rep)) {
                return;
        }
 
@@ -2952,12 +3070,12 @@ ARDOUR_UI::add_route (Gtk::Window* float_window)
 {
        int count;
 
-       if (!session) {
+       if (!_session) {
                return;
        }
 
        if (add_route_dialog == 0) {
-               add_route_dialog = new AddRouteDialog (*session);
+               add_route_dialog = new AddRouteDialog (_session);
                if (float_window) {
                        add_route_dialog->set_transient_for (*float_window);
                }
@@ -2987,7 +3105,7 @@ ARDOUR_UI::add_route (Gtk::Window* float_window)
        string template_path = add_route_dialog->track_template();
 
        if (!template_path.empty()) {
-               session->new_route_from_template (count, template_path);
+               _session->new_route_from_template (count, template_path);
                return;
        }
 
@@ -3001,7 +3119,7 @@ ARDOUR_UI::add_route (Gtk::Window* float_window)
        AutoConnectOption oac = Config->get_output_auto_connect();
 
        if (oac & AutoConnectMaster) {
-               output_chan = (session->master_out() ? session->master_out()->n_inputs().n_audio() : input_chan);
+               output_chan = (_session->master_out() ? _session->master_out()->n_inputs().n_audio() : input_chan);
        } else {
                output_chan = input_chan;
        }
@@ -3031,8 +3149,8 @@ ARDOUR_UI::mixer_settings () const
 {
        XMLNode* node = 0;
 
-       if (session) {
-               node = session->instant_xml(X_("Mixer"));
+       if (_session) {
+               node = _session->instant_xml(X_("Mixer"));
        } else {
                node = Config->instant_xml(X_("Mixer"));
        }
@@ -3049,8 +3167,8 @@ ARDOUR_UI::editor_settings () const
 {
        XMLNode* node = 0;
 
-       if (session) {
-               node = session->instant_xml(X_("Editor"));
+       if (_session) {
+               node = _session->instant_xml(X_("Editor"));
        } else {
                node = Config->instant_xml(X_("Editor"));
        }
@@ -3098,87 +3216,35 @@ ARDOUR_UI::halt_on_xrun_message ()
 void
 ARDOUR_UI::xrun_handler(nframes_t where)
 {
-       if (!session) {
+       if (!_session) {
                return;
        }
 
-       ENSURE_GUI_THREAD (bind(mem_fun(*this, &ARDOUR_UI::xrun_handler), where));
+       ENSURE_GUI_THREAD (*this, &ARDOUR_UI::xrun_handler, where)
 
-       if (session && Config->get_create_xrun_marker() && session->actively_recording()) {
+       if (_session && Config->get_create_xrun_marker() && _session->actively_recording()) {
                create_xrun_marker(where);
        }
 
-       if (session && Config->get_stop_recording_on_xrun() && session->actively_recording()) {
+       if (_session && Config->get_stop_recording_on_xrun() && _session->actively_recording()) {
                halt_on_xrun_message ();
        }
 }
 
-void
-ARDOUR_UI::push_buffer_stats (uint32_t capture, uint32_t playback)
-{
-       time_t now;
-       time (&now);
-
-       while (disk_buffer_stats.size() > 60) {
-               disk_buffer_stats.pop_front ();
-       }
-
-       disk_buffer_stats.push_back (DiskBufferStat (now, capture, playback));
-}
-
-void
-ARDOUR_UI::write_buffer_stats ()
-{
-
-       std::ofstream fout;
-       struct tm tm;
-       char buf[64];
-       char path[PATH_MAX+1];  int fd;
-
-       strcpy (path, "ardourBufferingXXXXXX");
-
-       if ((fd = mkstemp (path )) < 0) {
-               cerr << X_("cannot find temporary name for ardour buffer stats") << endl;
-               return;
-       }
-       
-       fout.open (path);
-       close (fd);
-
-       if (!fout) {
-               cerr << string_compose (X_("cannot open file %1 for ardour buffer stats"), path) << endl;
-               return;
-       }
-
-       for (list<DiskBufferStat>::iterator i = disk_buffer_stats.begin(); i != disk_buffer_stats.end(); ++i) {
-               localtime_r (&(*i).when, &tm);
-               strftime (buf, sizeof (buf), "%T", &tm);
-               fout << buf << ' ' << (*i).capture << ' ' << (*i).playback << endl;
-       }
-       
-       disk_buffer_stats.clear ();
-
-       fout.close ();
-
-       cerr << "Ardour buffering statistics can be found in: " << path << endl;
-}
-
 void
 ARDOUR_UI::disk_overrun_handler ()
 {
-       ENSURE_GUI_THREAD (mem_fun(*this, &ARDOUR_UI::disk_overrun_handler));
-
-       write_buffer_stats ();
+       ENSURE_GUI_THREAD (*this, &ARDOUR_UI::disk_overrun_handler)
 
        if (!have_disk_speed_dialog_displayed) {
                have_disk_speed_dialog_displayed = true;
-               MessageDialog* msg = new MessageDialog (*editor, _("\
+               MessageDialog* msg = new MessageDialog (*editor, string_compose (_("\
 The disk system on your computer\n\
-was not able to keep up with Ardour.\n\
+was not able to keep up with %1.\n\
 \n\
 Specifically, it failed to write data to disk\n\
-quickly enough to keep up with recording.\n"));
-               msg->signal_response().connect (bind (mem_fun (*this, &ARDOUR_UI::disk_speed_dialog_gone), msg));
+quickly enough to keep up with recording.\n"), PROGRAM_NAME));
+               msg->signal_response().connect (sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::disk_speed_dialog_gone), msg));
                msg->show ();
        }
 }
@@ -3186,19 +3252,17 @@ quickly enough to keep up with recording.\n"));
 void
 ARDOUR_UI::disk_underrun_handler ()
 {
-       ENSURE_GUI_THREAD (mem_fun(*this, &ARDOUR_UI::disk_underrun_handler));
-
-       write_buffer_stats ();
+       ENSURE_GUI_THREAD (*this, &ARDOUR_UI::disk_underrun_handler)
 
        if (!have_disk_speed_dialog_displayed) {
                have_disk_speed_dialog_displayed = true;
                MessageDialog* msg = new MessageDialog (*editor,
-                                  _("The disk system on your computer\n\
-was not able to keep up with Ardour.\n\
+                                                        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\
-quickly enough to keep up with playback.\n"));
-               msg->signal_response().connect (bind (mem_fun (*this, &ARDOUR_UI::disk_speed_dialog_gone), msg));
+quickly enough to keep up with playback.\n"), PROGRAM_NAME));
+               msg->signal_response().connect (sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::disk_speed_dialog_gone), msg));
                msg->show ();
        }
 }
@@ -3213,7 +3277,7 @@ ARDOUR_UI::disk_speed_dialog_gone (int /*ignored_response*/, MessageDialog* msg)
 void
 ARDOUR_UI::session_dialog (std::string msg)
 {
-       ENSURE_GUI_THREAD (bind (mem_fun(*this, &ARDOUR_UI::session_dialog), msg));
+       ENSURE_GUI_THREAD (*this, &ARDOUR_UI::session_dialog, msg)
 
        MessageDialog* d;
 
@@ -3323,7 +3387,6 @@ ARDOUR_UI::reconnect_to_jack ()
 void
 ARDOUR_UI::use_config ()
 {
-
        XMLNode* node = Config->extra_xml (X_("TransportControllables"));
        if (node) {
                set_transport_controllable_state (*node);
@@ -3345,23 +3408,39 @@ ARDOUR_UI::update_transport_clocks (nframes_t pos)
                secondary_clock.set (pos);
        }
 
-       if (big_clock_window) {
+       if (big_clock_window->get()) {
                big_clock.set (pos);
        }
 }
 
+
+void
+ARDOUR_UI::step_edit_status_change (bool yn)
+{
+        // 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);
+        }
+}
+
 void
 ARDOUR_UI::record_state_changed ()
 {
-       ENSURE_GUI_THREAD (mem_fun (*this, &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;
        }
 
-       Session::RecordState const r = session->record_status ();
-       bool const h = session->have_rec_enabled_diskstream ();
+       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");
@@ -3373,8 +3452,8 @@ ARDOUR_UI::record_state_changed ()
 bool
 ARDOUR_UI::first_idle ()
 {
-       if (session) {
-               session->allow_auto_play (true);
+       if (_session) {
+               _session->allow_auto_play (true);
        }
 
        if (editor) {
@@ -3394,8 +3473,8 @@ ARDOUR_UI::store_clock_modes ()
                node->add_property ((*x)->name().c_str(), enum_2_string ((*x)->mode()));
        }
 
-       session->add_extra_xml (*node);
-       session->set_dirty ();
+       _session->add_extra_xml (*node);
+       _session->set_dirty ();
 }
 
 
@@ -3407,18 +3486,18 @@ ARDOUR_UI::TransportControllable::TransportControllable (std::string name, ARDOU
 }
 
 void
-ARDOUR_UI::TransportControllable::set_value (float val)
+ARDOUR_UI::TransportControllable::set_value (double val)
 {
        if (type == ShuttleControl) {
                double fract;
 
-               if (val == 0.5f) {
+               if (val == 0.5) {
                        fract = 0.0;
                } else {
-                       if (val < 0.5f) {
-                               fract = -((0.5f - val)/0.5f);
+                       if (val < 0.5) {
+                               fract = -((0.5 - val)/0.5);
                        } else {
-                               fract = ((val - 0.5f)/0.5f);
+                               fract = ((val - 0.5)/0.5);
                        }
                }
 
@@ -3426,7 +3505,7 @@ ARDOUR_UI::TransportControllable::set_value (float val)
                return;
        }
 
-       if (val < 0.5f) {
+       if (val < 0.5) {
                /* do nothing: these are radio-style actions */
                return;
        }
@@ -3470,10 +3549,10 @@ ARDOUR_UI::TransportControllable::set_value (float val)
        }
 }
 
-float
+double
 ARDOUR_UI::TransportControllable::get_value (void) const
 {
-       float val = 0.0f;
+       float val = 0.0;
 
        switch (type) {
        case Roll:
@@ -3519,3 +3598,59 @@ 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 ()) {
+/* 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 */
+                                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);
+}