Add session preferences dialog.
[ardour.git] / gtk2_ardour / ardour_ui.cc
index 826cb88fbc1625b820b722b547fca3a53af0c567..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/compose.h>
-#include <pbd/pathscanner.h>
-#include <pbd/failed_constructor.h>
-#include <pbd/enumwriter.h>
-#include <pbd/stacktrace.h>
+#include "pbd/error.h"
+#include "pbd/basename.h"
+#include "pbd/compose.h"
+#include "pbd/failed_constructor.h"
+#include "pbd/enumwriter.h"
+#include "pbd/memento_command.h"
+#include "pbd/file_utils.h"
+
 #include <gtkmm2ext/gtk_ui.h>
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/click_box.h>
 #include <gtkmm2ext/popup.h>
 #include <gtkmm2ext/window_title.h>
 
-#include <midi++/port.h>
-#include <midi++/mmc.h>
-
-#include <ardour/ardour.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/session_route.h>
-#include <ardour/port.h>
-#include <ardour/audio_track.h>
-#include <ardour/midi_track.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 "color_manager.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"
 
@@ -89,26 +105,22 @@ using namespace Gtk;
 using namespace sigc;
 
 ARDOUR_UI *ARDOUR_UI::theArdourUI = 0;
+UIConfiguration *ARDOUR_UI::ui_config = 0;
 
 sigc::signal<void,bool> ARDOUR_UI::Blink;
 sigc::signal<void>      ARDOUR_UI::RapidScreenUpdate;
-sigc::signal<void>      ARDOUR_UI::MidRapidScreenUpdate;
 sigc::signal<void>      ARDOUR_UI::SuperRapidScreenUpdate;
-sigc::signal<void,nframes_t> ARDOUR_UI::Clock;
+sigc::signal<void,nframes_t, bool, nframes_t> ARDOUR_UI::Clock;
 
-ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], string rcfile)
+ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
 
-       : Gtkmm2ext::UI (X_("Ardour"), argcp, argvp, rcfile),
+       : Gtkmm2ext::UI (X_("Ardour"), argcp, argvp),
          
          primary_clock (X_("primary"), false, X_("TransportClockDisplay"), true, false, true),
          secondary_clock (X_("secondary"), false, X_("SecondaryClockDisplay"), true, false, true),
          preroll_clock (X_("preroll"), false, X_("PreRollClock"), true, true),
          postroll_clock (X_("postroll"), false, X_("PostRollClock"), true, true),
 
-         /* adjuster table */
-
-         adjuster_table (3, 3),
-
          /* preroll stuff */
 
          preroll_button (_("pre\nroll")),
@@ -116,18 +128,18 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], string rcfile)
 
          /* big clock */
 
-         big_clock (X_("bigclock"), false, "BigClockNonRecording", false, false, true),
+         big_clock (X_("bigclock"), false, "BigClockNonRecording", true, false, true),
 
          /* transport */
 
-         roll_controllable ("transport roll", *this, TransportControllable::Roll),
-         stop_controllable ("transport stop", *this, TransportControllable::Stop),
-         goto_start_controllable ("transport goto start", *this, TransportControllable::GotoStart),
-         goto_end_controllable ("transport goto end", *this, TransportControllable::GotoEnd),
-         auto_loop_controllable ("transport auto loop", *this, TransportControllable::AutoLoop),
-         play_selection_controllable ("transport play selection", *this, TransportControllable::PlaySelection),
-         rec_controllable ("transport rec-enable", *this, TransportControllable::RecordEnable),
-         shuttle_controllable ("shuttle", *this, TransportControllable::ShuttleControl),
+         roll_controllable (new TransportControllable ("transport roll", *this, TransportControllable::Roll)),
+         stop_controllable (new TransportControllable ("transport stop", *this, TransportControllable::Stop)),
+         goto_start_controllable (new TransportControllable ("transport goto start", *this, TransportControllable::GotoStart)),
+         goto_end_controllable (new TransportControllable ("transport goto end", *this, TransportControllable::GotoEnd)),
+         auto_loop_controllable (new TransportControllable ("transport auto loop", *this, TransportControllable::AutoLoop)),
+         play_selection_controllable (new TransportControllable ("transport play selection", *this, TransportControllable::PlaySelection)),
+         rec_controllable (new TransportControllable ("transport rec-enable", *this, TransportControllable::RecordEnable)),
+         shuttle_controllable (new TransportControllable ("shuttle", *this, TransportControllable::ShuttleControl)),
          shuttle_controller_binding_proxy (shuttle_controllable),
 
          roll_button (roll_controllable),
@@ -150,51 +162,62 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], string rcfile)
 
          auditioning_alert_button (_("AUDITION")),
          solo_alert_button (_("SOLO")),
-         shown_flag (false)
+         shown_flag (false),
+         error_log_button (_("Errors"))
+
 {
        using namespace Gtk::Menu_Helpers;
 
        Gtkmm2ext::init();
        
+
+#ifdef TOP_MENUBAR
+       _auto_display_errors = false;
+#endif
+
        about = 0;
+       splash = 0;
+       _startup = 0;
 
        if (theArdourUI == 0) {
                theArdourUI = this;
        }
 
-       /* load colors */
-
-       color_manager = new ColorManager();
-
-       std::string color_file = ARDOUR::find_config_file("ardour.colors");
-
-       color_manager->load (color_file);
-
+       ui_config = new UIConfiguration();
+       theme_manager = new ThemeManager();
+       
        editor = 0;
        mixer = 0;
        session = 0;
+       editor = 0;
+       engine = 0;
        _session_is_new = false;
        big_clock_window = 0;
        session_selector_window = 0;
        last_key_press_time = 0;
-       connection_editor = 0;
+       _will_create_new_session_automatically = false;
        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;
-       _will_create_new_session_automatically = false;
        session_loaded = false;
        last_speed_displayed = -1.0f;
-       keybindings_path = ARDOUR::find_config_file ("ardour.bindings");
+       ignore_dual_punch = false;
+       _mixer_on_top = false;
 
-       can_save_keybindings = false;
-       Glib::signal_idle().connect (mem_fun (*this, &ARDOUR_UI::first_idle));
+       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);
 
-       last_configure_time.tv_sec = 0;
-       last_configure_time.tv_usec = 0;
+       last_configure_time= 0;
 
        shuttle_grabbed = false;
        shuttle_fract = 0.0;
@@ -203,41 +226,123 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], string rcfile)
        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));
 
-       /* have to wait for AudioEngine and Configuration before proceeding */
+       /* handle sr mismatch with a dialog */
+
+       ARDOUR::Session::AskAboutSampleRateMismatch.connect (mem_fun(*this, &ARDOUR_UI::sr_mismatch_dialog));
+
+       /* lets get this party started */
+
+       try {
+               if (ARDOUR::init (ARDOUR_COMMAND_LINE::use_vst, ARDOUR_COMMAND_LINE::try_hw_optimization)) {
+                       throw failed_constructor ();
+               }
+
+               setup_gtk_ardour_enums ();
+               setup_profile ();
+
+               GainMeter::setup_slider_pix ();
+               RouteTimeAxisView::setup_slider_pix ();
+
+       } catch (failed_constructor& err) {
+               error << _("could not initialize Ardour.") << endmsg;
+               // pass it on up
+               throw;
+       } 
+
+       /* we like keyboards */
+
+       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::set_engine (AudioEngine& e)
+ARDOUR_UI::run_startup (bool should_be_new)
 {
-       engine = &e;
+       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 ()
+{
+       // this gets called every time by new_session()
+
+       if (engine) {
+               return 0;
+       }
+
+       loading_message (_("Starting audio engine"));
+
+       try { 
+               engine = new ARDOUR::AudioEngine (ARDOUR_COMMAND_LINE::jack_client_name);
+
+       } 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));
 
-               ActionManager::init ();
-       new_session_dialog = new NewSessionDialog();
+       post_engine ();
 
-       _tooltips.enable();
+       return 0;
+}
 
-       keyboard = new Keyboard;
+void
+ARDOUR_UI::post_engine ()
+{
+       /* Things to be done once we create the AudioEngine
+        */
+
+       MIDI::Manager::instance()->set_api_data (engine->jack());
+       setup_midi ();
+
+       ActionManager::init ();
+       _tooltips.enable();
 
        if (setup_windows ()) {
                throw failed_constructor ();
        }
+       
+       check_memory_locking();
 
-       if (GTK_ARDOUR::show_key_actions) {
+       /* this is the first point at which all the keybindings are available */
+
+       if (ARDOUR_COMMAND_LINE::show_key_actions) {
                vector<string> names;
                vector<string> paths;
                vector<string> keys;
@@ -254,15 +359,8 @@ ARDOUR_UI::set_engine (AudioEngine& e)
                exit (0);
        }
 
-       /* start with timecode, metering enabled
-       */
-       
        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);
@@ -270,61 +368,69 @@ ARDOUR_UI::set_engine (AudioEngine& e)
 
        /* 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 */
        
+#ifndef GTKOSX
+       /* OS X provides an always visible wallclock, so don't be stupid */
        update_wall_clock ();
        Glib::signal_timeout().connect (mem_fun(*this, &ARDOUR_UI::update_wall_clock), 60000);
+#endif
 
        update_disk_space ();
        update_cpu_load ();
        update_sample_rate (engine->frame_rate());
 
-       starting.connect (mem_fun(*this, &ARDOUR_UI::startup));
-       stopping.connect (mem_fun(*this, &ARDOUR_UI::shutdown));
+       /* now start and maybe save state */
+
+       if (do_engine_start () == 0) {
+               if (session && _session_is_new) {
+                       /* we need to retain initial visual 
+                          settings for a new session 
+                       */
+                       session->save_state ("");
+               }
+       }
 }
 
 ARDOUR_UI::~ARDOUR_UI ()
 {
        save_ardour_state ();
 
-       if (keyboard) {
-               delete keyboard;
-       }
-
-       if (editor) {
-               delete editor;
-       }
-
-       if (mixer) {
-               delete mixer;
-       }
+       delete keyboard;
+       delete editor;
+       delete mixer;
+       delete add_route_dialog;
+}
 
-       if (add_route_dialog) {
-               delete add_route_dialog;
+void
+ARDOUR_UI::pop_back_splash ()
+{
+       if (Splash::instance()) {
+               // Splash::instance()->pop_back();
+               Splash::instance()->hide ();
        }
 }
 
 gint
 ARDOUR_UI::configure_timeout ()
 {
-       struct timeval now;
-       struct timeval diff;
-
-       if (last_configure_time.tv_sec == 0 && last_configure_time.tv_usec == 0) {
+       if (last_configure_time == 0) {
                /* no configure events yet */
                return TRUE;
        }
 
-       gettimeofday (&now, 0);
-       timersub (&now, &last_configure_time, &diff);
-
        /* force a gap of 0.5 seconds since the last configure event
         */
 
-       if (diff.tv_sec == 0 && diff.tv_usec < 500000) {
+       if (get_microseconds() - last_configure_time < 500000) {
                return TRUE;
        } else {
                have_configure_timeout = false;
@@ -337,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;
@@ -352,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());
        }
 }
 
@@ -383,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;
@@ -417,33 +523,147 @@ 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 ();
 
        XMLNode enode(static_cast<Stateful*>(editor)->get_state());
        XMLNode mnode(mixer->get_state());
 
        if (session) {
-               session->add_instant_xml (enode, session->path());
-               session->add_instant_xml (mnode, session->path());
+               session->add_instant_xml (enode);
+               session->add_instant_xml (mnode);
        } else {
-               Config->add_instant_xml (enode, get_user_ardour_path());
-               Config->add_instant_xml (mnode, get_user_ardour_path());
+               Config->add_instant_xml (enode);
+               Config->add_instant_xml (mnode);
        }
 
-       save_keybindings ();
+       Keyboard::save_keybindings ();
+}
+
+gint
+ARDOUR_UI::autosave_session ()
+{
+       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 (!Config->get_periodic_safety_backups()) {
+                return 1;
+       }
+
+        if (session) {
+                session->maybe_write_autosave();
+        }
+
+       return 1;
+}
+
+void
+ARDOUR_UI::update_autosave ()
+{
+       ENSURE_GUI_THREAD (mem_fun (*this, &ARDOUR_UI::update_autosave));
+
+       if (session->dirty()) {
+               if (_autosave_connection.connected()) {
+                       _autosave_connection.disconnect();
+               }
+
+               _autosave_connection = Glib::signal_timeout().connect (mem_fun (*this, &ARDOUR_UI::autosave_session),
+                               Config->get_periodic_safety_backup_interval() * 1000);
+
+       } else {
+               if (_autosave_connection.connected()) {
+                       _autosave_connection.disconnect();
+               }               
+       }
+}
+
+void
+ARDOUR_UI::backend_audio_error (bool we_set_params, Gtk::Window* toplevel)
+{
+       string title;
+       if (we_set_params) {
+               title = _("Ardour could not start JACK");
+       } else {
+               title = _("Ardour could not connect to JACK.");
+       }
+
+       MessageDialog win (title,
+                          false,
+                          Gtk::MESSAGE_INFO,
+                          Gtk::BUTTONS_NONE);
+       
+       if (we_set_params) {
+               win.set_secondary_text(_("There are several possible reasons:\n\
+\n\
+1) You requested audio parameters that are not supported..\n\
+2) JACK is running as another user.\n\
+\n\
+Please consider the possibilities, and perhaps try different parameters."));
+       } else {
+               win.set_secondary_text(_("There are several possible reasons:\n\
+\n\
+1) JACK is not running.\n\
+2) JACK is running as another user, perhaps root.\n\
+3) There is already another client called \"ardour\".\n\
+\n\
+Please consider the possibilities, and perhaps (re)start JACK."));
+       }
+
+       if (toplevel) {
+               win.set_transient_for (*toplevel);
+       }
+
+       if (we_set_params) {
+               win.add_button (Stock::OK, RESPONSE_CLOSE);
+       } else {
+               win.add_button (Stock::QUIT, RESPONSE_CLOSE);
+       }
+
+       win.set_default_response (RESPONSE_CLOSE);
+       
+       win.show_all ();
+       win.set_position (Gtk::WIN_POS_CENTER);
+       pop_back_splash ();
+
+       /* we just don't care about the result, but we want to block */
+
+       win.run ();
 }
 
 void
 ARDOUR_UI::startup ()
 {
-       check_memory_locking();
+       XMLNode* audio_setup = Config->extra_xml ("AudioSetup");
+       
+       if (audio_setup && _startup && _startup->engine_control()) {
+               _startup->engine_control()->set_state (*audio_setup);
+       }
+       
+       if (get_session_parameters (ARDOUR_COMMAND_LINE::new_session)) {
+               exit (1);
+       }
+
+       use_config ();
+
+       goto_editor_window ();
+       
+       BootMessage (_("Ardour is ready for use"));
+       show ();
 }
 
 void
 ARDOUR_UI::no_memory_warning ()
 {
        XMLNode node (X_("no-memory-warning"));
-       Config->add_instant_xml (node, get_user_ardour_path());
+       Config->add_instant_xml (node);
 }
 
 void
@@ -454,7 +674,7 @@ ARDOUR_UI::check_memory_locking ()
        return;
 #else // !__APPLE__
 
-       XMLNode* memory_warning_node = Config->instant_xml (X_("no-memory-warning"), get_user_ardour_path());
+       XMLNode* memory_warning_node = Config->instant_xml (X_("no-memory-warning"));
 
        if (engine->is_realtime() && memory_warning_node == 0) {
 
@@ -491,7 +711,11 @@ ARDOUR_UI::check_memory_locking ()
                                
                                hbox.pack_start (cb, true, false);
                                vbox->pack_start (hbox);
-                               hbox.show_all ();
+                               cb.show();
+                               vbox->show();
+                               hbox.show ();
+
+                               pop_back_splash ();
                                
                                editor->ensure_float (msg);
                                msg.run ();
@@ -505,34 +729,43 @@ ARDOUR_UI::check_memory_locking ()
 void
 ARDOUR_UI::finish()
 {
-       if (session && session->dirty()) {
-               switch (ask_about_saving_session(_("quit"))) {
-               case -1:
-                       return;
-                       break;
-               case 1:
-                       /* use the default name */
-                       if (save_state_canfail ("")) {
-                               /* failed - don't quit */
-                               MessageDialog msg (*editor, 
-                                              _("\
+       if (session) {
+
+               if (session->transport_rolling()) {
+                       session->request_stop ();
+                       usleep (2500000);
+               }
+
+               if (session->dirty()) {
+                       switch (ask_about_saving_session(_("quit"))) {
+                       case -1:
+                               return;
+                               break;
+                       case 1:
+                               /* use the default name */
+                               if (save_state_canfail ("")) {
+                                       /* failed - don't quit */
+                                       MessageDialog msg (*editor, 
+                                                          _("\
 Ardour was unable to save your session.\n\n\
 If you still wish to quit, please use the\n\n\
 \"Just quit\" option."));
-                               msg.run ();
-                               return;
+                                       pop_back_splash();
+                                       msg.run ();
+                                       return;
+                               }
+                               break;
+                       case 0:
+                               break;
                        }
-                       break;
-               case 0:
-                       break;
                }
-       }
-
-       if (session) {
+               
                session->set_deletion_in_progress ();
        }
+
+       ArdourDialog::close_all_dialogs ();
        engine->stop (true);
-       Config->save_state();
+       save_ardour_state ();
        quit ();
 }
 
@@ -573,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);
@@ -584,10 +816,11 @@ ARDOUR_UI::ask_about_saving_session (const string & what)
        window.set_position (Gtk::WIN_POS_MOUSE);
        window.set_modal (true);
        window.set_resizable (false);
-       window.show_all ();
-
-       save_the_session = 0;
 
+       dhbox.show();
+       prompt_label.show();
+       dimage->show();
+       window.show();
        window.set_keep_above (true);
        window.present ();
 
@@ -624,16 +857,11 @@ ARDOUR_UI::every_point_one_seconds ()
        return TRUE;
 }
 
-gint
-ARDOUR_UI::every_point_oh_five_seconds ()
-{
-       MidRapidScreenUpdate(); /* EMIT_SIGNAL */
-       return true;
-}
-
 gint
 ARDOUR_UI::every_point_zero_one_seconds ()
 {
+       // august 2007: actual update frequency: 40Hz, not 100Hz
+
        SuperRapidScreenUpdate(); /* EMIT_SIGNAL */
        return TRUE;
 }
@@ -654,11 +882,11 @@ ARDOUR_UI::update_sample_rate (nframes_t ignored)
                nframes_t rate = engine->frame_rate();
                
                if (fmod (rate, 1000.0) != 0.0) {
-                       snprintf (buf, sizeof (buf), _("%.1f kHz / %4.1f msecs"), 
+                       snprintf (buf, sizeof (buf), _("%.1f kHz / %4.1f ms"), 
                                  (float) rate/1000.0f,
                                  (engine->frames_per_cycle() / (float) rate) * 1000.0f);
                } else {
-                       snprintf (buf, sizeof (buf), _("%u kHz / %4.1f msecs"), 
+                       snprintf (buf, sizeof (buf), _("%u kHz / %4.1f ms"), 
                                  rate/1000,
                                  (engine->frames_per_cycle() / (float) rate) * 1000.0f);
                }
@@ -671,7 +899,7 @@ void
 ARDOUR_UI::update_cpu_load ()
 {
        char buf[32];
-       snprintf (buf, sizeof (buf), _("DSP: %.1f%%"), engine->get_cpu_load());
+       snprintf (buf, sizeof (buf), _("DSP: %5.1f%%"), engine->get_cpu_load());
        cpu_load_label.set_text (buf);
 }
 
@@ -679,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);
@@ -694,7 +928,7 @@ ARDOUR_UI::count_recenabled_streams (Route& route)
 {
        Track* track = dynamic_cast<Track*>(&route);
        if (track && track->diskstream()->record_enabled()) {
-               rec_enabled_streams += track->n_inputs().get_total();
+               rec_enabled_streams += track->n_inputs().n_total();
        }
 }
 
@@ -707,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);
                
@@ -723,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
@@ -761,34 +1004,39 @@ ARDOUR_UI::session_menu (GdkEventButton *ev)
 void
 ARDOUR_UI::redisplay_recent_sessions ()
 {
-       vector<string *> *sessions;
-       vector<string *>::iterator i;
+       std::vector<sys::path> session_directories;
        RecentSessionsSorter cmp;
        
        recent_session_display.set_model (Glib::RefPtr<TreeModel>(0));
        recent_session_model->clear ();
 
-       RecentSessions rs;
+       ARDOUR::RecentSessions rs;
        ARDOUR::read_recent_sessions (rs);
 
        if (rs.empty()) {
                recent_session_display.set_model (recent_session_model);
                return;
        }
-
-       /* sort them alphabetically */
+       //
+       // sort them alphabetically
        sort (rs.begin(), rs.end(), cmp);
-       sessions = new vector<string*>;
-
-       for (RecentSessions::iterator i = rs.begin(); i != rs.end(); ++i) {
-               sessions->push_back (new string ((*i).second));
+       
+       for (ARDOUR::RecentSessions::iterator i = rs.begin(); i != rs.end(); ++i) {
+               session_directories.push_back ((*i).second);
        }
+       
+       for (vector<sys::path>::const_iterator i = session_directories.begin();
+                       i != session_directories.end(); ++i)
+       {
+               std::vector<sys::path> state_file_paths;
+           
+               // now get available states for this session
 
-       for (i = sessions->begin(); i != sessions->end(); ++i) {
+               get_state_files_in_directory (*i, state_file_paths);
 
                vector<string*>* states;
                vector<const gchar*> item;
-               string fullpath = *(*i);
+               string fullpath = (*i).to_string();
                
                /* remove any trailing / */
 
@@ -796,38 +1044,44 @@ ARDOUR_UI::redisplay_recent_sessions ()
                        fullpath = fullpath.substr (0, fullpath.length()-1);
                }
 
+               /* check whether session still exists */
+               if (!Glib::file_test(fullpath.c_str(), Glib::FILE_TEST_EXISTS)) {
+                       /* session doesn't exist */
+                       cerr << "skipping non-existent session " << fullpath << endl;
+                       continue;
+               }               
+               
                /* now get available states for this session */
 
                if ((states = Session::possible_states (fullpath)) == 0) {
                        /* no state file? */
                        continue;
                }
+         
+               std::vector<string> state_file_names(get_file_names_no_extension (state_file_paths));
 
-               TreeModel::Row row = *(recent_session_model->append());
+               Gtk::TreeModel::Row row = *(recent_session_model->append());
 
                row[recent_session_columns.visible_name] = Glib::path_get_basename (fullpath);
                row[recent_session_columns.fullpath] = fullpath;
+               
+               if (state_file_names.size() > 1) {
 
-               if (states->size() > 1) {
+                       // add the children
 
-                       /* add the children */
-                       
-                       for (vector<string*>::iterator i2 = states->begin(); i2 != states->end(); ++i2) {
-                               
-                               TreeModel::Row child_row = *(recent_session_model->append (row.children()));
+                       for (std::vector<std::string>::iterator i2 = state_file_names.begin();
+                                       i2 != state_file_names.end(); ++i2)
+                       {
 
-                               child_row[recent_session_columns.visible_name] = **i2;
-                               child_row[recent_session_columns.fullpath] = fullpath;
+                               Gtk::TreeModel::Row child_row = *(recent_session_model->append (row.children()));
 
-                               delete *i2;
+                               child_row[recent_session_columns.visible_name] = *i2;
+                               child_row[recent_session_columns.fullpath] = fullpath;
                        }
                }
-
-               delete states;
        }
 
        recent_session_display.set_model (recent_session_model);
-       delete sessions;
 }
 
 void
@@ -844,8 +1098,7 @@ ARDOUR_UI::build_session_selector ()
        recent_session_display.set_model (recent_session_model);
        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_SINGLE);
-
+       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));
 
        scroller->add (recent_session_display);
@@ -854,7 +1107,10 @@ ARDOUR_UI::build_session_selector ()
        session_selector_window->set_name ("SessionSelectorWindow");
        session_selector_window->set_size_request (200, 400);
        session_selector_window->get_vbox()->pack_start (*scroller);
-       session_selector_window->show_all_children();
+
+       recent_session_display.show();
+       scroller->show();
+       //session_selector_window->get_vbox()->show();
 }
 
 void
@@ -866,69 +1122,82 @@ ARDOUR_UI::recent_session_row_activated (const TreePath& path, TreeViewColumn* c
 void
 ARDOUR_UI::open_recent_session ()
 {
-       /* popup selector window */
+       bool can_return = (session != 0);
 
        if (session_selector_window == 0) {
                build_session_selector ();
        }
-
+       
        redisplay_recent_sessions ();
 
-       ResponseType r = (ResponseType) session_selector_window->run ();
+       while (true) {
+               
+               session_selector_window->set_position (WIN_POS_MOUSE);
 
-       session_selector_window->hide();
+               ResponseType r = (ResponseType) session_selector_window->run ();
+               
+               switch (r) {
+               case RESPONSE_ACCEPT:
+                       break;
+               default:
+                       if (can_return) {
+                               session_selector_window->hide();
+                               return;
+                       } else {
+                               exit (1);
+                       }
+               }
 
-       switch (r) {
-       case RESPONSE_ACCEPT:
-               break;
-       default:
-               return;
-       }
+               if (recent_session_display.get_selection()->count_selected_rows() == 0) {
+                       continue;
+               }
+               
+               session_selector_window->hide();
 
-       Gtk::TreeModel::iterator i = recent_session_display.get_selection()->get_selected();
+               Gtk::TreeModel::iterator i = recent_session_display.get_selection()->get_selected();
+               
+               if (i == recent_session_model->children().end()) {
+                       return;
+               }
+               
+               Glib::ustring path = (*i)[recent_session_columns.fullpath];
+               Glib::ustring state = (*i)[recent_session_columns.visible_name];
+               
+               _session_is_new = false;
+               
+               if (load_session (path, state) == 0) {
+                       break;
+               }
 
-       if (i == recent_session_model->children().end()) {
-               return;
+               can_return = false;
        }
-       
-       Glib::ustring path = (*i)[recent_session_columns.fullpath];
-       Glib::ustring state = (*i)[recent_session_columns.visible_name];
-
-       _session_is_new = false;
-
-       load_session (path, state);
 }
 
 bool
-ARDOUR_UI::filter_ardour_session_dirs (const FileFilter::Info& info) 
+ARDOUR_UI::check_audioengine ()
 {
-       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) {
+       if (engine) {
+               if (!engine->connected()) {
+                       MessageDialog msg (_("Ardour is not connected to JACK\n"
+                                            "You cannot open or close sessions in this condition"));
+                       pop_back_splash ();
+                       msg.run ();
+                       return false;
+               }
+               return true;
+       } else {
                return false;
        }
-
-       return S_ISREG (statbuf.st_mode);
 }
 
 void
 ARDOUR_UI::open_session ()
 {
+       if (!check_audioengine()) {
+               return;
+               
+       }
+
        /* popup selector window */
 
        if (open_session_selector == 0) {
@@ -938,6 +1207,7 @@ ARDOUR_UI::open_session ()
                open_session_selector = new Gtk::FileChooserDialog (_("open session"), FILE_CHOOSER_ACTION_OPEN);
                open_session_selector->add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
                open_session_selector->add_button (Gtk::Stock::OPEN, Gtk::RESPONSE_ACCEPT);
+               open_session_selector->set_default_response(Gtk::RESPONSE_ACCEPT);
 
                FileFilter session_filter;
                session_filter.add_pattern ("*.ardour");
@@ -963,7 +1233,7 @@ ARDOUR_UI::open_session ()
        bool isnew;
 
        if (session_path.length() > 0) {
-               if (Session::find_session (session_path, path, name, isnew) == 0) {
+               if (ARDOUR::find_session (session_path, path, name, isnew) == 0) {
                        _session_is_new = isnew;
                        load_session (path, name);
                }
@@ -1015,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;
@@ -1062,12 +1332,12 @@ ARDOUR_UI::session_add_audio_route (bool track, int32_t input_channels, int32_t
        }
 
        catch (...) {
-               cerr << "About to complain about JACK\n";
                MessageDialog msg (*editor, 
                                   _("There are insufficient JACK ports available\n\
 to create a new track or bus.\n\
 You should save Ardour, exit and\n\
 restart JACK with more ports."));
+               pop_back_splash ();
                msg.run ();
        }
 }
@@ -1092,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();
@@ -1125,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 ()
 {
@@ -1178,8 +1476,9 @@ ARDOUR_UI::remove_last_capture()
 }
 
 void
-ARDOUR_UI::transport_record ()
+ARDOUR_UI::transport_record (bool roll)
 {
+       
        if (session) {
                switch (session->record_status()) {
                case Session::Disabled:
@@ -1189,12 +1488,23 @@ ARDOUR_UI::transport_record ()
                                return;
                        }
                        session->maybe_enable_record ();
+                       if (roll) {
+                               transport_roll ();
+                       }
                        break;
                case Session::Recording:
+                       if (roll) {
+                               session->request_stop();
+                       } else {
+                               session->disable_record (false, true);
+                       }
+                       break;
+
                case Session::Enabled:
-                       session->disable_record (true);
+                       session->disable_record (false, true);
                }
        }
+       //cerr << "ARDOUR_UI::transport_record () called roll = " << roll << " session->record_status() = " << session->record_status() << endl;
 }
 
 void
@@ -1208,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);
@@ -1352,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 ()
 {
@@ -1375,7 +1680,7 @@ ARDOUR_UI::engine_running ()
        ActionManager::set_sensitive (ActionManager::jack_opposite_sensitive_actions, false);
 
        Glib::RefPtr<Action> action;
-       char* action_name = 0;
+       const char* action_name = 0;
 
        switch (engine->frames_per_cycle()) {
        case 32:
@@ -1432,8 +1737,9 @@ 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 ();
 }
 
@@ -1455,26 +1761,17 @@ ARDOUR_UI::do_engine_start ()
        return 0;
 }
 
-gint
-ARDOUR_UI::start_engine ()
+void
+ARDOUR_UI::setup_theme ()
 {
-       if (do_engine_start () == 0) {
-               if (session && _session_is_new) {
-                       /* we need to retain initial visual 
-                          settings for a new session 
-                       */
-                       session->save_state ("");
-               }
-       }
-
-       return FALSE;
+       theme_manager->setup_theme();
 }
 
 void
 ARDOUR_UI::update_clocks ()
 {
        if (!editor || !editor->dragging_playhead()) {
-               Clock (session->audible_frame()); /* EMIT_SIGNAL */
+               Clock (session->audible_frame(), false, editor->get_preferred_edit_position()); /* EMIT_SIGNAL */
        }
 }
 
@@ -1544,45 +1841,41 @@ ARDOUR_UI::name_io_setup (AudioEngine& engine,
                          IO& io,
                          bool in)
 {
+       vector<string> connections;
+
        if (in) {
-               if (io.n_inputs().get_total() == 0) {
+               if (io.n_inputs().n_total() == 0) {
                        buf = _("none");
                        return;
                }
                
                /* XXX we're not handling multiple ports yet. */
 
-               const char **connections = io.input(0)->get_connections();
-               
-               if (connections == 0 || connections[0] == '\0') {
+               if (io.input(0)->get_connections(connections) == 0) {
                        buf = _("off");
                } else {
-                       buf = connections[0];
+                       buf = connections.front();
                }
 
-               free (connections);
-
        } else {
 
-               if (io.n_outputs().get_total() == 0) {
+               if (io.n_outputs().n_total() == 0) {
                        buf = _("none");
                        return;
                }
                
                /* XXX we're not handling multiple ports yet. */
 
-               const char **connections = io.output(0)->get_connections();
-               
-               if (connections == 0 || connections[0] == '\0') {
+               if (io.output(0)->get_connections(connections) == 0) {
                        buf = _("off");
                } else {
-                       buf = connections[0];
+                       buf = connections.front();
                }
-
-               free (connections);
        }
 }
 
+/** Ask the user for the name of a new shapshot and then take it.
+ */
 void
 ARDOUR_UI::snapshot_session ()
 {
@@ -1603,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;
@@ -1639,21 +1954,18 @@ ARDOUR_UI::save_state_canfail (string name)
 }
 
 void
-ARDOUR_UI::restore_state (string name)
+ARDOUR_UI::primary_clock_value_changed ()
 {
        if (session) {
-               if (name.length() == 0) {
-                       name = session->name();
-               }
-               session->restore_state (name);
+               session->request_locate (primary_clock.current_time ());
        }
 }
 
 void
-ARDOUR_UI::primary_clock_value_changed ()
+ARDOUR_UI::big_clock_value_changed ()
 {
        if (session) {
-               session->request_locate (primary_clock.current_time ());
+               session->request_locate (big_clock.current_time ());
        }
 }
 
@@ -1665,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 ()
 
@@ -1737,6 +2007,10 @@ ARDOUR_UI::save_template ()
        ArdourPrompter prompter (true);
        string name;
 
+       if (!check_audioengine()) {
+               return;
+       }
+
        prompter.set_name (X_("Prompter"));
        prompter.set_prompt (_("Name for mix template:"));
        prompter.set_initial_text(session->name() + _("-template"));
@@ -1756,266 +2030,440 @@ ARDOUR_UI::save_template ()
        }
 }
 
-bool
-ARDOUR_UI::new_session (std::string predetermined_path)
+void
+ARDOUR_UI::edit_metadata ()
+{
+       SessionMetadataEditor dialog;
+       dialog.set_session (session);
+       editor->ensure_float (dialog);
+       dialog.run ();
+}
+
+void
+ARDOUR_UI::import_metadata ()
 {
-       string session_name;
-       string session_path;
+       SessionMetadataImporter dialog;
+       dialog.set_session (session);
+       editor->ensure_float (dialog);
+       dialog.run ();
+}
 
-       if (!engine->connected()) {
-               MessageDialog msg (_("Ardour is not connected to JACK at this time. Creating new sessions is not possible."));
+void
+ARDOUR_UI::fontconfig_dialog ()
+{
+#ifdef GTKOSX
+       /* X11 users will always have fontconfig info around, but new GTK-OSX users 
+          may not and it can take a while to build it. Warn them.
+       */
+       
+       Glib::ustring fontconfig = Glib::build_filename (Glib::get_home_dir(), ".fontconfig");
+       
+       if (!Glib::file_test (fontconfig, Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_DIR)) {
+               MessageDialog msg (*_startup,
+                                  _("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,
+                                  Gtk::MESSAGE_INFO,
+                                  Gtk::BUTTONS_OK);
+               pop_back_splash ();
+               msg.show_all ();
+               msg.present ();
                msg.run ();
+       }
+#endif
+}
+
+void
+ARDOUR_UI::parse_cmdline_path (const Glib::ustring& cmdline_path, Glib::ustring& session_name, Glib::ustring& session_path, bool& existing_session)
+{
+       existing_session = false;
+
+       if (Glib::file_test (cmdline_path, Glib::FILE_TEST_IS_DIR)) {
+               session_path = cmdline_path;
+               existing_session = true;
+       } else if (Glib::file_test (cmdline_path, Glib::FILE_TEST_IS_REGULAR)) {
+               session_path = Glib::path_get_dirname (string (cmdline_path));
+               existing_session = true;
+       } else {
+               /* it doesn't exist, assume the best */
+               session_path = Glib::path_get_dirname (string (cmdline_path));
+       }
+       
+       session_name = basename_nosuffix (string (cmdline_path));
+}
+
+int
+ARDOUR_UI::load_cmdline_session (const Glib::ustring& session_name, const Glib::ustring& session_path, bool& existing_session)
+{
+       /* when this is called, the backend audio system must be running */
+
+       /* the main idea here is to deal with the fact that a cmdline argument for the session
+          can be interpreted in different ways - it could be a directory or a file, and before
+          we load, we need to know both the session directory and the snapshot (statefile) within it
+          that we are supposed to use.
+       */
+
+       if (session_name.length() == 0 || session_path.length() == 0) {
                return false;
        }
+       
+       if (Glib::file_test (session_path, Glib::FILE_TEST_IS_DIR)) {
 
-       int response = Gtk::RESPONSE_NONE;
+               Glib::ustring predicted_session_file;
+               
+               predicted_session_file = session_path;
+               predicted_session_file += '/';
+               predicted_session_file += session_name;
+               predicted_session_file += ARDOUR::statefile_suffix;
+               
+               if (Glib::file_test (predicted_session_file, Glib::FILE_TEST_EXISTS)) {
+                       existing_session = true;
+               }
+               
+       } else if (Glib::file_test (session_path, Glib::FILE_TEST_EXISTS)) {
+               
+               if (session_path.find (ARDOUR::statefile_suffix) == session_path.length() - 7) {
+                       /* existing .ardour file */
+                       existing_session = true;
+               }
 
-       new_session_dialog->set_modal(true);
-       new_session_dialog->set_name (predetermined_path);
-       new_session_dialog->reset_recent();
-       new_session_dialog->show();
+       } else {
+               existing_session = false;
+       }
+       
+       /* lets just try to load it */
+       
+       if (create_engine ()) {
+               backend_audio_error (false, _startup);
+               return -1;
+       }
+       
+       return load_session (session_path, session_name);
+}
 
-       do {
-               response = new_session_dialog->run ();
+bool
+ARDOUR_UI::ask_about_loading_existing_session (const Glib::ustring& session_path)
+{
+       Glib::ustring str = string_compose (_("This session\n%1\nalready exists. Do you want to open it?"), session_path);
+       
+       MessageDialog msg (str,
+                          false,
+                          Gtk::MESSAGE_WARNING,
+                          Gtk::BUTTONS_YES_NO,
+                          true);
+       
+       
+       msg.set_name (X_("CleanupDialog"));
+       msg.set_wmclass (X_("existing_session"), "Ardour");
+       msg.set_position (Gtk::WIN_POS_MOUSE);
+       pop_back_splash ();
+
+       switch (msg.run()) {
+       case RESPONSE_YES:
+               return true;
+               break;
+       }
+       return false;
+}
 
-               if (!engine->connected()) {
-                       new_session_dialog->hide ();
-                       MessageDialog msg (_("Ardour is not connected to JACK at this time. Creating new sessions is not possible."));
-                       msg.run ();
-                       return false;
+int
+ARDOUR_UI::build_session_from_nsd (const Glib::ustring& session_path, const Glib::ustring& session_name)
+{
+       
+       uint32_t cchns;
+       uint32_t mchns;
+       AutoConnectOption iconnect;
+       AutoConnectOption oconnect;
+       uint32_t nphysin;
+       uint32_t nphysout;
+       
+       if (Profile->get_sae()) {
+               
+               cchns = 0;
+               mchns = 2;
+               iconnect = AutoConnectPhysical;
+               oconnect = AutoConnectMaster;
+               nphysin = 0; // use all available
+               nphysout = 0; // use all available
+               
+       } else {
+               
+               /* get settings from advanced section of NSD */
+               
+               if (_startup->create_control_bus()) {
+                       cchns = (uint32_t) _startup->control_channel_count();
+               } else {
+                       cchns = 0;
                }
                
-               _session_is_new = false;
+               if (_startup->create_master_bus()) {
+                       mchns = (uint32_t) _startup->master_channel_count();
+               } else {
+                       mchns = 0;
+               }
+               
+               if (_startup->connect_inputs()) {
+                       iconnect = AutoConnectPhysical;
+               } else {
+                       iconnect = AutoConnectOption (0);
+               }
+               
+               /// @todo some minor tweaks.
+               
+               if (_startup->connect_outs_to_master()) {
+                       oconnect = AutoConnectMaster;
+               } else if (_startup->connect_outs_to_physical()) {
+                       oconnect = AutoConnectPhysical;
+               } else {
+                       oconnect = AutoConnectOption (0);
+               } 
+               
+               nphysin = (uint32_t) _startup->input_limit_count();
+               nphysout = (uint32_t) _startup->output_limit_count();
+       }
+       
+       if (build_session (session_path,
+                          session_name,
+                          cchns,
+                          mchns,
+                          iconnect,
+                          oconnect,
+                          nphysin,
+                          nphysout, 
+                          engine->frame_rate() * 60 * 5)) {
+               
+               return -1;
+       }
+
+       return 0;
+}
+
+void
+ARDOUR_UI::end_loading_messages ()
+{
+       // hide_splash ();
+}
+
+void
+ARDOUR_UI::loading_message (const std::string& msg)
+{
+       // show_splash ();
+       // splash->message (msg);
+       flush_pending ();
+}
+
+int
+ARDOUR_UI::get_session_parameters (bool should_be_new)
+{
+       Glib::ustring session_name;
+       Glib::ustring session_path;
+       Glib::ustring template_name;
+       int ret = -1;
+       bool likely_new = false;
 
-               if (response == Gtk::RESPONSE_CANCEL || response == Gtk::RESPONSE_DELETE_EVENT) {
+       while (ret != 0) {
 
-                       if (!session) {
-                               quit();
-                       }
-                       new_session_dialog->hide ();
-                       return false;
+               if (!should_be_new && !ARDOUR_COMMAND_LINE::session_name.empty()) {
 
-               } else if (response == Gtk::RESPONSE_NONE) {
+                       /* 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.
+                       */
 
-                       /* Clear was pressed */
-                       new_session_dialog->reset();
+                       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;
+                       }
 
-               } else if (response == Gtk::RESPONSE_YES) {
+                       session_name = Glib::path_get_basename (ARDOUR_COMMAND_LINE::session_name);
 
-                       /* YES  == OPEN, but there's no enum for that */
+               } else {
 
-                       session_name = new_session_dialog->session_name();
+                       run_startup (should_be_new);
+                       
+                       /* 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 (session_name.empty()) {
-                               response = Gtk::RESPONSE_NONE;
-                               continue;
+                               break;
+                       } 
+                       if (_startup->use_session_template()) {
+                               template_name = _startup->session_template_name();
+                               _session_is_new = true;
                        } 
 
+
                        if (session_name[0] == '/' || 
                            (session_name.length() > 2 && session_name[0] == '.' && session_name[1] == '/') ||
                            (session_name.length() > 3 && session_name[0] == '.' && session_name[1] == '.' && session_name[2] == '/')) {
-                               load_session (Glib::path_get_dirname (session_name), session_name);
-                       } else {
-                               session_path = new_session_dialog->session_folder();
-                               load_session (session_path, session_name);
-                       }
-                       
-               } else if (response == Gtk::RESPONSE_OK) {
-
-                       session_name = new_session_dialog->session_name();
-                       
-                       if (new_session_dialog->get_current_page() == 1) {
-                 
-                               /* XXX this is a bit of a hack.. 
-                                  i really want the new sesion dialog to return RESPONSE_YES
-                                  if we're on page 1 (the load page)
-                                  Unfortunately i can't see how atm.. 
-                               */
                                
-                               if (session_name.empty()) {
-                                       response = Gtk::RESPONSE_NONE;
-                                       continue;
-                               } 
+                               session_path = Glib::path_get_dirname (session_name);
+                               session_name = Glib::path_get_basename (session_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] == '/')) {
-                                       load_session (Glib::path_get_dirname (session_name), session_name);
-                               } else {
-                                       session_path = new_session_dialog->session_folder();
-                                       load_session (session_path, session_name);
-                               }
-                       
                        } else {
+                               
+                               session_path = _startup->session_folder();
+                       }
+               }
+
+               if (create_engine ()) {
+                       break;
+               }
+               
+               if (Glib::file_test (session_path, Glib::FileTest (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))) {
 
-                               if (session_name.empty()) {
-                                       response = Gtk::RESPONSE_NONE;
+                       if (likely_new) {
+
+                               Glib::ustring existing = Glib::build_filename (session_path, session_name);
+                               
+                               if (!ask_about_loading_existing_session (existing)) {
+                                       ARDOUR_COMMAND_LINE::session_name = ""; // cancel that
                                        continue;
                                } 
+                       } 
 
-                               if (session_name[0] == '/' || 
-                                   (session_name.length() > 2 && session_name[0] == '.' && session_name[1] == '/') ||
-                                   (session_name.length() > 3 && session_name[0] == '.' && session_name[1] == '.' && session_name[2] == '/')) {
+                       _session_is_new = false;
 
-                                       session_path = Glib::path_get_dirname (session_name);
-                                       session_name = Glib::path_get_basename (session_name);
+               } else {
 
-                               } else {
+                       if (!likely_new) {
+                               MessageDialog msg (string_compose (_("There is no existing session at \"%1\""), session_path));
+                               msg.run ();
+                               ARDOUR_COMMAND_LINE::session_name = ""; // cancel that
+                               continue;
+                       }
 
-                                       session_path = new_session_dialog->session_folder();
+                       _session_is_new = true;
+               }
 
-                               }
-                               
-                               //XXX This is needed because session constructor wants a 
-                               //non-existant path. hopefully this will be fixed at some point.
-                               
-                               session_path = Glib::build_filename (session_path, session_name);
-                                               
-                               if (g_file_test (session_path.c_str(), GFileTest (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))) {
-
-                                       Glib::ustring str = string_compose (_("This session\n%1\nalready exists. Do you want to open it?"), session_path);
-
-                                       MessageDialog msg (str,
-                                                          false,
-                                                          Gtk::MESSAGE_WARNING,
-                                                          Gtk::BUTTONS_YES_NO,
-                                                          true);
-
-
-                                       msg.set_name (X_("CleanupDialog"));
-                                       msg.set_wmclass (X_("existing_session"), "Ardour");
-                                       msg.set_position (Gtk::WIN_POS_MOUSE);
-                                       
-                                       switch (msg.run()) {
-                                       case RESPONSE_YES:
-                                               load_session (session_path, session_name);
-                                               goto done;
-                                               break;
-                                       default:
-                                               response = RESPONSE_NONE;
-                                               new_session_dialog->reset ();
-                                               continue;
-                                       }
-                               }
+               if (likely_new && template_name.empty()) {
+                       
+                       ret = build_session_from_nsd (session_path, session_name);
 
-                               _session_is_new = true;
+               } else {
 
-                               std::string template_name = new_session_dialog->session_template_name();
-                                               
-                               if (new_session_dialog->use_session_template()) {
-                                                       
-                                       load_session (session_path, session_name, &template_name);
-                         
-                               } else {
-                                                       
-                                       uint32_t cchns;
-                                       uint32_t mchns;
-                                       AutoConnectOption iconnect;
-                                       AutoConnectOption oconnect;
-                                                       
-                                       if (new_session_dialog->create_control_bus()) {
-                                               cchns = (uint32_t) new_session_dialog->control_channel_count();
-                                       } else {
-                                               cchns = 0;
-                                       }
-                                                       
-                                       if (new_session_dialog->create_master_bus()) {
-                                               mchns = (uint32_t) new_session_dialog->master_channel_count();
-                                       } else {
-                                               mchns = 0;
-                                       }
-                                                       
-                                       if (new_session_dialog->connect_inputs()) {
-                                               iconnect = AutoConnectPhysical;
-                                       } else {
-                                               iconnect = AutoConnectOption (0);
-                                       }
-                                                       
-                                       /// @todo some minor tweaks.
-                                                       
-                                       if (new_session_dialog->connect_outs_to_master()) {
-                                               oconnect = AutoConnectMaster;
-                                       } else if (new_session_dialog->connect_outs_to_physical()) {
-                                               oconnect = AutoConnectPhysical;
-                                       } else {
-                                               oconnect = AutoConnectOption (0);
-                                       } 
-                                                       
-                                       uint32_t nphysin = (uint32_t) new_session_dialog->input_limit_count();
-                                       uint32_t nphysout = (uint32_t) new_session_dialog->output_limit_count();
-                                                       
-                                       if (build_session (session_path,
-                                                          session_name,
-                                                          cchns,
-                                                          mchns,
-                                                          iconnect,
-                                                          oconnect,
-                                                          nphysin,
-                                                          nphysout, 
-                                                          engine->frame_rate() * 60 * 5)) {
-
-                                               response = Gtk::RESPONSE_NONE;
-                                               new_session_dialog->reset ();
-                                               continue;
-                                       }
-                               }
-                       }
+                       ret = load_session (session_path, session_name, template_name);
                }
-               
-       } while (response == Gtk::RESPONSE_NONE);
-
-  done:
-       show();
-       new_session_dialog->get_window()->set_cursor();
-       new_session_dialog->hide();
-       return true;
-}
+       }
+       
+       return ret;
+}      
 
 void
 ARDOUR_UI::close_session()
 {
-       unload_session();
-       new_session ();
+       if (!check_audioengine()) {
+               return;
+       }
+
+       unload_session (true);
+
+       get_session_parameters (false);
 }
 
 int
-ARDOUR_UI::load_session (const string & path, const string & snap_name, string* mix_template)
+ARDOUR_UI::load_session (const Glib::ustring& path, const Glib::ustring& snap_name, Glib::ustring mix_template)
 {
        Session *new_session;
-       int x;
+       int unload_status;
+       int retval = -1;
+
        session_loaded = false;
-       
-       x = unload_session ();
 
-       if (x < 0) {
+       if (!check_audioengine()) {
                return -1;
-       } else if (x > 0) {
-               return 0;
+       }
+
+       unload_status = unload_session ();
+
+       if (unload_status < 0) {
+               goto out;
+       } else if (unload_status > 0) {
+               retval = 0;
+               goto out;
        }
 
        /* if it already exists, we must have write access */
 
-       if (::access (path.c_str(), F_OK) == 0 && ::access (path.c_str(), W_OK)) {
+       if (Glib::file_test (path.c_str(), Glib::FILE_TEST_EXISTS) && ::access (path.c_str(), W_OK)) {
                MessageDialog msg (*editor, _("You do not have write access to this session.\n"
                                              "This prevents the session from being loaded."));
+               pop_back_splash ();
                msg.run ();
-               return -1;
+               goto out;
        }
 
+       loading_message (_("Please wait while Ardour loads your session"));
+
        try {
                new_session = new Session (*engine, path, snap_name, mix_template);
        }
 
+       /* this one is special */
+
+       catch (AudioEngine::PortRegistrationFailure& err) {
+
+               MessageDialog msg (err.what(),
+                                  true,
+                                  Gtk::MESSAGE_INFO,
+                                  Gtk::BUTTONS_CLOSE);
+               
+               msg.set_title (_("Port Registration Error"));
+               msg.set_secondary_text (_("Click the Close button to try again."));
+               msg.set_position (Gtk::WIN_POS_CENTER);
+               pop_back_splash ();
+               msg.present ();
+
+               int response = msg.run ();
+
+               msg.hide ();
+
+               switch (response) {
+               case RESPONSE_CANCEL:
+                       exit (1);
+               default:
+                       break;
+               }
+               goto out;
+       }
+
        catch (...) {
 
-               error << string_compose(_("Session \"%1 (snapshot %2)\" did not load successfully"), path, snap_name) << endmsg;
-               return -1;
+               MessageDialog msg (string_compose(_("Session \"%1 (snapshot %2)\" did not load successfully"), path, snap_name),
+                                  true,
+                                  Gtk::MESSAGE_INFO,
+                                  Gtk::BUTTONS_CLOSE);
+               
+               msg.set_title (_("Loading Error"));
+               msg.set_secondary_text (_("Click the Close button to try again."));
+               msg.set_position (Gtk::WIN_POS_CENTER);
+               pop_back_splash ();
+               msg.present ();
+
+               int response = msg.run ();
+
+               msg.hide ();
+
+               switch (response) {
+               case RESPONSE_CANCEL:
+                       exit (1);
+               default:
+                       break;
+               }
+               goto out;
        }
 
        connect_to_session (new_session);
 
-       Config->set_current_owner (ConfigVariableBase::Interface);
-
        session_loaded = true;
        
        goto_editor_window ();
@@ -2024,12 +2472,15 @@ ARDOUR_UI::load_session (const string & path, const string & snap_name, string*
                session->set_clean ();
        }
 
-       editor->edit_cursor_position (true);
-       return 0;
+       flush_pending ();
+       retval = 0;
+
+  out:
+       return retval;
 }
 
 int
-ARDOUR_UI::build_session (const string & path, const string & snap_name, 
+ARDOUR_UI::build_session (const Glib::ustring& path, const Glib::ustring& snap_name, 
                          uint32_t control_channels,
                          uint32_t master_channels, 
                          AutoConnectOption input_connect,
@@ -2041,8 +2492,14 @@ ARDOUR_UI::build_session (const string & path, const string & snap_name,
        Session *new_session;
        int x;
 
+       if (!check_audioengine()) {
+               return -1;
+       }
+
        session_loaded = false;
+
        x = unload_session ();
+
        if (x < 0) {
                return -1;
        } else if (x > 0) {
@@ -2059,6 +2516,7 @@ ARDOUR_UI::build_session (const string & path, const string & snap_name,
        catch (...) {
 
                MessageDialog msg (string_compose(_("Could not create session in \"%1\""), path));
+               pop_back_splash ();
                msg.run ();
                return -1;
        }
@@ -2066,6 +2524,9 @@ ARDOUR_UI::build_session (const string & path, const string & snap_name,
        connect_to_session (new_session);
 
        session_loaded = true;
+
+       new_session->save_state(new_session->name());
+
        return 0;
 }
 
@@ -2084,28 +2545,54 @@ ARDOUR_UI::show ()
 }
 
 void
-ARDOUR_UI::show_splash ()
+ARDOUR_UI::show_about ()
 {
        if (about == 0) {
-               about = new About();
+               about = new About;
                about->signal_response().connect(mem_fun (*this, &ARDOUR_UI::about_signal_response) );
        }
-       about->present();
-       flush_pending ();
+
+       about->show_all ();
+}
+
+void
+ARDOUR_UI::hide_about ()
+{
+       if (about) {
+               about->get_window()->set_cursor ();
+               about->hide ();
+       }
 }
 
 void
 ARDOUR_UI::about_signal_response(int response)
 {
-       hide_splash();
+       hide_about();
+}
+
+void
+ARDOUR_UI::show_splash ()
+{
+       if (splash == 0) {
+               try {
+                       splash = new Splash;
+               } catch (...) {
+                       return;
+               }
+       }
+
+       splash->show ();
+       splash->present ();
+       splash->queue_draw ();
+       splash->get_window()->process_updates (true);
+       flush_pending ();
 }
 
 void
 ARDOUR_UI::hide_splash ()
 {
-       if (about) {
-               about->get_window()->set_cursor ();
-               about->hide();
+       if (splash) {
+               splash->hide();
        }
 }
 
@@ -2165,17 +2652,19 @@ 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();
+
        if (rep.space < 1048576.0f) {
                if (removed > 1) {
-                 txt.set_text (string_compose (msg, removed, _("files were"), session->path() + "dead_sounds", (float) rep.space / 1024.0f, "kilo"));
+                       txt.set_text (string_compose (msg, removed, _("files were"), dead_sound_directory, (float) rep.space / 1024.0f, "kilo"));
                } else {
-                       txt.set_text (string_compose (msg, removed, _("file was"), session->path() + "dead_sounds", (float) rep.space / 1024.0f, "kilo"));
+                       txt.set_text (string_compose (msg, removed, _("file was"), dead_sound_directory, (float) rep.space / 1024.0f, "kilo"));
                }
        } else {
                if (removed > 1) {
-                       txt.set_text (string_compose (msg, removed, _("files were"), session->path() + "dead_sounds", (float) rep.space / 1048576.0f, "mega"));
+                       txt.set_text (string_compose (msg, removed, _("files were"), dead_sound_directory, (float) rep.space / 1048576.0f, "mega"));
                } else {
-                       txt.set_text (string_compose (msg, removed, _("file was"), session->path() + "dead_sounds", (float) rep.space / 1048576.0f, "mega"));
+                       txt.set_text (string_compose (msg, removed, _("file was"), dead_sound_directory, (float) rep.space / 1048576.0f, "mega"));
                }
        }
 
@@ -2200,7 +2689,16 @@ require some unused files to continue to exist."));
        results.add_button (Stock::CLOSE, RESPONSE_CLOSE);
        results.set_default_response (RESPONSE_CLOSE);
        results.set_position (Gtk::WIN_POS_MOUSE);
-       results.show_all_children ();
+
+       results_display.show();
+       list_scroller.show();
+       txt.show();
+       dvbox.show();
+       dhbox.show();
+       ddhbox.show();
+       dimage->show();
+
+       //results.get_vbox()->show();
        results.set_resizable (false);
 
        results.run ();
@@ -2253,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, 
@@ -2268,8 +2769,6 @@ release an additional\n\
 %4 %5bytes of disk space.\n"
                                         ));
 
-
-
 }
 
 void
@@ -2330,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 ();
@@ -2338,13 +2844,13 @@ 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().get(DataType::AUDIO) : input_chan);
+               output_chan = (session->master_out() ? session->master_out()->n_inputs().n_audio() : input_chan);
        } else {
                output_chan = input_chan;
        }
 
        /* XXX do something with name template */
-
+       
        if (add_route_dialog->type() == ARDOUR::DataType::MIDI) {
                if (track) {
                        session_add_midi_track(count);
@@ -2369,9 +2875,9 @@ ARDOUR_UI::mixer_settings () const
        XMLNode* node = 0;
 
        if (session) {
-               node = session->instant_xml(X_("Mixer"), session->path());
+               node = session->instant_xml(X_("Mixer"));
        } else {
-               node = Config->instant_xml(X_("Mixer"), get_user_ardour_path());
+               node = Config->instant_xml(X_("Mixer"));
        }
 
        if (!node) {
@@ -2387,14 +2893,21 @@ ARDOUR_UI::editor_settings () const
        XMLNode* node = 0;
 
        if (session) {
-               node = session->instant_xml(X_("Editor"), session->path());
+               node = session->instant_xml(X_("Editor"));
        } else {
-               node = Config->instant_xml(X_("Editor"), get_user_ardour_path());
+               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;
 }
 
@@ -2412,30 +2925,104 @@ 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, X_("diskrate dialog"), _("\
+               MessageDialog* msg = new MessageDialog (*editor, _("\
 The disk system on your computer\n\
 was not able to keep up with Ardour.\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));
-               msg->show_all ();
+               msg->show ();
        }
 }
 
@@ -2444,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,
@@ -2453,7 +3042,7 @@ was not able to keep up with Ardour.\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));
-               msg->show_all ();
+               msg->show ();
        } 
 }
 
@@ -2464,10 +3053,30 @@ 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 ()
 {
-       ArdourDialog dialog ("pending state dialog");
+       HBox* hbox = new HBox();
+       Image* image = new Image (Stock::DIALOG_QUESTION, ICON_SIZE_DIALOG);
+       ArdourDialog dialog (_("Crash Recovery"), true);
        Label  message (_("\
 This session appears to have been in\n\
 middle of recording when ardour or\n\
@@ -2476,14 +3085,18 @@ the computer was shutdown.\n\
 Ardour can recover any captured audio for\n\
 you, or it can ignore it. Please decide\n\
 what you would like to do.\n"));
-
-       dialog.get_vbox()->pack_start (message);
-       dialog.add_button (_("Recover from crash"), RESPONSE_ACCEPT);
+       image->set_alignment(ALIGN_CENTER, ALIGN_TOP);
+       hbox->pack_start (*image, PACK_EXPAND_WIDGET, 12);
+       hbox->pack_end (message, PACK_EXPAND_PADDING, 12);
+       dialog.get_vbox()->pack_start(*hbox, PACK_EXPAND_PADDING, 6);
        dialog.add_button (_("Ignore crash data"), RESPONSE_REJECT);
-
+       dialog.add_button (_("Recover from crash"), RESPONSE_ACCEPT);
+       dialog.set_default_response (RESPONSE_ACCEPT);
        dialog.set_position (WIN_POS_CENTER);
-       dialog.show_all ();
-       
+       message.show();
+       image->show();
+       hbox->show();
+
        switch (dialog.run ()) {
        case RESPONSE_ACCEPT:
                return 1;
@@ -2491,6 +3104,38 @@ what you would like to do.\n"));
                return 0;
        }
 }
+
+int
+ARDOUR_UI::sr_mismatch_dialog (nframes_t desired, nframes_t actual)
+{
+       HBox* hbox = new HBox();
+       Image* image = new Image (Stock::DIALOG_QUESTION, ICON_SIZE_DIALOG);
+       ArdourDialog dialog (_("Sample Rate Mismatch"), true);
+       Label  message (string_compose (_("\
+This session was created with a sample rate of %1 Hz\n\
+\n\
+The audioengine is currently running at %2 Hz\n"), desired, actual));
+
+       image->set_alignment(ALIGN_CENTER, ALIGN_TOP);
+       hbox->pack_start (*image, PACK_EXPAND_WIDGET, 12);
+       hbox->pack_end (message, PACK_EXPAND_PADDING, 12);
+       dialog.get_vbox()->pack_start(*hbox, PACK_EXPAND_PADDING, 6);
+       dialog.add_button (_("Do not load session"), RESPONSE_REJECT);
+       dialog.add_button (_("Load session anyway"), RESPONSE_ACCEPT);
+       dialog.set_default_response (RESPONSE_ACCEPT);
+       dialog.set_position (WIN_POS_CENTER);
+       message.show();
+       image->show();
+       hbox->show();
+
+       switch (dialog.run ()) {
+       case RESPONSE_ACCEPT:
+               return 0;
+       default:
+               return 1;
+       }
+}
+
        
 void
 ARDOUR_UI::disconnect_from_jack ()
@@ -2518,38 +3163,23 @@ ARDOUR_UI::reconnect_to_jack ()
        }
 }
 
-int
-ARDOUR_UI::cmdline_new_session (string path)
-{
-       if (path[0] != '/') {
-               char buf[PATH_MAX+1];
-               string str;
-
-               getcwd (buf, sizeof (buf));
-               str = buf;
-               str += '/';
-               str += path;
-               path = str;
-       }
-
-       new_session (path);
-
-       _will_create_new_session_automatically = false; /* done it */
-       return FALSE; /* don't call it again */
-}
-
 void
 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;
        case FormatInt24:
                act = ActionManager::get_action (X_("options"), X_("FileDataFormat24bit"));
                break;
+       case FormatInt16:
+               act = ActionManager::get_action (X_("options"), X_("FileDataFormat16bit"));
+               break;
        }
 
        if (act) {
@@ -2557,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;
@@ -2595,8 +3225,17 @@ ARDOUR_UI::use_config ()
 void
 ARDOUR_UI::update_transport_clocks (nframes_t pos)
 {
-       primary_clock.set (pos);
-       secondary_clock.set (pos);
+       if (Config->get_primary_clock_delta_edit_cursor()) {
+               primary_clock.set (pos, false, editor->get_preferred_edit_position(), 1);
+       } else {
+               primary_clock.set (pos, 0, true);
+       }
+
+       if (Config->get_secondary_clock_delta_edit_cursor()) {
+               secondary_clock.set (pos, false, editor->get_preferred_edit_position(), 2);
+       } else {
+               secondary_clock.set (pos);
+       }
 
        if (big_clock_window) {
                big_clock.set (pos);
@@ -2613,34 +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 (keybindings_path);
-       } 
-}
-
 bool
 ARDOUR_UI::first_idle ()
 {
-       can_save_keybindings = true;
+       if (session) {
+               session->allow_auto_play (true);
+       }
+
+       if (editor) {
+               editor->first_idle();
+       }
+
+       Keyboard::set_can_save_keybindings (true);
        return false;
 }
 
@@ -2690,7 +3323,7 @@ ARDOUR_UI::TransportControllable::set_value (float val)
                return;
        }
 
-       char *action = 0;
+       const char *action = 0;
 
        switch (type) {
        case Roll:
@@ -2763,3 +3396,18 @@ ARDOUR_UI::TransportControllable::set_id (const string& str)
 {
        _id = str;
 }
+
+void
+ARDOUR_UI::setup_profile ()
+{
+       if (gdk_screen_width() < 1200) {
+               Profile->set_small_screen ();
+       }
+
+
+       if (getenv ("ARDOUR_SAE")) {
+               Profile->set_sae ();
+               Profile->set_single_package ();
+       }
+}
+