Add session preferences dialog.
[ardour.git] / gtk2_ardour / ardour_ui.cc
index 271cbab85b69d82ea73af6dc47ea9a5b36bc9304..fa028ee24b032566f0f1f3c7418dbd74997163ff 100644 (file)
@@ -25,6 +25,7 @@
 #include <fcntl.h>
 #include <signal.h>
 #include <unistd.h>
+#include <time.h>
 #include <cerrno>
 #include <fstream>
 
 #include <gtkmm/messagedialog.h>
 #include <gtkmm/accelmap.h>
 
-#include <pbd/error.h>
-#include <pbd/misc.h>
-#include <pbd/basename.h>
-#include <pbd/compose.h>
-#include <pbd/failed_constructor.h>
-#include <pbd/enumwriter.h>
-#include <pbd/memento_command.h>
-#include <pbd/file_utils.h>
+#include "pbd/error.h"
+#include "pbd/basename.h"
+#include "pbd/compose.h"
+#include "pbd/failed_constructor.h"
+#include "pbd/enumwriter.h"
+#include "pbd/memento_command.h"
+#include "pbd/file_utils.h"
 
 #include <gtkmm2ext/gtk_ui.h>
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/popup.h>
 #include <gtkmm2ext/window_title.h>
 
-#include <midi++/manager.h>
-
-#include <ardour/ardour.h>
-#include <ardour/profile.h>
-#include <ardour/session_directory.h>
-#include <ardour/session_route.h>
-#include <ardour/session_state_utils.h>
-#include <ardour/session_utils.h>
-#include <ardour/port.h>
-#include <ardour/audioengine.h>
-#include <ardour/playlist.h>
-#include <ardour/utils.h>
-#include <ardour/audio_diskstream.h>
-#include <ardour/audiofilesource.h>
-#include <ardour/recent_sessions.h>
-#include <ardour/port.h>
-#include <ardour/audio_track.h>
-#include <ardour/midi_track.h>
-#include <ardour/filesystem_paths.h>
-#include <ardour/filename_extensions.h>
+#include "midi++/manager.h"
+
+#include "ardour/ardour.h"
+#include "ardour/profile.h"
+#include "ardour/session_directory.h"
+#include "ardour/session_route.h"
+#include "ardour/session_state_utils.h"
+#include "ardour/session_utils.h"
+#include "ardour/port.h"
+#include "ardour/audioengine.h"
+#include "ardour/playlist.h"
+#include "ardour/utils.h"
+#include "ardour/audio_diskstream.h"
+#include "ardour/audiofilesource.h"
+#include "ardour/recent_sessions.h"
+#include "ardour/port.h"
+#include "ardour/audio_track.h"
+#include "ardour/midi_track.h"
+#include "ardour/filesystem_paths.h"
+#include "ardour/filename_extensions.h"
+
+typedef uint64_t microseconds_t;
 
 #include "actions.h"
 #include "ardour_ui.h"
 #include "prompter.h"
 #include "opts.h"
 #include "add_route_dialog.h"
-#include "new_session_dialog.h"
 #include "about.h"
 #include "splash.h"
 #include "utils.h"
 #include "gui_thread.h"
 #include "theme_manager.h"
 #include "bundle_manager.h"
+#include "session_metadata_dialog.h"
+#include "gain_meter.h"
+#include "route_time_axis.h"
+#include "startup.h"
+#include "engine_dialog.h"
 
 #include "i18n.h"
 
@@ -115,10 +121,6 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
          preroll_clock (X_("preroll"), false, X_("PreRollClock"), true, true),
          postroll_clock (X_("postroll"), false, X_("PostRollClock"), true, true),
 
-         /* adjuster table */
-
-         adjuster_table (3, 3),
-
          /* preroll stuff */
 
          preroll_button (_("pre\nroll")),
@@ -130,14 +132,14 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
 
          /* transport */
 
-         roll_controllable ("transport roll", *this, TransportControllable::Roll),
-         stop_controllable ("transport stop", *this, TransportControllable::Stop),
-         goto_start_controllable ("transport goto start", *this, TransportControllable::GotoStart),
-         goto_end_controllable ("transport goto end", *this, TransportControllable::GotoEnd),
-         auto_loop_controllable ("transport auto loop", *this, TransportControllable::AutoLoop),
-         play_selection_controllable ("transport play selection", *this, TransportControllable::PlaySelection),
-         rec_controllable ("transport rec-enable", *this, TransportControllable::RecordEnable),
-         shuttle_controllable ("shuttle", *this, TransportControllable::ShuttleControl),
+         roll_controllable (new TransportControllable ("transport roll", *this, TransportControllable::Roll)),
+         stop_controllable (new TransportControllable ("transport stop", *this, TransportControllable::Stop)),
+         goto_start_controllable (new TransportControllable ("transport goto start", *this, TransportControllable::GotoStart)),
+         goto_end_controllable (new TransportControllable ("transport goto end", *this, TransportControllable::GotoEnd)),
+         auto_loop_controllable (new TransportControllable ("transport auto loop", *this, TransportControllable::AutoLoop)),
+         play_selection_controllable (new TransportControllable ("transport play selection", *this, TransportControllable::PlaySelection)),
+         rec_controllable (new TransportControllable ("transport rec-enable", *this, TransportControllable::RecordEnable)),
+         shuttle_controllable (new TransportControllable ("shuttle", *this, TransportControllable::ShuttleControl)),
          shuttle_controller_binding_proxy (shuttle_controllable),
 
          roll_button (roll_controllable),
@@ -172,13 +174,10 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
 #ifdef TOP_MENUBAR
        _auto_display_errors = false;
 #endif
+
        about = 0;
        splash = 0;
-
-       if (ARDOUR_COMMAND_LINE::session_name.length()) {       
-               /* only show this if we're not going to post the new session dialog */
-               show_splash ();
-       }
+       _startup = 0;
 
        if (theArdourUI == 0) {
                theArdourUI = this;
@@ -191,39 +190,34 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
        mixer = 0;
        session = 0;
        editor = 0;
+       engine = 0;
        _session_is_new = false;
        big_clock_window = 0;
        session_selector_window = 0;
        last_key_press_time = 0;
-       connection_editor = 0;
        _will_create_new_session_automatically = false;
-       new_session_dialog = 0;
        add_route_dialog = 0;
        route_params = 0;
-       option_editor = 0;
+       rc_option_editor = 0;
+       session_option_editor = 0;
        location_ui = 0;
        open_session_selector = 0;
        have_configure_timeout = false;
        have_disk_speed_dialog_displayed = false;
        session_loaded = false;
        last_speed_displayed = -1.0f;
-       
-       sys::path key_bindings_file;
+       ignore_dual_punch = false;
+       _mixer_on_top = false;
 
-       find_file_in_search_path (ardour_search_path() + system_config_search_path(),
-                       "ardour.bindings", key_bindings_file);
+       roll_button.unset_flags (Gtk::CAN_FOCUS);
+       stop_button.unset_flags (Gtk::CAN_FOCUS);
+       goto_start_button.unset_flags (Gtk::CAN_FOCUS);
+       goto_end_button.unset_flags (Gtk::CAN_FOCUS);
+       auto_loop_button.unset_flags (Gtk::CAN_FOCUS);
+       play_selection_button.unset_flags (Gtk::CAN_FOCUS);
+       rec_button.unset_flags (Gtk::CAN_FOCUS);
 
-       keybindings_path = key_bindings_file.to_string();
-
-       /* store all bindings changes in per-user file, no matter where they were loaded from */
-       user_keybindings_path = user_config_directory().to_string ();
-       user_keybindings_path += '/';
-       user_keybindings_path += "ardour.bindings";
-
-       can_save_keybindings = false;
-
-       last_configure_time.tv_sec = 0;
-       last_configure_time.tv_usec = 0;
+       last_configure_time= 0;
 
        shuttle_grabbed = false;
        shuttle_fract = 0.0;
@@ -232,12 +226,17 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
        shuttle_style_menu = 0;
        shuttle_unit_menu = 0;
 
-       gettimeofday (&last_peak_grab, 0);
-       gettimeofday (&last_shuttle_request, 0);
-
+        // We do not have jack linked in yet so;
+        
+       last_shuttle_request = last_peak_grab = 0; //  get_microseconds();
+       
        ARDOUR::Diskstream::DiskOverrun.connect (mem_fun(*this, &ARDOUR_UI::disk_overrun_handler));
        ARDOUR::Diskstream::DiskUnderrun.connect (mem_fun(*this, &ARDOUR_UI::disk_underrun_handler));
 
+       /* handle dialog requests */
+
+       ARDOUR::Session::Dialog.connect (mem_fun(*this, &ARDOUR_UI::session_dialog));
+
        /* handle pending state with a dialog */
 
        ARDOUR::Session::AskAboutPendingState.connect (mem_fun(*this, &ARDOUR_UI::pending_state_dialog));
@@ -254,9 +253,11 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
                }
 
                setup_gtk_ardour_enums ();
-               Config->set_current_owner (ConfigVariableBase::Interface);
                setup_profile ();
 
+               GainMeter::setup_slider_pix ();
+               RouteTimeAxisView::setup_slider_pix ();
+
        } catch (failed_constructor& err) {
                error << _("could not initialize Ardour.") << endmsg;
                // pass it on up
@@ -267,12 +268,31 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
 
        keyboard = new Keyboard;
 
+       reset_dpi();
+
        starting.connect (mem_fun(*this, &ARDOUR_UI::startup));
        stopping.connect (mem_fun(*this, &ARDOUR_UI::shutdown));
 
        platform_setup ();
 }
 
+void
+ARDOUR_UI::run_startup (bool should_be_new)
+{
+       if (_startup == 0) {
+               _startup = new ArdourStartup ();
+       }
+
+       _startup->set_new_only (should_be_new);
+       _startup->present ();
+
+       main().run();
+
+       /* we don't return here until the startup assistant is finished */      
+
+       _startup->hide ();
+}
+
 int
 ARDOUR_UI::create_engine ()
 {
@@ -305,8 +325,6 @@ ARDOUR_UI::create_engine ()
 void
 ARDOUR_UI::post_engine ()
 {
-       extern int setup_midi ();
-
        /* Things to be done once we create the AudioEngine
         */
 
@@ -343,10 +361,6 @@ ARDOUR_UI::post_engine ()
 
        blink_timeout_tag = -1;
 
-       /* the global configuration object is now valid */
-
-       use_config ();
-
        /* this being a GUI and all, we want peakfiles */
 
        AudioFileSource::set_build_peakfiles (true);
@@ -354,8 +368,13 @@ ARDOUR_UI::post_engine ()
 
        /* set default clock modes */
 
-       primary_clock.set_mode (AudioClock::SMPTE);
-       secondary_clock.set_mode (AudioClock::BBT);
+       if (Profile->get_sae()) {
+               primary_clock.set_mode (AudioClock::BBT);
+               secondary_clock.set_mode (AudioClock::MinSec);
+       }  else {
+               primary_clock.set_mode (AudioClock::SMPTE);
+               secondary_clock.set_mode (AudioClock::BBT);
+       }
 
        /* start the time-of-day-clock */
        
@@ -385,26 +404,10 @@ ARDOUR_UI::~ARDOUR_UI ()
 {
        save_ardour_state ();
 
-       if (keyboard) {
-               delete keyboard;
-       }
-
-       if (editor) {
-               delete editor;
-       }
-
-       if (mixer) {
-               delete mixer;
-       }
-
-       if (add_route_dialog) {
-               delete add_route_dialog;
-       }
-
-
-       if (new_session_dialog) {
-               delete new_session_dialog;
-       }
+       delete keyboard;
+       delete editor;
+       delete mixer;
+       delete add_route_dialog;
 }
 
 void
@@ -419,21 +422,15 @@ ARDOUR_UI::pop_back_splash ()
 gint
 ARDOUR_UI::configure_timeout ()
 {
-       struct timeval now;
-       struct timeval diff;
-
-       if (last_configure_time.tv_sec == 0 && last_configure_time.tv_usec == 0) {
+       if (last_configure_time == 0) {
                /* no configure events yet */
                return TRUE;
        }
 
-       gettimeofday (&now, 0);
-       timersub (&now, &last_configure_time, &diff);
-
        /* force a gap of 0.5 seconds since the last configure event
         */
 
-       if (diff.tv_sec == 0 && diff.tv_usec < 500000) {
+       if (get_microseconds() - last_configure_time < 500000) {
                return TRUE;
        } else {
                have_configure_timeout = false;
@@ -446,7 +443,7 @@ gboolean
 ARDOUR_UI::configure_handler (GdkEventConfigure* conf)
 {
        if (have_configure_timeout) {
-               gettimeofday (&last_configure_time, 0);
+               last_configure_time = get_microseconds();
        } else {
                Glib::signal_timeout().connect (mem_fun(*this, &ARDOUR_UI::configure_timeout), 100);
                have_configure_timeout = true;
@@ -461,28 +458,28 @@ ARDOUR_UI::set_transport_controllable_state (const XMLNode& node)
        const XMLProperty* prop;
 
        if ((prop = node.property ("roll")) != 0) {
-               roll_controllable.set_id (prop->value());
+               roll_controllable->set_id (prop->value());
        }
        if ((prop = node.property ("stop")) != 0) {
-               stop_controllable.set_id (prop->value());
+               stop_controllable->set_id (prop->value());
        }
-       if ((prop = node.property ("goto_start")) != 0) {
-               goto_start_controllable.set_id (prop->value());
+       if ((prop = node.property ("goto-start")) != 0) {
+               goto_start_controllable->set_id (prop->value());
        }
-       if ((prop = node.property ("goto_end")) != 0) {
-               goto_end_controllable.set_id (prop->value());
+       if ((prop = node.property ("goto-end")) != 0) {
+               goto_end_controllable->set_id (prop->value());
        }
-       if ((prop = node.property ("auto_loop")) != 0) {
-               auto_loop_controllable.set_id (prop->value());
+       if ((prop = node.property ("auto-loop")) != 0) {
+               auto_loop_controllable->set_id (prop->value());
        }
-       if ((prop = node.property ("play_selection")) != 0) {
-               play_selection_controllable.set_id (prop->value());
+       if ((prop = node.property ("play-selection")) != 0) {
+               play_selection_controllable->set_id (prop->value());
        }
        if ((prop = node.property ("rec")) != 0) {
-               rec_controllable.set_id (prop->value());
+               rec_controllable->set_id (prop->value());
        }
        if ((prop = node.property ("shuttle")) != 0) {
-               shuttle_controllable.set_id (prop->value());
+               shuttle_controllable->set_id (prop->value());
        }
 }
 
@@ -492,21 +489,21 @@ ARDOUR_UI::get_transport_controllable_state ()
        XMLNode* node = new XMLNode(X_("TransportControllables"));
        char buf[64];
 
-       roll_controllable.id().print (buf, sizeof (buf));
+       roll_controllable->id().print (buf, sizeof (buf));
        node->add_property (X_("roll"), buf);
-       stop_controllable.id().print (buf, sizeof (buf));
+       stop_controllable->id().print (buf, sizeof (buf));
        node->add_property (X_("stop"), buf);
-       goto_start_controllable.id().print (buf, sizeof (buf));
+       goto_start_controllable->id().print (buf, sizeof (buf));
        node->add_property (X_("goto_start"), buf);
-       goto_end_controllable.id().print (buf, sizeof (buf));
+       goto_end_controllable->id().print (buf, sizeof (buf));
        node->add_property (X_("goto_end"), buf);
-       auto_loop_controllable.id().print (buf, sizeof (buf));
+       auto_loop_controllable->id().print (buf, sizeof (buf));
        node->add_property (X_("auto_loop"), buf);
-       play_selection_controllable.id().print (buf, sizeof (buf));
+       play_selection_controllable->id().print (buf, sizeof (buf));
        node->add_property (X_("play_selection"), buf);
-       rec_controllable.id().print (buf, sizeof (buf));
+       rec_controllable->id().print (buf, sizeof (buf));
        node->add_property (X_("rec"), buf);
-       shuttle_controllable.id().print (buf, sizeof (buf));
+       shuttle_controllable->id().print (buf, sizeof (buf));
        node->add_property (X_("shuttle"), buf);
 
        return *node;
@@ -526,6 +523,9 @@ ARDOUR_UI::save_ardour_state ()
        XMLNode* node = new XMLNode (keyboard->get_state());
        Config->add_extra_xml (*node);
        Config->add_extra_xml (get_transport_controllable_state());
+       if (_startup && _startup->engine_control() && _startup->engine_control()->was_used()) {
+               Config->add_extra_xml (_startup->engine_control()->get_state());
+       }
        Config->save_state();
        ui_config->save_state ();
 
@@ -534,25 +534,34 @@ ARDOUR_UI::save_ardour_state ()
 
        if (session) {
                session->add_instant_xml (enode);
-       session->add_instant_xml (mnode);
+               session->add_instant_xml (mnode);
        } else {
                Config->add_instant_xml (enode);
                Config->add_instant_xml (mnode);
        }
 
-       save_keybindings ();
+       Keyboard::save_keybindings ();
 }
 
 gint
 ARDOUR_UI::autosave_session ()
 {
-       if (!Config->get_periodic_safety_backups())
+       if (g_main_depth() > 1) {
+               /* inside a recursive main loop,
+                  give up because we may not be able to 
+                  take a lock.
+               */
                return 1;
+       }
 
-       if (session) {
-               session->maybe_write_autosave();
+        if (!Config->get_periodic_safety_backups()) {
+                return 1;
        }
 
+        if (session) {
+                session->maybe_write_autosave();
+        }
+
        return 1;
 }
 
@@ -632,21 +641,21 @@ Please consider the possibilities, and perhaps (re)start JACK."));
 void
 ARDOUR_UI::startup ()
 {
-       string name, path;
-
-       new_session_dialog = new NewSessionDialog();
-
-       bool backend_audio_is_running = EngineControl::engine_running();
        XMLNode* audio_setup = Config->extra_xml ("AudioSetup");
        
-       if (audio_setup) {
-               new_session_dialog->engine_control.set_state (*audio_setup);
+       if (audio_setup && _startup && _startup->engine_control()) {
+               _startup->engine_control()->set_state (*audio_setup);
        }
        
-       if (!get_session_parameters (backend_audio_is_running, ARDOUR_COMMAND_LINE::new_session)) {
-               return;
+       if (get_session_parameters (ARDOUR_COMMAND_LINE::new_session)) {
+               exit (1);
        }
+
+       use_config ();
+
+       goto_editor_window ();
        
+       BootMessage (_("Ardour is ready for use"));
        show ();
 }
 
@@ -754,9 +763,9 @@ If you still wish to quit, please use the\n\n\
                session->set_deletion_in_progress ();
        }
 
+       ArdourDialog::close_all_dialogs ();
        engine->stop (true);
-       Config->save_state();
-       ARDOUR_UI::config()->save_state();
+       save_ardour_state ();
        quit ();
 }
 
@@ -797,8 +806,7 @@ ARDOUR_UI::ask_about_saving_session (const string & what)
        prompt_label.set_name (X_("PrompterLabel"));
        prompt_label.set_alignment(ALIGN_LEFT, ALIGN_TOP);
 
-       dimage->set_alignment(ALIGN_CENTER, ALIGN_TOP)
-;
+       dimage->set_alignment(ALIGN_CENTER, ALIGN_TOP);
        dhbox.set_homogeneous (false);
        dhbox.pack_start (*dimage, false, false, 5);
        dhbox.pack_start (prompt_label, true, false, 5);
@@ -813,9 +821,6 @@ ARDOUR_UI::ask_about_saving_session (const string & what)
        prompt_label.show();
        dimage->show();
        window.show();
-
-       save_the_session = 0;
-
        window.set_keep_above (true);
        window.present ();
 
@@ -902,8 +907,14 @@ void
 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);
+
                snprintf (buf, sizeof (buf), _("Buffers p:%" PRIu32 "%% c:%" PRIu32 "%%"), 
                          session->playback_load(), session->capture_load());
                buffer_load_label.set_text (buf);
@@ -930,15 +941,11 @@ ARDOUR_UI::update_disk_space()
 
        nframes_t frames = session->available_capture_duration();
        char buf[64];
-
+       nframes_t fr = session->frame_rate();
+       
        if (frames == max_frames) {
                strcpy (buf, _("Disk: 24hrs+"));
        } else {
-               int hrs;
-               int mins;
-               int secs;
-               nframes_t fr = session->frame_rate();
-               
                rec_enabled_streams = 0;
                session->foreach_route (this, &ARDOUR_UI::count_recenabled_streams);
                
@@ -946,16 +953,29 @@ ARDOUR_UI::update_disk_space()
                        frames /= rec_enabled_streams;
                }
                
+               int hrs;
+               int mins;
+               int secs;
+       
                hrs  = frames / (fr * 3600);
                frames -= hrs * fr * 3600;
                mins = frames / (fr * 60);
                frames -= mins * fr * 60;
                secs = frames / fr;
-               
+                       
                snprintf (buf, sizeof(buf), _("Disk: %02dh:%02dm:%02ds"), hrs, mins, secs);
        }
-
+       
        disk_space_label.set_text (buf);
+       
+       // An attempt to make the disk space label flash red when space has run out.
+       
+       if (frames < fr * 60 * 5) {
+       /*      disk_space_box.style ("disk_space_label_empty"); */
+       } else {
+       /*      disk_space_box.style ("disk_space_label"); */
+       }
+
 }                
 
 gint
@@ -1153,33 +1173,6 @@ ARDOUR_UI::open_recent_session ()
        }
 }
 
-bool
-ARDOUR_UI::filter_ardour_session_dirs (const FileFilter::Info& info) 
-{
-       struct stat statbuf;
-
-       if (stat (info.filename.c_str(), &statbuf) != 0) {
-               return false;
-       }
-
-       if (!S_ISDIR(statbuf.st_mode)) {
-               return false;
-       }
-
-        // XXX Portability
-        
-       string session_file = info.filename;
-       session_file += '/';
-       session_file += Glib::path_get_basename (info.filename);
-       session_file += ".ardour";
-       
-       if (stat (session_file.c_str(), &statbuf) != 0) {
-               return false;
-       }
-
-       return S_ISREG (statbuf.st_mode);
-}
-
 bool
 ARDOUR_UI::check_audioengine ()
 {
@@ -1292,7 +1285,7 @@ void
 ARDOUR_UI::session_add_audio_route (bool track, int32_t input_channels, int32_t output_channels, ARDOUR::TrackMode mode, uint32_t how_many)
 {
        list<boost::shared_ptr<AudioTrack> > tracks;
-       Session::RouteList routes;
+       RouteList routes;
 
        if (session == 0) {
                warning << _("You cannot add a track or bus without a session already loaded.") << endmsg;
@@ -1369,7 +1362,7 @@ ARDOUR_UI::do_transport_locate (nframes_t new_position)
 }
 
 void
-ARDOUR_UI::transport_goto_start ()
+ARDOUR_UI::transport_goto_start ()  
 {
        if (session) {
                session->goto_start();
@@ -1402,6 +1395,34 @@ ARDOUR_UI::transport_goto_zero ()
        }
 }
 
+void
+ARDOUR_UI::transport_goto_wallclock ()
+{
+       if (session && editor) {
+
+               time_t now;
+               struct tm tmnow;
+               nframes64_t frames;
+               
+               time (&now);
+               localtime_r (&now, &tmnow);
+       
+               frames = tmnow.tm_hour * (60 * 60 * session->frame_rate());
+               frames += tmnow.tm_min * (60 * session->frame_rate());
+               frames += tmnow.tm_sec * session->frame_rate();
+
+               session->request_locate (frames);
+
+               /* force displayed area in editor to start no matter
+                  what "follow playhead" setting is.
+               */
+               
+               if (editor) {
+                       editor->reset_x_origin (frames - (editor->current_page_frames()/2));
+               }
+       }
+}
+
 void
 ARDOUR_UI::transport_goto_end ()
 {
@@ -1457,6 +1478,7 @@ ARDOUR_UI::remove_last_capture()
 void
 ARDOUR_UI::transport_record (bool roll)
 {
+       
        if (session) {
                switch (session->record_status()) {
                case Session::Disabled:
@@ -1482,6 +1504,7 @@ ARDOUR_UI::transport_record (bool roll)
                        session->disable_record (false, true);
                }
        }
+       //cerr << "ARDOUR_UI::transport_record () called roll = " << roll << " session->record_status() = " << session->record_status() << endl;
 }
 
 void
@@ -1495,6 +1518,8 @@ ARDOUR_UI::transport_roll ()
 
        rolling = session->transport_rolling ();
 
+       //cerr << "ARDOUR_UI::transport_roll () called session->record_status() = " << session->record_status() << endl;
+
        if (session->get_play_loop()) {
                session->request_play_loop (false);
                auto_loop_button.set_visual_state (1);
@@ -1639,13 +1664,6 @@ ARDOUR_UI::map_transport_state ()
        }
 }
 
-void
-ARDOUR_UI::GlobalClickBox::printer (char buf[32], Adjustment &adj, void *arg)
-{
-       snprintf (buf, sizeof(buf), "%s", ((GlobalClickBox *) arg)->strings[
-               (int) adj.get_value()].c_str());
-}
-
 void
 ARDOUR_UI::engine_stopped ()
 {
@@ -1719,8 +1737,8 @@ ARDOUR_UI::engine_halted ()
                           _("\
 JACK has either been shutdown or it\n\
 disconnected Ardour because Ardour\n\
-was not fast enough. You can save the\n\
-session and/or try to reconnect to JACK ."));
+was not fast enough. Try to restart\n\
+JACK, reconnect and save the session."));
        pop_back_splash ();
        msg.run ();
 }
@@ -1878,11 +1896,33 @@ ARDOUR_UI::snapshot_session ()
        
        switch (prompter.run()) {
        case RESPONSE_ACCEPT:
+       {
                prompter.get_result (snapname);
-               if (snapname.length()){
+
+               bool do_save = (snapname.length() != 0);
+
+               vector<sys::path> p;
+               get_state_files_in_directory (session->session_directory().root_path(), p);
+               vector<string> n = get_file_names_no_extension (p);
+               if (find (n.begin(), n.end(), snapname) != n.end()) {
+
+                       ArdourDialog confirm (_("Confirm snapshot overwrite"), true);
+                       Label m (_("A snapshot already exists with that name.  Do you want to overwrite it?"));
+                       confirm.get_vbox()->pack_start (m, true, true);
+                       confirm.add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
+                       confirm.add_button (_("Overwrite"), Gtk::RESPONSE_ACCEPT);
+                       confirm.show_all ();
+                       switch (confirm.run()) {
+                       case RESPONSE_CANCEL:
+                               do_save = false;
+                       }
+               }
+               
+               if (do_save) {
                        save_state (snapname);
                }
                break;
+       }
 
        default:
                break;
@@ -1913,17 +1953,6 @@ ARDOUR_UI::save_state_canfail (string name)
        return 0;
 }
 
-void
-ARDOUR_UI::restore_state (string name)
-{
-       if (session) {
-               if (name.length() == 0) {
-                       name = session->name();
-               }
-               session->restore_state (name);
-       }
-}
-
 void
 ARDOUR_UI::primary_clock_value_changed ()
 {
@@ -1948,71 +1977,29 @@ ARDOUR_UI::secondary_clock_value_changed ()
        }
 }
 
-void
-ARDOUR_UI::rec_enable_button_blink (bool onoff, AudioDiskstream *dstream, Widget *w)
-{
-       if (session && dstream && dstream->record_enabled()) {
-
-               Session::RecordState rs;
-               
-               rs = session->record_status ();
-
-               switch (rs) {
-               case Session::Disabled:
-               case Session::Enabled:
-                       if (w->get_state() != STATE_SELECTED) {
-                               w->set_state (STATE_SELECTED);
-                       }
-                       break;
-
-               case Session::Recording:
-                       if (w->get_state() != STATE_ACTIVE) {
-                               w->set_state (STATE_ACTIVE);
-                       }
-                       break;
-               }
-
-       } else {
-               if (w->get_state() != STATE_NORMAL) {
-                       w->set_state (STATE_NORMAL);
-               }
-       }
-}
-
 void
 ARDOUR_UI::transport_rec_enable_blink (bool onoff) 
 {
        if (session == 0) {
                return;
        }
+
+       Session::RecordState const r = session->record_status ();
+       bool const h = session->have_rec_enabled_diskstream ();
        
-       switch (session->record_status()) {
-       case Session::Enabled:
+       if (r == Session::Enabled || (r == Session::Recording && !h)) {
                if (onoff) {
                        rec_button.set_visual_state (2);
                } else {
                        rec_button.set_visual_state (0);
                }
-               break;
-
-       case Session::Recording:
+       } else if (r == Session::Recording && h) {
                rec_button.set_visual_state (1);
-               break;
-
-       default:
+       } else {
                rec_button.set_visual_state (0);
-               break;
        }
 }
 
-gint
-ARDOUR_UI::hide_and_quit (GdkEventAny *ev, ArdourDialog *window)
-{
-       window->hide();
-       Gtk::Main::quit ();
-       return TRUE;
-}
-
 void
 ARDOUR_UI::save_template ()
 
@@ -2043,6 +2030,24 @@ ARDOUR_UI::save_template ()
        }
 }
 
+void
+ARDOUR_UI::edit_metadata ()
+{
+       SessionMetadataEditor dialog;
+       dialog.set_session (session);
+       editor->ensure_float (dialog);
+       dialog.run ();
+}
+
+void
+ARDOUR_UI::import_metadata ()
+{
+       SessionMetadataImporter dialog;
+       dialog.set_session (session);
+       editor->ensure_float (dialog);
+       dialog.run ();
+}
+
 void
 ARDOUR_UI::fontconfig_dialog ()
 {
@@ -2054,7 +2059,7 @@ ARDOUR_UI::fontconfig_dialog ()
        Glib::ustring fontconfig = Glib::build_filename (Glib::get_home_dir(), ".fontconfig");
        
        if (!Glib::file_test (fontconfig, Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_DIR)) {
-               MessageDialog msg (*new_session_dialog,
+               MessageDialog msg (*_startup,
                                   _("Welcome to Ardour.\n\n"
                                     "The program will take a bit longer to start up\n"
                                     "while the system fonts are checked.\n\n"
@@ -2132,7 +2137,7 @@ ARDOUR_UI::load_cmdline_session (const Glib::ustring& session_name, const Glib::
        /* lets just try to load it */
        
        if (create_engine ()) {
-               backend_audio_error (false, new_session_dialog);
+               backend_audio_error (false, _startup);
                return -1;
        }
        
@@ -2188,19 +2193,19 @@ ARDOUR_UI::build_session_from_nsd (const Glib::ustring& session_path, const Glib
                
                /* get settings from advanced section of NSD */
                
-               if (new_session_dialog->create_control_bus()) {
-                       cchns = (uint32_t) new_session_dialog->control_channel_count();
+               if (_startup->create_control_bus()) {
+                       cchns = (uint32_t) _startup->control_channel_count();
                } else {
                        cchns = 0;
                }
                
-               if (new_session_dialog->create_master_bus()) {
-                       mchns = (uint32_t) new_session_dialog->master_channel_count();
+               if (_startup->create_master_bus()) {
+                       mchns = (uint32_t) _startup->master_channel_count();
                } else {
                        mchns = 0;
                }
                
-               if (new_session_dialog->connect_inputs()) {
+               if (_startup->connect_inputs()) {
                        iconnect = AutoConnectPhysical;
                } else {
                        iconnect = AutoConnectOption (0);
@@ -2208,16 +2213,16 @@ ARDOUR_UI::build_session_from_nsd (const Glib::ustring& session_path, const Glib
                
                /// @todo some minor tweaks.
                
-               if (new_session_dialog->connect_outs_to_master()) {
+               if (_startup->connect_outs_to_master()) {
                        oconnect = AutoConnectMaster;
-               } else if (new_session_dialog->connect_outs_to_physical()) {
+               } else if (_startup->connect_outs_to_physical()) {
                        oconnect = AutoConnectPhysical;
                } else {
                        oconnect = AutoConnectOption (0);
                } 
                
-               nphysin = (uint32_t) new_session_dialog->input_limit_count();
-               nphysout = (uint32_t) new_session_dialog->output_limit_count();
+               nphysin = (uint32_t) _startup->input_limit_count();
+               nphysout = (uint32_t) _startup->output_limit_count();
        }
        
        if (build_session (session_path,
@@ -2245,113 +2250,58 @@ ARDOUR_UI::end_loading_messages ()
 void
 ARDOUR_UI::loading_message (const std::string& msg)
 {
-       cerr << "say: " << msg << endl;
-       show_splash ();
-       splash->message (msg);
+       // show_splash ();
+       // splash->message (msg);
        flush_pending ();
 }
-       
-bool
-ARDOUR_UI::get_session_parameters (bool backend_audio_is_running, bool should_be_new)
+
+int
+ARDOUR_UI::get_session_parameters (bool should_be_new)
 {
-       bool existing_session = false;
        Glib::ustring session_name;
        Glib::ustring session_path;
        Glib::ustring template_name;
+       int ret = -1;
+       bool likely_new = false;
 
-       int response = Gtk::RESPONSE_NONE;
-
-       if (!ARDOUR_COMMAND_LINE::session_name.empty()) {
-
-               parse_cmdline_path (ARDOUR_COMMAND_LINE::session_name, session_name, session_path, existing_session);
-
-               /* don't ever reuse this */
-
-               ARDOUR_COMMAND_LINE::session_name = string();
+       while (ret != 0) {
 
-               if (existing_session && backend_audio_is_running) {
+               if (!should_be_new && !ARDOUR_COMMAND_LINE::session_name.empty()) {
 
-                       /* just load the thing already */
+                       /* if they named a specific statefile, use it, otherwise they are 
+                          just giving a session folder, and we want to use it as is
+                          to find the session.
+                       */
 
-                       if (load_cmdline_session (session_name, session_path, existing_session) == 0) {
-                               return true;
+                       if (ARDOUR_COMMAND_LINE::session_name.find (statefile_suffix) != string::npos) {
+                               session_path = Glib::path_get_dirname (ARDOUR_COMMAND_LINE::session_name);
+                       } else {
+                               session_path = ARDOUR_COMMAND_LINE::session_name;
                        }
-               }
-
-               /* make the NSD use whatever information we have */
-
-               new_session_dialog->set_session_name (session_name);
-               new_session_dialog->set_session_folder (session_path);
-       }
 
-       /* loading failed, or we need the NSD for something */
+                       session_name = Glib::path_get_basename (ARDOUR_COMMAND_LINE::session_name);
 
-       new_session_dialog->set_modal (false);
-       new_session_dialog->set_position (WIN_POS_CENTER);
-       new_session_dialog->set_current_page (0);
-       new_session_dialog->set_existing_session (existing_session);
-       new_session_dialog->reset_recent();
-
-       do {
-               new_session_dialog->set_have_engine (backend_audio_is_running);
-               new_session_dialog->present ();
-               end_loading_messages ();
-               response = new_session_dialog->run ();
-               
-               _session_is_new = false;
-               
-               /* handle possible negative responses */
+               } else {
 
-               switch (response) {
-               case Gtk::RESPONSE_CANCEL:
-               case Gtk::RESPONSE_DELETE_EVENT:
-                       if (!session) {
-                               quit();
-                       }
-                       new_session_dialog->hide ();
-                       return false;
+                       run_startup (should_be_new);
                        
-               case Gtk::RESPONSE_NONE:
-                       /* "Clear" was pressed */
-                       goto try_again;
-               }
-
-               fontconfig_dialog();
-
-               if (!backend_audio_is_running) {
-                       if (new_session_dialog->engine_control.setup_engine ()) {
-                               new_session_dialog->hide ();
-                               return false;
-                       } 
-               }
-               
-               if (create_engine ()) {
-
-                       backend_audio_error (!backend_audio_is_running, new_session_dialog);
-                       flush_pending ();
-
-                       new_session_dialog->set_existing_session (false);
-                       new_session_dialog->set_current_page (2);
-
-                       response = Gtk::RESPONSE_NONE;
-                       goto try_again;
-               }
-
-               backend_audio_is_running = true;                
+                       /* if we run the startup dialog again, offer more than just "new session" */
+                       
+                       should_be_new = false;
+                       
+                       session_name = _startup->session_name (likely_new);
+                       
+                       /* this shouldn't happen, but we catch it just in case it does */
                        
-               if (response == Gtk::RESPONSE_OK) {
-
-                       session_name = new_session_dialog->session_name();
-
                        if (session_name.empty()) {
-                               response = Gtk::RESPONSE_NONE;
-                               goto try_again;
+                               break;
+                       } 
+                       if (_startup->use_session_template()) {
+                               template_name = _startup->session_template_name();
+                               _session_is_new = true;
                        } 
 
-                       /* if the user mistakenly typed path information into the session filename entry,
-                          convert what they typed into a path & a name
-                       */
-                       
+
                        if (session_name[0] == '/' || 
                            (session_name.length() > 2 && session_name[0] == '.' && session_name[1] == '/') ||
                            (session_name.length() > 3 && session_name[0] == '.' && session_name[1] == '.' && session_name[2] == '/')) {
@@ -2360,80 +2310,52 @@ ARDOUR_UI::get_session_parameters (bool backend_audio_is_running, bool should_be
                                session_name = Glib::path_get_basename (session_name);
                                
                        } else {
-
-                               session_path = new_session_dialog->session_folder();
+                               
+                               session_path = _startup->session_folder();
                        }
+               }
 
-                       template_name = Glib::ustring();                        
-                       switch (new_session_dialog->which_page()) {
+               if (create_engine ()) {
+                       break;
+               }
+               
+               if (Glib::file_test (session_path, Glib::FileTest (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))) {
 
-                       case NewSessionDialog::OpenPage: 
-                       case NewSessionDialog::EnginePage:
-                               goto loadit;
-                               break;
+                       if (likely_new) {
 
-                       case NewSessionDialog::NewPage: /* nominally the "new" session creator, but could be in use for an old session */
-                               
-                               should_be_new = true;
-                               
-                               //XXX This is needed because session constructor wants a 
-                               //non-existant path. hopefully this will be fixed at some point.
+                               Glib::ustring existing = Glib::build_filename (session_path, session_name);
                                
-                               session_path = Glib::build_filename (session_path, session_name);
-
-                               if (Glib::file_test (session_path, Glib::FileTest (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))) {
+                               if (!ask_about_loading_existing_session (existing)) {
+                                       ARDOUR_COMMAND_LINE::session_name = ""; // cancel that
+                                       continue;
+                               } 
+                       } 
 
-                                       if (ask_about_loading_existing_session (session_path)) {
-                                               goto loadit;
-                                       } else {
-                                               response = RESPONSE_NONE;
-                                               goto try_again;
-                                       } 
-                               }
+                       _session_is_new = false;
 
-                               _session_is_new = true;
-                                               
-                               if (new_session_dialog->use_session_template()) {
+               } else {
 
-                                       template_name = new_session_dialog->session_template_name();
-                                       goto loadit;
-                         
-                               } else {
-                                       if (build_session_from_nsd (session_path, session_name)) {
-                                               response = RESPONSE_NONE;
-                                               goto try_again;
-                                       }
-                                       goto done;
-                               }
-                               break;
-                               
-                       default:
-                               break;
-                       }
-                       
-                 loadit:
-                       new_session_dialog->hide ();
-                       
-                       if (load_session (session_path, session_name, template_name)) {
-                               /* force a retry */
-                               response = Gtk::RESPONSE_NONE;
+                       if (!likely_new) {
+                               MessageDialog msg (string_compose (_("There is no existing session at \"%1\""), session_path));
+                               msg.run ();
+                               ARDOUR_COMMAND_LINE::session_name = ""; // cancel that
+                               continue;
                        }
 
-                 try_again:
-                       if (response == Gtk::RESPONSE_NONE) {
-                               new_session_dialog->set_existing_session (false);
-                               new_session_dialog->reset ();
-                       }
+                       _session_is_new = true;
                }
 
-       } while (response == Gtk::RESPONSE_NONE);
+               if (likely_new && template_name.empty()) {
+                       
+                       ret = build_session_from_nsd (session_path, session_name);
 
-  done:
-       show();
-       new_session_dialog->hide();
-       new_session_dialog->reset();
-       goto_editor_window ();
-       return true;
+               } else {
+
+                       ret = load_session (session_path, session_name, template_name);
+               }
+       }
+       
+       return ret;
 }      
 
 void
@@ -2445,7 +2367,7 @@ ARDOUR_UI::close_session()
 
        unload_session (true);
 
-       get_session_parameters (true, false);
+       get_session_parameters (false);
 }
 
 int
@@ -2481,7 +2403,6 @@ ARDOUR_UI::load_session (const Glib::ustring& path, const Glib::ustring& snap_na
        }
 
        loading_message (_("Please wait while Ardour loads your session"));
-       disable_screen_updates ();
 
        try {
                new_session = new Session (*engine, path, snap_name, mix_template);
@@ -2494,10 +2415,10 @@ ARDOUR_UI::load_session (const Glib::ustring& path, const Glib::ustring& snap_na
                MessageDialog msg (err.what(),
                                   true,
                                   Gtk::MESSAGE_INFO,
-                                  Gtk::BUTTONS_OK_CANCEL);
+                                  Gtk::BUTTONS_CLOSE);
                
-               msg.set_title (_("Loading Error"));
-               msg.set_secondary_text (_("Click the OK button to try again."));
+               msg.set_title (_("Port Registration Error"));
+               msg.set_secondary_text (_("Click the Close button to try again."));
                msg.set_position (Gtk::WIN_POS_CENTER);
                pop_back_splash ();
                msg.present ();
@@ -2520,10 +2441,10 @@ ARDOUR_UI::load_session (const Glib::ustring& path, const Glib::ustring& snap_na
                MessageDialog msg (string_compose(_("Session \"%1 (snapshot %2)\" did not load successfully"), path, snap_name),
                                   true,
                                   Gtk::MESSAGE_INFO,
-                                  Gtk::BUTTONS_OK_CANCEL);
+                                  Gtk::BUTTONS_CLOSE);
                
                msg.set_title (_("Loading Error"));
-               msg.set_secondary_text (_("Click the OK button to try again."));
+               msg.set_secondary_text (_("Click the Close button to try again."));
                msg.set_position (Gtk::WIN_POS_CENTER);
                pop_back_splash ();
                msg.present ();
@@ -2543,8 +2464,6 @@ ARDOUR_UI::load_session (const Glib::ustring& path, const Glib::ustring& snap_na
 
        connect_to_session (new_session);
 
-       Config->set_current_owner (ConfigVariableBase::Interface);
-
        session_loaded = true;
        
        goto_editor_window ();
@@ -2553,7 +2472,6 @@ ARDOUR_UI::load_session (const Glib::ustring& path, const Glib::ustring& snap_na
                session->set_clean ();
        }
 
-       enable_screen_updates ();
        flush_pending ();
        retval = 0;
 
@@ -2606,6 +2524,9 @@ ARDOUR_UI::build_session (const Glib::ustring& path, const Glib::ustring& snap_n
        connect_to_session (new_session);
 
        session_loaded = true;
+
+       new_session->save_state(new_session->name());
+
        return 0;
 }
 
@@ -2830,8 +2751,11 @@ After cleanup, unused audio files will be moved to a \
        }
 
        if (session->cleanup_sources (rep)) {
+               editor->finish_cleanup ();
                return;
        }
+       
+       editor->finish_cleanup ();
 
        checker.hide();
        display_cleanup_results (rep, 
@@ -2845,8 +2769,6 @@ release an additional\n\
 %4 %5bytes of disk space.\n"
                                         ));
 
-
-
 }
 
 void
@@ -2907,6 +2829,13 @@ ARDOUR_UI::add_route (Gtk::Window* float_window)
                return;
        }
 
+       string template_path = add_route_dialog->track_template();
+       
+       if (!template_path.empty()) {
+               session->new_route_from_template (count, template_path);
+               return;
+       }
+
        uint32_t input_chan = add_route_dialog->channels ();
        uint32_t output_chan;
        string name_template = add_route_dialog->name_template ();
@@ -2921,7 +2850,7 @@ ARDOUR_UI::add_route (Gtk::Window* float_window)
        }
 
        /* XXX do something with name template */
-
+       
        if (add_route_dialog->type() == ARDOUR::DataType::MIDI) {
                if (track) {
                        session_add_midi_track(count);
@@ -2968,10 +2897,17 @@ ARDOUR_UI::editor_settings () const
        } else {
                node = Config->instant_xml(X_("Editor"));
        }
+       
+       if (!node) {
+               if (getenv("ARDOUR_INSTANT_XML_PATH")) {
+                       node = Config->instant_xml(getenv("ARDOUR_INSTANT_XML_PATH"));
+               }
+       }
 
        if (!node) {
                node = new XMLNode (X_("Editor"));
        }
+
        return node;
 }
 
@@ -2989,20 +2925,94 @@ ARDOUR_UI::keyboard_settings () const
 }
 
 void
-ARDOUR_UI::halt_on_xrun_message ()
+ARDOUR_UI::create_xrun_marker(nframes_t where)
 {
-       ENSURE_GUI_THREAD (mem_fun(*this, &ARDOUR_UI::halt_on_xrun_message));
+       editor->mouse_add_new_marker (where, false, true);
+}
 
+void
+ARDOUR_UI::halt_on_xrun_message ()
+{
        MessageDialog msg (*editor,
                           _("Recording was stopped because your system could not keep up."));
        msg.run ();
 }
 
+void
+ARDOUR_UI::xrun_handler(nframes_t where)
+{
+       if (!session) {
+               return;
+       }
+
+       ENSURE_GUI_THREAD (bind(mem_fun(*this, &ARDOUR_UI::xrun_handler), where));
+
+       if (session && Config->get_create_xrun_marker() && session->actively_recording()) {
+               create_xrun_marker(where);
+       }
+
+       if (session && Config->get_stop_recording_on_xrun() && session->actively_recording()) {
+               halt_on_xrun_message ();
+       }
+}
+
+void
+ARDOUR_UI::push_buffer_stats (uint32_t capture, uint32_t playback)
+{
+       time_t now;
+       time (&now);
+
+       while (disk_buffer_stats.size() > 60) {
+               disk_buffer_stats.pop_front ();
+       }
+
+       disk_buffer_stats.push_back (DiskBufferStat (now, capture, playback));
+}
+
+void
+ARDOUR_UI::write_buffer_stats ()
+{
+       struct tm tm;
+       char buf[64];
+       char* path;
+
+       char* tmplt = (char*)calloc(strlen("ardourXXXXXX"), sizeof(char));
+       int fd = mkstemp (tmplt);
+       if (fd) {
+               cerr << X_("cannot find temporary name for ardour buffer stats") << endl;
+               return;
+       }
+
+       FILE* fout = fdopen (fd, "w");
+       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) {
+               std::ostringstream ss;
+               localtime_r (&(*i).when, &tm);
+               strftime (buf, sizeof (buf), "%T", &tm);
+               fprintf(fout, "%s %u %u\n", buf, (*i).capture, (*i).playback);
+       }
+       
+       disk_buffer_stats.clear ();
+
+       fclose (fout);
+       close (fd);
+
+       cerr << "Ardour buffering statistics can be found in: " << path << endl;
+       free (path);
+       free (tmplt);
+}
+
 void
 ARDOUR_UI::disk_overrun_handler ()
 {
        ENSURE_GUI_THREAD (mem_fun(*this, &ARDOUR_UI::disk_overrun_handler));
 
+       write_buffer_stats ();
+
        if (!have_disk_speed_dialog_displayed) {
                have_disk_speed_dialog_displayed = true;
                MessageDialog* msg = new MessageDialog (*editor, _("\
@@ -3021,6 +3031,8 @@ ARDOUR_UI::disk_underrun_handler ()
 {
        ENSURE_GUI_THREAD (mem_fun(*this, &ARDOUR_UI::disk_underrun_handler));
 
+       write_buffer_stats ();
+
        if (!have_disk_speed_dialog_displayed) {
                have_disk_speed_dialog_displayed = true;
                MessageDialog* msg = new MessageDialog (*editor,
@@ -3041,6 +3053,24 @@ ARDOUR_UI::disk_speed_dialog_gone (int ignored_response, MessageDialog* msg)
        delete msg;
 }
 
+void
+ARDOUR_UI::session_dialog (std::string msg)
+{
+       ENSURE_GUI_THREAD (bind (mem_fun(*this, &ARDOUR_UI::session_dialog), msg));
+       
+       MessageDialog* d;
+
+       if (editor) {
+               d = new MessageDialog (*editor, msg, false, MESSAGE_INFO, BUTTONS_OK, true);
+       } else {
+               d = new MessageDialog (msg, false, MESSAGE_INFO, BUTTONS_OK, true);
+       }
+
+       d->show_all ();
+       d->run ();
+       delete d;
+}      
+
 int
 ARDOUR_UI::pending_state_dialog ()
 {
@@ -3090,8 +3120,8 @@ The audioengine is currently running at %2 Hz\n"), desired, actual));
        hbox->pack_start (*image, PACK_EXPAND_WIDGET, 12);
        hbox->pack_end (message, PACK_EXPAND_PADDING, 12);
        dialog.get_vbox()->pack_start(*hbox, PACK_EXPAND_PADDING, 6);
-       dialog.add_button (_("Load session anyway"), RESPONSE_ACCEPT);
        dialog.add_button (_("Do not load session"), RESPONSE_REJECT);
+       dialog.add_button (_("Load session anyway"), RESPONSE_ACCEPT);
        dialog.set_default_response (RESPONSE_ACCEPT);
        dialog.set_position (WIN_POS_CENTER);
        message.show();
@@ -3138,7 +3168,9 @@ ARDOUR_UI::use_config ()
 {
        Glib::RefPtr<Action> act;
 
-       switch (Config->get_native_file_data_format ()) {
+       assert (session);
+
+       switch (session->config.get_native_file_data_format ()) {
        case FormatFloat:
                act = ActionManager::get_action (X_("options"), X_("FileDataFormatFloat"));
                break;
@@ -3155,7 +3187,7 @@ ARDOUR_UI::use_config ()
                ract->set_active ();
        }       
 
-       switch (Config->get_native_file_header_format ()) {
+       switch (session->config.get_native_file_header_format ()) {
        case BWF:
                act = ActionManager::get_action (X_("options"), X_("FileHeaderFormatBWF"));
                break;
@@ -3220,37 +3252,28 @@ ARDOUR_UI::record_state_changed ()
                return;
        }
 
-       switch (session->record_status()) {
-       case Session::Recording:
+       Session::RecordState const r = session->record_status ();
+       bool const h = session->have_rec_enabled_diskstream ();
+       
+       if (r == Session::Recording && h)  {
                big_clock.set_widget_name ("BigClockRecording");
-               break;
-       default:
+        } else {
                big_clock.set_widget_name ("BigClockNonRecording");
-               break;
        }
 }
 
-void
-ARDOUR_UI::set_keybindings_path (string path)
-{
-       keybindings_path = path;
-}
-
-void
-ARDOUR_UI::save_keybindings ()
-{
-       if (can_save_keybindings) {
-               AccelMap::save (user_keybindings_path);
-       } 
-}
-
 bool
 ARDOUR_UI::first_idle ()
 {
        if (session) {
                session->allow_auto_play (true);
        }
-       can_save_keybindings = true;
+
+       if (editor) {
+               editor->first_idle();
+       }
+
+       Keyboard::set_can_save_keybindings (true);
        return false;
 }