Change ARDOUR::init return type to bool type for success/failure
[ardour.git] / gtk2_ardour / ardour_ui.cc
index ed64f062c8c209d3f7103dd36eb17ea575ae6285..86e838d122357f5c55b710512932a52c21dc1892 100644 (file)
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 1999-2007 Paul Davis
+    Copyright (C) 1999-2013 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
 #include "gtk2ardour-config.h"
 #endif
 
-#include <stdint.h>
-
 #include <algorithm>
 #include <cmath>
+#include <iostream>
+#include <cerrno>
+#include <fstream>
+
+#include <stdint.h>
 #include <fcntl.h>
 #include <signal.h>
 #include <unistd.h>
 #include <time.h>
-#include <cerrno>
-#include <fstream>
-
-#include <iostream>
 
 #include <sys/resource.h>
+#include <sys/types.h>
+#include <sys/sysctl.h>
 
 #include <gtkmm/messagedialog.h>
 #include <gtkmm/accelmap.h>
 #include "midi++/manager.h"
 
 #include "ardour/ardour.h"
-#include "ardour/callback.h"
+#include "ardour/audioengine.h"
+#include "ardour/audiofilesource.h"
+#include "ardour/automation_watch.h"
+#include "ardour/diskstream.h"
+#include "ardour/filename_extensions.h"
+#include "ardour/filesystem_paths.h"
+#include "ardour/port.h"
+#include "ardour/process_thread.h"
 #include "ardour/profile.h"
-#include "ardour/plugin_manager.h"
+#include "ardour/recent_sessions.h"
 #include "ardour/session_directory.h"
 #include "ardour/session_route.h"
 #include "ardour/session_state_utils.h"
 #include "ardour/session_utils.h"
-#include "ardour/port.h"
-#include "ardour/audioengine.h"
-#include "ardour/playlist.h"
-#include "ardour/utils.h"
-#include "ardour/audio_diskstream.h"
-#include "ardour/audiofilesource.h"
-#include "ardour/recent_sessions.h"
-#include "ardour/port.h"
-#include "ardour/audio_track.h"
-#include "ardour/midi_track.h"
-#include "ardour/filesystem_paths.h"
-#include "ardour/filename_extensions.h"
-#include "ardour/process_thread.h"
+#include "ardour/slave.h"
+
+#include "timecode/time.h"
 
 typedef uint64_t microseconds_t;
 
@@ -89,6 +87,7 @@ typedef uint64_t microseconds_t;
 #include "ambiguous_file_dialog.h"
 #include "ardour_ui.h"
 #include "audio_clock.h"
+#include "big_clock_window.h"
 #include "bundle_manager.h"
 #include "engine_dialog.h"
 #include "gain_meter.h"
@@ -96,16 +95,23 @@ typedef uint64_t microseconds_t;
 #include "gui_object.h"
 #include "gui_thread.h"
 #include "keyboard.h"
+#include "keyeditor.h"
 #include "location_ui.h"
+#include "main_clock.h"
 #include "missing_file_dialog.h"
 #include "missing_plugin_dialog.h"
 #include "mixer_ui.h"
+#include "mouse_cursors.h"
 #include "opts.h"
+#include "pingback.h"
 #include "processor_box.h"
 #include "prompter.h"
 #include "public_editor.h"
+#include "rc_option_editor.h"
 #include "route_time_axis.h"
+#include "route_params_ui.h"
 #include "session_metadata_dialog.h"
+#include "session_option_editor.h"
 #include "shuttle_control.h"
 #include "speaker_dialog.h"
 #include "splash.h"
@@ -113,7 +119,10 @@ typedef uint64_t microseconds_t;
 #include "theme_manager.h"
 #include "time_axis_view_item.h"
 #include "utils.h"
-#include "window_proxy.h"
+#include "video_server_dialog.h"
+#include "add_video_dialog.h"
+#include "transcode_video_dialog.h"
+#include "system_exec.h"
 
 #include "i18n.h"
 
@@ -121,6 +130,7 @@ using namespace ARDOUR;
 using namespace PBD;
 using namespace Gtkmm2ext;
 using namespace Gtk;
+using namespace std;
 
 ARDOUR_UI *ARDOUR_UI::theArdourUI = 0;
 UIConfiguration *ARDOUR_UI::ui_config = 0;
@@ -129,20 +139,29 @@ sigc::signal<void,bool> ARDOUR_UI::Blink;
 sigc::signal<void>      ARDOUR_UI::RapidScreenUpdate;
 sigc::signal<void>      ARDOUR_UI::SuperRapidScreenUpdate;
 sigc::signal<void, framepos_t, bool, framepos_t> ARDOUR_UI::Clock;
+sigc::signal<void>      ARDOUR_UI::CloseAllDialogs;
 
-bool could_be_a_valid_path (const string& path);
-
-ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
+ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
 
        : Gtkmm2ext::UI (PROGRAM_NAME, argcp, argvp)
-
+       
        , gui_object_state (new GUIObjectState)
-       , primary_clock (new AudioClock (X_("primary"), false, X_("TransportClockDisplay"), true, true, false, true))
-       , secondary_clock (new AudioClock (X_("secondary"), false, X_("SecondaryClockDisplay"), true, true, false, true))
+
+       , primary_clock (new MainClock (X_("primary"), false, X_("transport"), true, true, true, false, true))
+       , secondary_clock (new MainClock (X_("secondary"), false, X_("secondary"), true, true, false, false, true))
 
          /* big clock */
 
-       , big_clock (new AudioClock (X_("bigclock"), false, "BigClockNonRecording", true, true, false, false))
+       , big_clock (new AudioClock (X_("bigclock"), false, "big", true, true, false, false))
+       , video_timeline(0)
+
+         /* start of private members */
+
+       , _startup (0)
+       , engine (0)
+       , nsm (0)
+       , _was_dirty (false)
+       , _mixer_on_top (false)
 
          /* transport */
 
@@ -155,71 +174,61 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
        , rec_controllable (new TransportControllable ("transport rec-enable", *this, TransportControllable::RecordEnable))
 
        , auto_return_button (ArdourButton::led_default_elements)
-       , auto_play_button (ArdourButton::led_default_elements)
+       , follow_edits_button (ArdourButton::led_default_elements)
        , auto_input_button (ArdourButton::led_default_elements)
 
        , auditioning_alert_button (_("audition"))
        , solo_alert_button (_("solo"))
        , feedback_alert_button (_("feedback"))
 
+       , editor_meter(0)
+       , editor_meter_peak_display()
+
+       , speaker_config_window (X_("speaker-config"), _("Speaker Configuration"))
+       , theme_manager (X_("theme-manager"), _("Theme Manager"))
+       , key_editor (X_("key-editor"), _("Key Bindings"))
+       , rc_option_editor (X_("rc-options-editor"), _("Preferences"))
+       , add_route_dialog (X_("add-routes"), _("Add Tracks/Busses"))
+       , about (X_("about"), _("About"))
+       , location_ui (X_("locations"), _("Locations"))
+       , route_params (X_("inspector"), _("Tracks and Busses"))
+       , session_option_editor (X_("session-options-editor"), _("Properties"), boost::bind (&ARDOUR_UI::create_session_option_editor, this))
+       , add_video_dialog (X_("add-video"), _("Add Tracks/Busses"), boost::bind (&ARDOUR_UI::create_add_video_dialog, this))
+       , bundle_manager (X_("bundle-manager"), _("Bundle Manager"), boost::bind (&ARDOUR_UI::create_bundle_manager, this))
+       , big_clock_window (X_("big-clock"), _("Big Clock"), boost::bind (&ARDOUR_UI::create_big_clock_window, this))
+       , audio_port_matrix (X_("audio-connection-manager"), _("Audio Connections"), boost::bind (&ARDOUR_UI::create_global_port_matrix, this, ARDOUR::DataType::AUDIO))
+       , midi_port_matrix (X_("midi-connection-manager"), _("MIDI Connections"), boost::bind (&ARDOUR_UI::create_global_port_matrix, this, ARDOUR::DataType::MIDI))
+
        , error_log_button (_("Errors"))
 
        , _status_bar_visibility (X_("status-bar"))
        , _feedback_exists (false)
 
 {
-       using namespace Gtk::Menu_Helpers;
-
-       Gtkmm2ext::init();
-
+       Gtkmm2ext::init(localedir);
 
-#ifdef TOP_MENUBAR
-       // _auto_display_errors = false;
-       /*
-        * This was commented out as it wasn't defined
-        * in A3 IIRC.  If this is not needed it should
-        * be completely removed.
-        */
-#endif
-
-       about = 0;
        splash = 0;
-       _startup = 0;
 
        if (theArdourUI == 0) {
                theArdourUI = this;
        }
 
        ui_config = new UIConfiguration();
-       theme_manager = new ThemeManager();
-
-       key_editor = 0;
 
        editor = 0;
        mixer = 0;
+       meterbridge = 0;
        editor = 0;
        engine = 0;
        _session_is_new = false;
-       big_clock_window = 0;
-       big_clock_height = 0;
-       big_clock_resize_in_progress = false;
        session_selector_window = 0;
        last_key_press_time = 0;
-       _will_create_new_session_automatically = false;
-       add_route_dialog = 0;
-       route_params = 0;
-       bundle_manager = 0;
-       rc_option_editor = 0;
-       session_option_editor = 0;
-       location_ui = 0;
+       video_server_process = 0;
        open_session_selector = 0;
        have_configure_timeout = false;
        have_disk_speed_dialog_displayed = false;
        session_loaded = false;
        ignore_dual_punch = false;
-       original_big_clock_width = -1;
-       original_big_clock_height = -1;
-       original_big_clock_font_size = 0;
 
        roll_button.set_controllable (roll_controllable);
        stop_button.set_controllable (stop_controllable);
@@ -236,7 +245,6 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
        auto_loop_button.set_name ("transport button");
        play_selection_button.set_name ("transport button");
        rec_button.set_name ("transport recenable button");
-       join_play_range_button.set_name ("transport button");
        midi_panic_button.set_name ("transport button");
 
        goto_start_button.set_tweaks (ArdourButton::ShowClick);
@@ -249,9 +257,11 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
        ARDOUR::Diskstream::DiskOverrun.connect (forever_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::disk_overrun_handler, this), gui_context());
        ARDOUR::Diskstream::DiskUnderrun.connect (forever_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::disk_underrun_handler, this), gui_context());
 
+       ARDOUR::Session::VersionMismatch.connect (forever_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::session_format_mismatch, this, _1, _2), gui_context());
+
        /* handle dialog requests */
 
-       ARDOUR::Session::Dialog.connect (forever_connections, MISSING_INVALIDATOR, ui_bind (&ARDOUR_UI::session_dialog, this, _1), gui_context());
+       ARDOUR::Session::Dialog.connect (forever_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::session_dialog, this, _1), gui_context());
 
        /* handle pending state with a dialog (PROBLEM: needs to return a value and thus cannot be x-thread) */
 
@@ -263,12 +273,12 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
 
        /* handle requests to quit (coming from JACK session) */
 
-       ARDOUR::Session::Quit.connect (forever_connections, MISSING_INVALIDATOR, ui_bind (&ARDOUR_UI::finish, this), gui_context ());
+       ARDOUR::Session::Quit.connect (forever_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::finish, this), gui_context ());
 
        /* tell the user about feedback */
 
-       ARDOUR::Session::FeedbackDetected.connect (forever_connections, MISSING_INVALIDATOR, ui_bind (&ARDOUR_UI::feedback_detected, this), gui_context ());
-       ARDOUR::Session::SuccessfulGraphSort.connect (forever_connections, MISSING_INVALIDATOR, ui_bind (&ARDOUR_UI::successful_graph_sort, this), gui_context ());
+       ARDOUR::Session::FeedbackDetected.connect (forever_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::feedback_detected, this), gui_context ());
+       ARDOUR::Session::SuccessfulGraphSort.connect (forever_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::successful_graph_sort, this), gui_context ());
 
        /* handle requests to deal with missing files */
 
@@ -281,16 +291,13 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
        /* lets get this party started */
 
        try {
-               if (ARDOUR::init (ARDOUR_COMMAND_LINE::use_vst, ARDOUR_COMMAND_LINE::try_hw_optimization)) {
+               if (!ARDOUR::init (ARDOUR_COMMAND_LINE::use_vst, ARDOUR_COMMAND_LINE::try_hw_optimization, localedir)) {
                        throw failed_constructor ();
                }
 
                setup_gtk_ardour_enums ();
                setup_profile ();
 
-               GainMeter::setup_slider_pix ();
-               RouteTimeAxisView::setup_slider_pix ();
-               SendProcessorEntry::setup_slider_pix ();
                SessionEvent::create_per_thread_pool ("GUI", 512);
 
        } catch (failed_constructor& err) {
@@ -315,26 +322,53 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
 
        TimeAxisViewItem::set_constant_heights ();
 
-       /* The following must happen after ARDOUR::init() so that Config is set up */
-
-       location_ui = new ActionWindowProxy<LocationUIWindow> (X_("locations"), Config->extra_xml (X_("UI")), X_("ToggleLocations"));
-       big_clock_window = new ActionWindowProxy<Gtk::Window> (X_("bigclock"), Config->extra_xml (X_("UI")), X_("ToggleBigClock"));
-       speaker_config_window = new ActionWindowProxy<SpeakerDialog> (X_("speakerconf"), Config->extra_xml (X_("UI")), X_("toggle-speaker-config"));
-
-       for (ARDOUR::DataType::iterator i = ARDOUR::DataType::begin(); i != ARDOUR::DataType::end(); ++i) {
-               _global_port_matrix[*i] = new ActionWindowProxy<GlobalPortMatrixWindow> (
-                       string_compose ("GlobalPortMatrix-%1", (*i).to_string()),
-                       Config->extra_xml (X_("UI")),
-                       string_compose ("toggle-%1-connection-manager", (*i).to_string())
-                       );
-       }
+        /* Set this up so that our window proxies can register actions */
 
-       setup_clock ();
+       ActionManager::init ();
 
-       SpeakerDialog* s = new SpeakerDialog ();
-       s->signal_unmap().connect (sigc::bind (sigc::ptr_fun (&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/toggle-speaker-config")));
-       speaker_config_window->set (s);
+       /* The following must happen after ARDOUR::init() so that Config is set up */
 
+       const XMLNode* ui_xml = Config->extra_xml (X_("UI"));
+
+       if (ui_xml) {
+               theme_manager.set_state (*ui_xml);
+               key_editor.set_state (*ui_xml);
+               rc_option_editor.set_state (*ui_xml);
+               session_option_editor.set_state (*ui_xml);
+               speaker_config_window.set_state (*ui_xml);
+               about.set_state (*ui_xml);
+               add_route_dialog.set_state (*ui_xml);
+               add_video_dialog.set_state (*ui_xml);
+               route_params.set_state (*ui_xml);
+               bundle_manager.set_state (*ui_xml);
+               location_ui.set_state (*ui_xml);
+               big_clock_window.set_state (*ui_xml);
+               audio_port_matrix.set_state (*ui_xml);
+               midi_port_matrix.set_state (*ui_xml);
+       }
+
+       WM::Manager::instance().register_window (&theme_manager);
+       WM::Manager::instance().register_window (&key_editor);
+       WM::Manager::instance().register_window (&rc_option_editor);
+       WM::Manager::instance().register_window (&session_option_editor);
+       WM::Manager::instance().register_window (&speaker_config_window);
+       WM::Manager::instance().register_window (&about);
+       WM::Manager::instance().register_window (&add_route_dialog);
+       WM::Manager::instance().register_window (&add_video_dialog);
+       WM::Manager::instance().register_window (&route_params);
+       WM::Manager::instance().register_window (&bundle_manager);
+       WM::Manager::instance().register_window (&location_ui);
+       WM::Manager::instance().register_window (&big_clock_window);
+       WM::Manager::instance().register_window (&audio_port_matrix);
+       WM::Manager::instance().register_window (&midi_port_matrix);
+
+       /* We need to instantiate the theme manager because it loads our
+          theme files. This should really change so that its window
+          and its functionality are separate 
+       */
+       
+       (void) theme_manager.get (true);
+       
        starting.connect (sigc::mem_fun(*this, &ARDOUR_UI::startup));
        stopping.connect (sigc::mem_fun(*this, &ARDOUR_UI::shutdown));
 
@@ -344,35 +378,13 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
        DPIReset.connect (sigc::mem_fun (*this, &ARDOUR_UI::resize_text_widgets));
 }
 
-/** @return true if a session was chosen and `apply' clicked, otherwise false if `cancel' was clicked */
-bool
-ARDOUR_UI::run_startup (bool should_be_new, string load_template)
+GlobalPortMatrixWindow*
+ARDOUR_UI::create_global_port_matrix (ARDOUR::DataType type)
 {
-       delete _startup;
-       _startup = new ArdourStartup ();
-
-       XMLNode* audio_setup = Config->extra_xml ("AudioSetup");
-
-       if (audio_setup && _startup->engine_control()) {
-               _startup->engine_control()->set_state (*audio_setup);
-       }
-
-       _startup->set_new_only (should_be_new);
-       if (!load_template.empty()) {
-               _startup->set_load_template( load_template );
-       }
-       _startup->present ();
-
-       main().run();
-
-       _startup->hide ();
-
-       switch (_startup->response()) {
-       case RESPONSE_OK:
-               return true;
-       default:
-               return false;
+       if (!_session) {
+               return 0;
        }
+       return new GlobalPortMatrixWindow (_session, type);
 }
 
 int
@@ -396,7 +408,7 @@ ARDOUR_UI::create_engine ()
 
        engine->Stopped.connect (forever_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::engine_stopped, this), gui_context());
        engine->Running.connect (forever_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::engine_running, this), gui_context());
-       engine->SampleRateChanged.connect (forever_connections, MISSING_INVALIDATOR, ui_bind (&ARDOUR_UI::update_sample_rate, this, _1), gui_context());
+       engine->SampleRateChanged.connect (forever_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::update_sample_rate, this, _1), gui_context());
 
        engine->Halted.connect_same_thread (forever_connections, boost::bind (&ARDOUR_UI::engine_halted, this, _1, false));
 
@@ -415,12 +427,10 @@ ARDOUR_UI::post_engine ()
 
        ARDOUR::init_post_engine ();
 
-       /* load up the UI manager */
-
-       ActionManager::init ();
-
        _tooltips.enable();
 
+       ActionManager::load_menus ();
+
        if (setup_windows ()) {
                throw failed_constructor ();
        }
@@ -447,7 +457,7 @@ ARDOUR_UI::post_engine ()
                vector<string>::iterator n;
                vector<string>::iterator k;
                for (n = names.begin(), k = keys.begin(); n != names.end(); ++n, ++k) {
-                       cerr << "Action: " << (*n) << " bound to " << (*k) << endl;
+                       cout << "Action: " << (*n) << " bound to " << (*k) << endl;
                }
 
                exit (0);
@@ -475,14 +485,15 @@ ARDOUR_UI::post_engine ()
 #ifndef GTKOSX
        /* OS X provides a nearly-always visible wallclock, so don't be stupid */
        update_wall_clock ();
-       Glib::signal_timeout().connect (sigc::mem_fun(*this, &ARDOUR_UI::update_wall_clock), 60000);
+       Glib::signal_timeout().connect_seconds (sigc::mem_fun(*this, &ARDOUR_UI::update_wall_clock), 1);
 #endif
 
        update_disk_space ();
        update_cpu_load ();
        update_sample_rate (engine->frame_rate());
+       update_timecode_format ();
 
-       Config->ParameterChanged.connect (forever_connections, MISSING_INVALIDATOR, ui_bind (&ARDOUR_UI::parameter_changed, this, _1), gui_context());
+       Config->ParameterChanged.connect (forever_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::parameter_changed, this, _1), gui_context());
        boost::function<void (string)> pc (boost::bind (&ARDOUR_UI::parameter_changed, this, _1));
        Config->map_parameters (pc);
 
@@ -503,15 +514,16 @@ ARDOUR_UI::~ARDOUR_UI ()
        delete keyboard;
        delete editor;
        delete mixer;
-       delete add_route_dialog;
+       delete meterbridge;
+
+       stop_video_server();
 }
 
 void
-ARDOUR_UI::pop_back_splash ()
+ARDOUR_UI::pop_back_splash (Gtk::Window& win)
 {
        if (Splash::instance()) {
-               // Splash::instance()->pop_back();
-               Splash::instance()->hide ();
+               Splash::instance()->pop_back_for (win);
        }
 }
 
@@ -530,7 +542,6 @@ ARDOUR_UI::configure_timeout ()
                return true;
        } else {
                have_configure_timeout = false;
-               cerr << "config event-driven save\n";
                save_ardour_state ();
                return false;
        }
@@ -578,7 +589,6 @@ ARDOUR_UI::set_transport_controllable_state (const XMLNode& node)
        if ((prop = node.property ("shuttle")) != 0) {
                shuttle_box->controllable()->set_id (prop->value());
        }
-
 }
 
 XMLNode&
@@ -651,73 +661,97 @@ ARDOUR_UI::update_autosave ()
 }
 
 void
-ARDOUR_UI::backend_audio_error (bool we_set_params, Gtk::Window* toplevel)
+ARDOUR_UI::check_announcements ()
 {
-       string title;
-       if (we_set_params) {
-               title = string_compose (_("%1 could not start JACK"), PROGRAM_NAME);
-       } else {
-               title = string_compose (_("%1 could not connect to JACK."), PROGRAM_NAME);
-       }
-
-       MessageDialog win (title,
-                          false,
-                          Gtk::MESSAGE_INFO,
-                          Gtk::BUTTONS_NONE);
-
-       if (we_set_params) {
-               win.set_secondary_text(_("There are several possible reasons:\n\
-\n\
-1) You requested audio parameters that are not supported..\n\
-2) JACK is running as another user.\n\
-\n\
-Please consider the possibilities, and perhaps try different parameters."));
-       } else {
-               win.set_secondary_text(_("There are several possible reasons:\n\
-\n\
-1) JACK is not running.\n\
-2) JACK is running as another user, perhaps root.\n\
-3) There is already another client called \"ardour\".\n\
-\n\
-Please consider the possibilities, and perhaps (re)start JACK."));
-       }
+#ifdef PHONE_HOME
+       string _annc_filename;
 
-       if (toplevel) {
-               win.set_transient_for (*toplevel);
-       }
+#ifdef __APPLE__
+       _annc_filename = PROGRAM_NAME "_announcements_osx_";
+#else
+       _annc_filename = PROGRAM_NAME "_announcements_linux_";
+#endif
+       _annc_filename.append (VERSIONSTRING);
 
-       if (we_set_params) {
-               win.add_button (Stock::OK, RESPONSE_CLOSE);
-       } else {
-               win.add_button (Stock::QUIT, RESPONSE_CLOSE);
+       std::string path = Glib::build_filename (user_config_directory(), _annc_filename);
+       std::ifstream announce_file (path.c_str());
+       if ( announce_file.fail() )
+               _announce_string = "";
+       else {
+               std::stringstream oss;
+               oss << announce_file.rdbuf();
+               _announce_string = oss.str();
        }
 
-       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 ();
+       pingback (VERSIONSTRING, path);
+#endif
 }
 
 void
 ARDOUR_UI::startup ()
 {
        Application* app = Application::instance ();
-
+       char *nsm_url;
        app->ShouldQuit.connect (sigc::mem_fun (*this, &ARDOUR_UI::queue_finish));
        app->ShouldLoad.connect (sigc::mem_fun (*this, &ARDOUR_UI::idle_load));
 
-#ifdef PHONE_HOME
-       call_the_mothership (VERSIONSTRING);
-#endif
+       if (ARDOUR_COMMAND_LINE::check_announcements) {
+               check_announcements ();
+       }
 
        app->ready ();
 
-       if (get_session_parameters (true, ARDOUR_COMMAND_LINE::new_session, ARDOUR_COMMAND_LINE::load_template)) {
+       nsm_url = getenv ("NSM_URL");
+
+       if (nsm_url) {
+               nsm = new NSM_Client;
+               if (!nsm->init (nsm_url)) {
+                       nsm->announce (PROGRAM_NAME, ":dirty:", "ardour3");
+
+                       unsigned int i = 0;
+                       // wait for announce reply from nsm server
+                       for ( i = 0; i < 5000; ++i) {
+                               nsm->check ();
+                               usleep (i);
+                               if (nsm->is_active())
+                                       break;
+                       }
+                       // wait for open command from nsm server
+                       for ( i = 0; i < 5000; ++i) {
+                               nsm->check ();
+                               usleep (1000);
+                               if (nsm->client_id ())
+                                       break;
+                       }
+
+                       if (_session && nsm) {
+                               _session->set_nsm_state( nsm->is_active() );
+                       }
+
+                       // nsm requires these actions disabled
+                       vector<string> action_names;
+                       action_names.push_back("SaveAs");
+                       action_names.push_back("Rename");
+                       action_names.push_back("New");
+                       action_names.push_back("Open");
+                       action_names.push_back("Recent");
+                       action_names.push_back("Close");
+
+                       for (vector<string>::const_iterator n = action_names.begin(); n != action_names.end(); ++n) {
+                               Glib::RefPtr<Action> act = ActionManager::get_action (X_("Main"), (*n).c_str());
+                               if (act) {
+                                       act->set_sensitive (false);
+                               }
+                       }
+
+               }
+               else {
+                       delete nsm;
+                       nsm = 0;
+               }
+       }
+
+       else if (get_session_parameters (true, ARDOUR_COMMAND_LINE::new_session, ARDOUR_COMMAND_LINE::load_template)) {
                exit (1);
        }
 
@@ -725,14 +759,7 @@ ARDOUR_UI::startup ()
 
        goto_editor_window ();
 
-       /* Add the window proxies here; their addition may cause windows to be opened, and we want them
-          to be opened on top of the editor window that goto_editor_window() just opened.
-       */
-       add_window_proxy (location_ui);
-       add_window_proxy (big_clock_window);
-       for (ARDOUR::DataType::iterator i = ARDOUR::DataType::begin(); i != ARDOUR::DataType::end(); ++i) {
-               add_window_proxy (_global_port_matrix[*i]);
-       }
+       WM::Manager::instance().show_visible ();
 
        /* We have to do this here since goto_editor_window() ends up calling show_all() on the
         * editor window, and we may want stuff to be hidden.
@@ -764,8 +791,14 @@ ARDOUR_UI::check_memory_locking ()
                struct rlimit limits;
                int64_t ram;
                long pages, page_size;
-
-               if ((page_size = sysconf (_SC_PAGESIZE)) < 0 ||(pages = sysconf (_SC_PHYS_PAGES)) < 0) {
+#ifdef __FreeBSD__
+               size_t pages_len=sizeof(pages);
+               if ((page_size = getpagesize()) < 0 ||
+                               sysctlbyname("hw.availpages", &pages, &pages_len, NULL, 0))
+#else
+               if ((page_size = sysconf (_SC_PAGESIZE)) < 0 ||(pages = sysconf (_SC_PHYS_PAGES)) < 0)
+#endif
+               {
                        ram = 0;
                } else {
                        ram = (int64_t) pages * (int64_t) page_size;
@@ -785,22 +818,30 @@ ARDOUR_UI::check_memory_locking ()
                                                  "This might cause %1 to run out of memory before your system "
                                                  "runs out of memory. \n\n"
                                                  "You can view the memory limit with 'ulimit -l', "
-                                                 "and it is normally controlled by /etc/security/limits.conf"),
-                                               PROGRAM_NAME).c_str());
+                                                 "and it is normally controlled by %2"),
+                                               PROGRAM_NAME, 
+#ifdef __FreeBSD__
+                                               X_("/etc/login.conf")
+#else
+                                               X_(" /etc/security/limits.conf")
+#endif
+                                       ).c_str());
+
+                               msg.set_default_response (RESPONSE_OK);
 
                                VBox* vbox = msg.get_vbox();
                                HBox hbox;
                                CheckButton cb (_("Do not show this window again"));
 
                                cb.signal_toggled().connect (sigc::mem_fun (*this, &ARDOUR_UI::no_memory_warning));
-
+                               
                                hbox.pack_start (cb, true, false);
                                vbox->pack_start (hbox);
                                cb.show();
                                vbox->show();
                                hbox.show ();
 
-                               pop_back_splash ();
+                               pop_back_splash (msg);
 
                                editor->ensure_float (msg);
                                msg.run ();
@@ -828,12 +869,7 @@ void
 ARDOUR_UI::finish()
 {
        if (_session) {
-               int tries = 0;
-
-               if (_session->transport_rolling() && (++tries < 8)) {
-                       _session->request_stop (false, true);
-                       usleep (10000);
-               }
+               ARDOUR_UI::instance()->video_timeline->sync_session_state();
 
                if (_session->dirty()) {
                        vector<string> actions;
@@ -849,11 +885,11 @@ ARDOUR_UI::finish()
                                if (save_state_canfail ("")) {
                                        /* failed - don't quit */
                                        MessageDialog msg (*editor,
-                                                          _("\
-Ardour was unable to save your session.\n\n\
+                                                          string_compose (_("\
+%1 was unable to save your session.\n\n\
 If you still wish to quit, please use the\n\n\
-\"Just quit\" option."));
-                                       pop_back_splash();
+\"Just quit\" option."), PROGRAM_NAME));
+                                       pop_back_splash(msg);
                                        msg.run ();
                                        return;
                                }
@@ -865,16 +901,23 @@ If you still wish to quit, please use the\n\n\
 
                second_connection.disconnect ();
                point_one_second_connection.disconnect ();
-               point_oh_five_second_connection.disconnect ();
-               point_zero_one_second_connection.disconnect();
+               point_zero_something_second_connection.disconnect();
        }
 
+       delete ARDOUR_UI::instance()->video_timeline;
+       ARDOUR_UI::instance()->video_timeline = NULL;
+       stop_video_server();
+
        /* Save state before deleting the session, as that causes some
           windows to be destroyed before their visible state can be
           saved.
        */
        save_ardour_state ();
 
+       close_all_dialogs ();
+
+       loading_message (string_compose (_("Please wait while %1 cleans up..."), PROGRAM_NAME));
+
        if (_session) {
                // _session->set_deletion_in_progress ();
                _session->set_clean ();
@@ -883,7 +926,6 @@ If you still wish to quit, please use the\n\n\
                _session = 0;
        }
 
-       ArdourDialog::close_all_dialogs ();
        engine->stop (true);
        quit ();
 }
@@ -930,7 +972,6 @@ ARDOUR_UI::ask_about_saving_session (const vector<string>& actions)
        window.get_vbox()->pack_start (dhbox);
 
        window.set_name (_("Prompter"));
-       window.set_position (Gtk::WIN_POS_MOUSE);
        window.set_modal (true);
        window.set_resizable (false);
 
@@ -957,12 +998,27 @@ ARDOUR_UI::ask_about_saving_session (const vector<string>& actions)
        return -1;
 }
 
+
 gint
 ARDOUR_UI::every_second ()
 {
        update_cpu_load ();
        update_buffer_load ();
        update_disk_space ();
+       update_timecode_format ();
+
+       if (nsm && nsm->is_active ()) {
+               nsm->check ();
+
+               if (!_was_dirty && _session->dirty ()) {
+                       nsm->is_dirty ();
+                       _was_dirty = true;
+               }
+               else if (_was_dirty && !_session->dirty ()){
+                       nsm->is_clean ();
+                       _was_dirty = false;
+               }
+       }
        return TRUE;
 }
 
@@ -975,11 +1031,20 @@ ARDOUR_UI::every_point_one_seconds ()
 }
 
 gint
-ARDOUR_UI::every_point_zero_one_seconds ()
+ARDOUR_UI::every_point_zero_something_seconds ()
 {
-       // august 2007: actual update frequency: 40Hz, not 100Hz
+       // august 2007: actual update frequency: 25Hz (40ms), not 100Hz
 
        SuperRapidScreenUpdate(); /* EMIT_SIGNAL */
+       if (editor_meter && Config->get_show_editor_meter()) {
+               float mpeak = editor_meter->update_meters();
+               if (mpeak > editor_meter_max_peak) {
+                       if (mpeak >= Config->get_meter_peak()) {
+                               editor_meter_peak_display.set_name ("meterbridge peakindicator on");
+                               editor_meter_peak_display.set_elements((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body));
+                       }
+               }
+       }
        return TRUE;
 }
 
@@ -992,7 +1057,7 @@ ARDOUR_UI::update_sample_rate (framecnt_t)
 
        if (!engine->connected()) {
 
-               snprintf (buf, sizeof (buf), _("disconnected"));
+               snprintf (buf, sizeof (buf), "%s", _("disconnected"));
 
        } else {
 
@@ -1021,29 +1086,29 @@ ARDOUR_UI::update_format ()
        }
 
        stringstream s;
-       s << "File: <span foreground=\"green\">";
+       s << _("File:") << X_(" <span foreground=\"green\">");
 
        switch (_session->config.get_native_file_header_format ()) {
        case BWF:
-               s << "BWF";
+               s << _("BWF");
                break;
        case WAVE:
-               s << "WAV";
+               s << _("WAV");
                break;
        case WAVE64:
-               s << "WAV64";
+               s << _("WAV64");
                break;
        case CAF:
-               s << "CAF";
+               s << _("CAF");
                break;
        case AIFF:
-               s << "AIFF";
+               s << _("AIFF");
                break;
        case iXML:
-               s << "iXML";
+               s << _("iXML");
                break;
        case RF64:
-               s << "RF64";
+               s << _("RF64");
                break;
        }
 
@@ -1051,17 +1116,17 @@ ARDOUR_UI::update_format ()
        
        switch (_session->config.get_native_file_data_format ()) {
        case FormatFloat:
-               s << "32-float";
+               s << _("32-float");
                break;
        case FormatInt24:
-               s << "24-int";
+               s << _("24-int");
                break;
        case FormatInt16:
-               s << "16-int";
+               s << _("16-int");
                break;
        }
 
-       s << "</span>";
+       s << X_("</span>");
 
        format_label.set_markup (s.str ());
 }
@@ -1125,16 +1190,21 @@ ARDOUR_UI::update_disk_space()
                return;
        }
 
-       framecnt_t frames = _session->available_capture_duration();
+       boost::optional<framecnt_t> opt_frames = _session->available_capture_duration();
        char buf[64];
        framecnt_t fr = _session->frame_rate();
 
-       if (frames == max_framecnt) {
-               snprintf (buf, sizeof (buf), _("Disk: <span foreground=\"green\">24hrs+</span>"));
+       if (!opt_frames) {
+               /* Available space is unknown */
+               snprintf (buf, sizeof (buf), "%s", _("Disk: <span foreground=\"green\">Unknown</span>"));
+       } else if (opt_frames.get_value_or (0) == max_framecnt) {
+               snprintf (buf, sizeof (buf), "%s", _("Disk: <span foreground=\"green\">24hrs+</span>"));
        } else {
                rec_enabled_streams = 0;
                _session->foreach_route (this, &ARDOUR_UI::count_recenabled_streams);
 
+               framecnt_t frames = opt_frames.get_value_or (0);
+
                if (rec_enabled_streams) {
                        frames /= rec_enabled_streams;
                }
@@ -1146,7 +1216,7 @@ ARDOUR_UI::update_disk_space()
                hrs  = frames / (fr * 3600);
 
                if (hrs > 24) {
-                       snprintf (buf, sizeof (buf), _("Disk: <span foreground=\"green\">&gt;24 hrs</span>"));
+                       snprintf (buf, sizeof (buf), "%s", _("Disk: <span foreground=\"green\">&gt;24 hrs</span>"));
                } else {
                        frames -= hrs * fr * 3600;
                        mins = frames / (fr * 60);
@@ -1165,44 +1235,57 @@ ARDOUR_UI::update_disk_space()
        }
 
        disk_space_label.set_markup (buf);
+}
+
+void
+ARDOUR_UI::update_timecode_format ()
+{
+       char buf[64];
 
-       // An attempt to make the disk space label flash red when space has run out.
+       if (_session) {
+               bool matching;
+               TimecodeSlave* tcslave;
+               SyncSource sync_src = Config->get_sync_source();
 
-       if (frames < fr * 60 * 5) {
-       /*      disk_space_box.style ("disk_space_label_empty"); */
+               if ((sync_src == LTC || sync_src == MTC) && (tcslave = dynamic_cast<TimecodeSlave*>(_session->slave())) != 0) {
+                       matching = (tcslave->apparent_timecode_format() == _session->config.get_timecode_format());
+               } else {
+                       matching = true;
+               }
+                       
+               snprintf (buf, sizeof (buf), S_("Timecode|TC: <span foreground=\"%s\">%s</span>"),
+                         matching ? X_("green") : X_("red"),
+                         Timecode::timecode_format_name (_session->config.get_timecode_format()).c_str());
        } else {
-       /*      disk_space_box.style ("disk_space_label"); */
+               snprintf (buf, sizeof (buf), "TC: n/a");
        }
 
-}
+       timecode_format_label.set_markup (buf);
+}      
 
 gint
 ARDOUR_UI::update_wall_clock ()
 {
        time_t now;
        struct tm *tm_now;
-       char buf[16];
+       static int last_min = -1;
 
        time (&now);
        tm_now = localtime (&now);
+       if (last_min != tm_now->tm_min) {
+               char buf[16];
+               sprintf (buf, "%02d:%02d", tm_now->tm_hour, tm_now->tm_min);
+               wall_clock_label.set_text (buf);
+               last_min = tm_now->tm_min;
+       }
 
-       sprintf (buf, "%02d:%02d", tm_now->tm_hour, tm_now->tm_min);
-       wall_clock_label.set_text (buf);
-
-       return TRUE;
-}
-
-gint
-ARDOUR_UI::session_menu (GdkEventButton */*ev*/)
-{
-       session_popup_menu->popup (0, 0);
        return TRUE;
 }
 
 void
 ARDOUR_UI::redisplay_recent_sessions ()
 {
-       std::vector<sys::path> session_directories;
+       std::vector<std::string> session_directories;
        RecentSessionsSorter cmp;
 
        recent_session_display.set_model (Glib::RefPtr<TreeModel>(0));
@@ -1215,7 +1298,7 @@ ARDOUR_UI::redisplay_recent_sessions ()
                recent_session_display.set_model (recent_session_model);
                return;
        }
-       //
+
        // sort them alphabetically
        sort (rs.begin(), rs.end(), cmp);
 
@@ -1223,10 +1306,10 @@ ARDOUR_UI::redisplay_recent_sessions ()
                session_directories.push_back ((*i).second);
        }
 
-       for (vector<sys::path>::const_iterator i = session_directories.begin();
+       for (vector<std::string>::const_iterator i = session_directories.begin();
                        i != session_directories.end(); ++i)
        {
-               std::vector<sys::path> state_file_paths;
+               std::vector<std::string> state_file_paths;
 
                // now get available states for this session
 
@@ -1234,18 +1317,17 @@ ARDOUR_UI::redisplay_recent_sessions ()
 
                vector<string*>* states;
                vector<const gchar*> item;
-               string fullpath = (*i).to_string();
+               string fullpath = *i;
 
                /* remove any trailing / */
 
-               if (fullpath[fullpath.length()-1] == '/') {
-                       fullpath = fullpath.substr (0, fullpath.length()-1);
+               if (fullpath[fullpath.length() - 1] == '/') {
+                       fullpath = fullpath.substr (0, fullpath.length() - 1);
                }
 
                /* check whether session still exists */
                if (!Glib::file_test(fullpath.c_str(), Glib::FILE_TEST_EXISTS)) {
                        /* session doesn't exist */
-                       cerr << "skipping non-existent session " << fullpath << endl;
                        continue;
                }
 
@@ -1262,6 +1344,7 @@ ARDOUR_UI::redisplay_recent_sessions ()
 
                row[recent_session_columns.visible_name] = Glib::path_get_basename (fullpath);
                row[recent_session_columns.fullpath] = fullpath;
+               row[recent_session_columns.tip] = Glib::Markup::escape_text (fullpath);
 
                if (state_file_names.size() > 1) {
 
@@ -1275,10 +1358,12 @@ ARDOUR_UI::redisplay_recent_sessions ()
 
                                child_row[recent_session_columns.visible_name] = *i2;
                                child_row[recent_session_columns.fullpath] = fullpath;
+                               child_row[recent_session_columns.tip] = Glib::Markup::escape_text (fullpath);
                        }
                }
        }
 
+       recent_session_display.set_tooltip_column(1); // recent_session_columns.tip
        recent_session_display.set_model (recent_session_model);
 }
 
@@ -1308,7 +1393,6 @@ ARDOUR_UI::build_session_selector ()
 
        recent_session_display.show();
        scroller->show();
-       //session_selector_window->get_vbox()->show();
 }
 
 void
@@ -1330,8 +1414,6 @@ ARDOUR_UI::open_recent_session ()
 
        while (true) {
 
-               session_selector_window->set_position (WIN_POS_MOUSE);
-
                ResponseType r = (ResponseType) session_selector_window->run ();
 
                switch (r) {
@@ -1380,7 +1462,7 @@ ARDOUR_UI::check_audioengine ()
                                                   _("%1 is not connected to JACK\n"
                                                     "You cannot open or close sessions in this condition"),
                                                   PROGRAM_NAME));
-                       pop_back_splash ();
+                       pop_back_splash (msg);
                        msg.run ();
                        return false;
                }
@@ -1408,6 +1490,24 @@ ARDOUR_UI::open_session ()
                open_session_selector->add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
                open_session_selector->add_button (Gtk::Stock::OPEN, Gtk::RESPONSE_ACCEPT);
                open_session_selector->set_default_response(Gtk::RESPONSE_ACCEPT);
+               
+               if (_session) {
+                       string session_parent_dir = Glib::path_get_dirname(_session->path());
+                       string::size_type last_dir_sep = session_parent_dir.rfind(G_DIR_SEPARATOR);
+                       session_parent_dir = session_parent_dir.substr(0, last_dir_sep);
+                       open_session_selector->set_current_folder(session_parent_dir);
+               } else {
+                       open_session_selector->set_current_folder(Config->get_default_session_parent_dir());
+               }
+
+               string default_session_folder = Config->get_default_session_parent_dir();
+               try {
+                       /* add_shortcut_folder throws an exception if the folder being added already has a shortcut */
+                       open_session_selector->add_shortcut_folder (default_session_folder);
+               }
+               catch (Glib::Error & e) {
+                       std::cerr << "open_session_selector->add_shortcut_folder (" << default_session_folder << ") threw Glib::Error " << e.what() << std::endl;
+               }
 
                FileFilter session_filter;
                session_filter.add_pattern ("*.ardour");
@@ -1442,7 +1542,8 @@ ARDOUR_UI::open_session ()
 
 
 void
-ARDOUR_UI::session_add_midi_route (bool disk, RouteGroup* route_group, uint32_t how_many, string const & name_template)
+ARDOUR_UI::session_add_mixed_track (const ChanCount& input, const ChanCount& output, RouteGroup* route_group, 
+                                   uint32_t how_many, const string& name_template, PluginInfoPtr instrument)
 {
        list<boost::shared_ptr<MidiTrack> > tracks;
 
@@ -1452,22 +1553,11 @@ ARDOUR_UI::session_add_midi_route (bool disk, RouteGroup* route_group, uint32_t
        }
 
        try {
-               if (disk) {
-
-                       tracks = _session->new_midi_track (ARDOUR::Normal, route_group, how_many, name_template);
-
-                       if (tracks.size() != how_many) {
-                               if (how_many == 1) {
-                                       error << _("could not create a new midi track") << endmsg;
-                               } else {
-                                       error << string_compose (_("could not create %1 new midi tracks"), how_many) << endmsg;
-                               }
-                       }
-               } /*else {
-                       if ((route = _session->new_midi_route ()) == 0) {
-                               error << _("could not create new midi bus") << endmsg;
-                       }
-               }*/
+               tracks = _session->new_midi_track (input, output, instrument, ARDOUR::Normal, route_group, how_many, name_template);
+               
+               if (tracks.size() != how_many) {
+                       error << string_compose(P_("could not create %1 new mixed track", "could not create %1 new mixed tracks", how_many), how_many) << endmsg;
+               }
        }
 
        catch (...) {
@@ -1479,7 +1569,18 @@ restart JACK with more ports."), PROGRAM_NAME));
                msg.run ();
        }
 }
+       
 
+void
+ARDOUR_UI::session_add_midi_route (bool disk, RouteGroup* route_group, uint32_t how_many, const string& name_template, PluginInfoPtr instrument)
+{
+       ChanCount one_midi_channel;
+       one_midi_channel.set (DataType::MIDI, 1);
+
+       if (disk) {
+               session_add_mixed_track (one_midi_channel, one_midi_channel, route_group, how_many, name_template, instrument);
+       }
+}
 
 void
 ARDOUR_UI::session_add_audio_route (
@@ -1505,12 +1606,8 @@ ARDOUR_UI::session_add_audio_route (
                        tracks = _session->new_audio_track (input_channels, output_channels, mode, route_group, how_many, name_template);
 
                        if (tracks.size() != how_many) {
-                               if (how_many == 1) {
-                                       error << _("could not create a new audio track") << endmsg;
-                               } else {
-                                       error << string_compose (_("could only create %1 of %2 new audio %3"),
-                                                                tracks.size(), how_many, (track ? _("tracks") : _("busses"))) << endmsg;
-                               }
+                               error << string_compose (P_("could not create %1 new audio track", "could not create %1 new audio tracks", how_many), how_many) 
+                                     << endmsg;
                        }
 
                } else {
@@ -1518,11 +1615,8 @@ ARDOUR_UI::session_add_audio_route (
                        routes = _session->new_audio_route (input_channels, output_channels, route_group, how_many, name_template);
 
                        if (routes.size() != how_many) {
-                               if (how_many == 1) {
-                                       error << _("could not create a new audio bus") << endmsg;
-                               } else {
-                                       error << string_compose (_("could not create %1 new audio busses"), how_many) << endmsg;
-                               }
+                               error << string_compose (P_("could not create %1 new audio bus", "could not create %1 new audio busses", how_many), how_many)
+                                     << endmsg;
                        }
                }
        }
@@ -1533,30 +1627,11 @@ ARDOUR_UI::session_add_audio_route (
 to create a new track or bus.\n\
 You should save %1, exit and\n\
 restart JACK with more ports."), PROGRAM_NAME));
-               pop_back_splash ();
+               pop_back_splash (msg);
                msg.run ();
        }
 }
 
-void
-ARDOUR_UI::do_transport_locate (framepos_t new_position, bool with_roll)
-{
-       framecnt_t _preroll = 0;
-
-       if (_session) {
-               // XXX CONFIG_CHANGE FIX - requires AnyTime handling
-               // _preroll = _session->convert_to_frames_at (new_position, Config->get_preroll());
-
-               if (new_position > _preroll) {
-                       new_position -= _preroll;
-               } else {
-                       new_position = 0;
-               }
-
-               _session->request_locate (new_position, with_roll);
-       }
-}
-
 void
 ARDOUR_UI::transport_goto_start ()
 {
@@ -1649,22 +1724,6 @@ ARDOUR_UI::transport_stop ()
        _session->request_stop (false, true);
 }
 
-void
-ARDOUR_UI::transport_stop_and_forget_capture ()
-{
-       if (_session) {
-               _session->request_stop (true, true);
-       }
-}
-
-void
-ARDOUR_UI::remove_last_capture()
-{
-       if (editor) {
-               editor->remove_last_capture();
-       }
-}
-
 void
 ARDOUR_UI::transport_record (bool roll)
 {
@@ -1673,7 +1732,7 @@ ARDOUR_UI::transport_record (bool roll)
                switch (_session->record_status()) {
                case Session::Disabled:
                        if (_session->ntracks() == 0) {
-                               MessageDialog msg (*editor, _("Please create 1 or more track\nbefore trying to record.\nCheck the Session menu."));
+                               MessageDialog msg (*editor, _("Please create one or more tracks before trying to record.\nYou can do this with the \"Add Track or Bus\" option in the Session menu."));
                                msg.run ();
                                return;
                        }
@@ -1694,7 +1753,6 @@ ARDOUR_UI::transport_record (bool roll)
                        _session->disable_record (false, true);
                }
        }
-       //cerr << "ARDOUR_UI::transport_record () called roll = " << roll << " _session->record_status() = " << _session->record_status() << endl;
 }
 
 void
@@ -1710,7 +1768,7 @@ ARDOUR_UI::transport_roll ()
 
 #if 0
        if (_session->config.get_external_sync()) {
-               switch (_session->config.get_sync_source()) {
+               switch (Config->get_sync_source()) {
                case JACK:
                        break;
                default:
@@ -1729,20 +1787,23 @@ ARDOUR_UI::transport_roll ()
                if (!Config->get_seamless_loop()) {
                        _session->request_play_loop (false, true);
                }
-       } else if (_session->get_play_range () && !join_play_range_button.active_state()) {
+       } else if (_session->get_play_range () && !Config->get_always_play_range()) {
                /* stop playing a range if we currently are */
                _session->request_play_range (0, true);
        }
 
-       if (join_play_range_button.active_state()) {
-               _session->request_play_range (&editor->get_selection().time, true);
-       }
-
        if (!rolling) {
                _session->request_transport_speed (1.0f);
        }
 }
 
+bool
+ARDOUR_UI::get_smart_mode() const
+{
+       return ( editor->get_smart_mode() );
+}
+
+
 void
 ARDOUR_UI::toggle_roll (bool with_abort, bool roll_out_of_bounded_mode)
 {
@@ -1757,7 +1818,7 @@ ARDOUR_UI::toggle_roll (bool with_abort, bool roll_out_of_bounded_mode)
        }
 
        if (_session->config.get_external_sync()) {
-               switch (_session->config.get_sync_source()) {
+               switch (Config->get_sync_source()) {
                case JACK:
                        break;
                default:
@@ -1793,7 +1854,7 @@ ARDOUR_UI::toggle_roll (bool with_abort, bool roll_out_of_bounded_mode)
                if (rolling) {
                        _session->request_stop (with_abort, true);
                } else {
-                       if (join_play_range_button.active_state()) {
+                       if ( Config->get_always_play_range() ) {
                                _session->request_play_range (&editor->get_selection().time, true);
                        }
 
@@ -1805,7 +1866,9 @@ ARDOUR_UI::toggle_roll (bool with_abort, bool roll_out_of_bounded_mode)
 void
 ARDOUR_UI::toggle_session_auto_loop ()
 {
-       if (!_session) {
+       Location * looploc = _session->locations()->auto_loop_location();
+
+       if (!_session || !looploc) {
                return;
        }
 
@@ -1813,24 +1876,18 @@ ARDOUR_UI::toggle_session_auto_loop ()
 
                if (_session->transport_rolling()) {
 
-                       Location * looploc = _session->locations()->auto_loop_location();
-
-                       if (looploc) {
-                               _session->request_locate (looploc->start(), true);
-                               _session->request_play_loop (false);
-                       }
+                       _session->request_locate (looploc->start(), true);
+                       _session->request_play_loop (false);
 
                } else {
                        _session->request_play_loop (false);
                }
        } else {
-
-         Location * looploc = _session->locations()->auto_loop_location();
-
-               if (looploc) {
-                       _session->request_play_loop (true);
-               }
+               _session->request_play_loop (true);
        }
+       
+       //show the loop markers
+       looploc->set_hidden (false, this);
 }
 
 void
@@ -1843,6 +1900,15 @@ ARDOUR_UI::transport_play_selection ()
        editor->play_selection ();
 }
 
+void
+ARDOUR_UI::transport_play_preroll ()
+{
+       if (!_session) {
+               return;
+       }
+       editor->play_with_preroll ();
+}
+
 void
 ARDOUR_UI::transport_rewind (int option)
 {
@@ -1873,35 +1939,34 @@ ARDOUR_UI::transport_rewind (int option)
 void
 ARDOUR_UI::transport_forward (int option)
 {
-       float current_transport_speed;
-
-       if (_session) {
-               current_transport_speed = _session->transport_speed();
-
-               if (current_transport_speed <= 0.0f) {
-                       switch (option) {
-                       case 0:
-                               _session->request_transport_speed (1.0f);
-                               break;
-                       case 1:
-                               _session->request_transport_speed (4.0f);
-                               break;
-                       case -1:
-                               _session->request_transport_speed (0.5f);
-                               break;
-                       }
-               } else {
-                       /* speed up */
-                       _session->request_transport_speed (current_transport_speed * 1.5f);
+       if (!_session) {
+               return;
+       }
+       
+       float current_transport_speed = _session->transport_speed();
+       
+       if (current_transport_speed <= 0.0f) {
+               switch (option) {
+               case 0:
+                       _session->request_transport_speed (1.0f);
+                       break;
+               case 1:
+                       _session->request_transport_speed (4.0f);
+                       break;
+               case -1:
+                       _session->request_transport_speed (0.5f);
+                       break;
                }
-
+       } else {
+               /* speed up */
+               _session->request_transport_speed (current_transport_speed * 1.5f);
        }
 }
 
 void
 ARDOUR_UI::toggle_record_enable (uint32_t rid)
 {
-       if (_session == 0) {
+       if (!_session) {
                return;
        }
 
@@ -1915,9 +1980,6 @@ ARDOUR_UI::toggle_record_enable (uint32_t rid)
                        t->set_record_enabled (!t->record_enabled(), this);
                }
        }
-       if (_session == 0) {
-               return;
-       }
 }
 
 void
@@ -1927,7 +1989,7 @@ ARDOUR_UI::map_transport_state ()
                auto_loop_button.unset_active_state ();
                play_selection_button.unset_active_state ();
                roll_button.unset_active_state ();
-               stop_button.set_active_state (Gtkmm2ext::Active);
+               stop_button.set_active_state (Gtkmm2ext::ExplicitActive);
                return;
        }
 
@@ -1941,37 +2003,37 @@ ARDOUR_UI::map_transport_state ()
 
                if (_session->get_play_range()) {
 
-                       play_selection_button.set_active_state (Gtkmm2ext::Active);
+                       play_selection_button.set_active_state (Gtkmm2ext::ExplicitActive);
                        roll_button.unset_active_state ();
                        auto_loop_button.unset_active_state ();
 
                } else if (_session->get_play_loop ()) {
 
-                       auto_loop_button.set_active_state (Gtkmm2ext::Active);
-                       play_selection_button.unset_active_state ();
-                       roll_button.unset_active_state ();
+                       auto_loop_button.set_active (true);
+                       play_selection_button.set_active (false);
+                       roll_button.set_active (false);
 
                } else {
 
-                       roll_button.set_active_state (Gtkmm2ext::Active);
-                       play_selection_button.unset_active_state ();
-                       auto_loop_button.unset_active_state ();
+                       roll_button.set_active (true);
+                       play_selection_button.set_active (false);
+                       auto_loop_button.set_active (false);
                }
 
-               if (join_play_range_button.active_state()) {
+               if (Config->get_always_play_range()) {
                        /* light up both roll and play-selection if they are joined */
-                       roll_button.set_active_state (Gtkmm2ext::Active);
-                       play_selection_button.set_active_state (Gtkmm2ext::Active);
+                       roll_button.set_active (true);
+                       play_selection_button.set_active (true);
                }
 
-               stop_button.unset_active_state ();
+               stop_button.set_active (false);
 
        } else {
 
-               stop_button.set_active_state (Gtkmm2ext::Active);
-               roll_button.unset_active_state ();
-               play_selection_button.unset_active_state ();
-               auto_loop_button.unset_active_state ();
+               stop_button.set_active (true);
+               roll_button.set_active (false);
+               play_selection_button.set_active (false);
+               auto_loop_button.set_active (false);
                update_disk_space ();
        }
 }
@@ -2070,11 +2132,12 @@ JACK, reconnect and save the session."), PROGRAM_NAME);
        }
 
        MessageDialog msg (*editor, msgstr);
-       pop_back_splash ();
+       pop_back_splash (msg);
+       msg.set_keep_above (true);
        msg.run ();
-
+       
        if (free_reason) {
-               free ((char*) reason);
+               free (const_cast<char*> (reason));
        }
 }
 
@@ -2096,12 +2159,6 @@ ARDOUR_UI::do_engine_start ()
        return 0;
 }
 
-void
-ARDOUR_UI::setup_theme ()
-{
-       theme_manager->setup_theme();
-}
-
 void
 ARDOUR_UI::update_clocks ()
 {
@@ -2113,7 +2170,11 @@ ARDOUR_UI::update_clocks ()
 void
 ARDOUR_UI::start_clocking ()
 {
-       clock_signal_connection = RapidScreenUpdate.connect (sigc::mem_fun(*this, &ARDOUR_UI::update_clocks));
+       if (Config->get_super_rapid_clock_update()) {
+               clock_signal_connection = SuperRapidScreenUpdate.connect (sigc::mem_fun(*this, &ARDOUR_UI::update_clocks));
+       } else {
+               clock_signal_connection = RapidScreenUpdate.connect (sigc::mem_fun(*this, &ARDOUR_UI::update_clocks));
+       }
 }
 
 void
@@ -2122,21 +2183,8 @@ ARDOUR_UI::stop_clocking ()
        clock_signal_connection.disconnect ();
 }
 
-void
-ARDOUR_UI::toggle_clocking ()
-{
-#if 0
-       if (clock_button.get_active()) {
-               start_clocking ();
-       } else {
-               stop_clocking ();
-       }
-#endif
-}
-
 gint
 ARDOUR_UI::_blink (void *arg)
-
 {
        ((ARDOUR_UI *) arg)->blink ();
        return TRUE;
@@ -2171,7 +2219,7 @@ ARDOUR_UI::stop_blinking ()
 }
 
 
-/** Ask the user for the name of a new shapshot and then take it.
+/** Ask the user for the name of a new snapshot and then take it.
  */
 
 void
@@ -2205,27 +2253,16 @@ ARDOUR_UI::snapshot_session (bool switch_to_it)
                bool do_save = (snapname.length() != 0);
 
                if (do_save) {
-                       if (snapname.find ('/') != string::npos) {
-                               MessageDialog msg (_("To ensure compatibility with various systems\n"
-                                                    "snapshot names may not contain a '/' character"));
-                               msg.run ();
-                               goto again;
-                       }
-                       if (snapname.find ('\\') != string::npos) {
-                               MessageDialog msg (_("To ensure compatibility with various systems\n"
-                                                    "snapshot names may not contain a '\\' character"));
-                               msg.run ();
-                               goto again;
-                       }
-                       if (snapname.find (':') != string::npos) {
-                               MessageDialog msg (_("To ensure compatibility with various systems\n"
-                                                    "snapshot names may not contain a ':' character"));
+                       char illegal = Session::session_name_is_legal(snapname);
+                       if (illegal) {
+                               MessageDialog msg (string_compose (_("To ensure compatibility with various systems\n"
+                                                    "snapshot names may not contain a '%1' character"), illegal));
                                msg.run ();
                                goto again;
                        }
                }
 
-               vector<sys::path> p;
+               vector<std::string> 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()) {
@@ -2253,7 +2290,7 @@ ARDOUR_UI::snapshot_session (bool switch_to_it)
        }
 }
 
-/** Ask the user for the name of a new shapshot and then take it.
+/** Ask the user for a new session name and then rename the session to it.
  */
 
 void
@@ -2280,15 +2317,11 @@ ARDOUR_UI::rename_session ()
                bool do_rename = (name.length() != 0);
 
                if (do_rename) {
-                       if (name.find ('/') != string::npos) {
-                               MessageDialog msg (_("To ensure compatibility with various systems\n"
-                                                    "session names may not contain a '/' character"));
-                               msg.run ();
-                               goto again;
-                       }
-                       if (name.find ('\\') != string::npos) {
-                               MessageDialog msg (_("To ensure compatibility with various systems\n"
-                                                    "session names may not contain a '\\' character"));
+                       char illegal = Session::session_name_is_legal (name);
+
+                       if (illegal) {
+                               MessageDialog msg (string_compose (_("To ensure compatibility with various systems\n"
+                                                                    "session names may not contain a '%1' character"), illegal));
                                msg.run ();
                                goto again;
                        }
@@ -2325,11 +2358,7 @@ ARDOUR_UI::save_state (const string & name, bool switch_to_it)
 {
        XMLNode* node = new XMLNode (X_("UI"));
 
-       for (list<WindowProxyBase*>::iterator i = _window_proxies.begin(); i != _window_proxies.end(); ++i) {
-               if (!(*i)->rc_configured()) {
-                       node->add_child_nocopy (*((*i)->get_state ()));
-               }
-       }
+       WM::Manager::instance().add_state (*node);
 
        node->add_child_nocopy (gui_object_state->get_state());
 
@@ -2397,12 +2426,12 @@ ARDOUR_UI::transport_rec_enable_blink (bool onoff)
 
        if (r == Session::Enabled || (r == Session::Recording && !h)) {
                if (onoff) {
-                       rec_button.set_active_state (Active);
+                       rec_button.set_active_state (Gtkmm2ext::ExplicitActive);
                } else {
-                       rec_button.set_active_state (Mid);
+                       rec_button.set_active_state (Gtkmm2ext::ImplicitActive);
                }
        } else if (r == Session::Recording && h) {
-               rec_button.set_active_state (Mid);
+               rec_button.set_active_state (Gtkmm2ext::ExplicitActive);
        } else {
                rec_button.unset_active_state ();
        }
@@ -2472,7 +2501,7 @@ ARDOUR_UI::ask_about_loading_existing_session (const std::string& session_path)
        msg.set_title (_("Open Existing Session"));
        msg.set_wmclass (X_("existing_session"), PROGRAM_NAME);
        msg.set_position (Gtk::WIN_POS_MOUSE);
-       pop_back_splash ();
+       pop_back_splash (msg);
 
        switch (msg.run()) {
        case RESPONSE_YES:
@@ -2487,7 +2516,7 @@ ARDOUR_UI::build_session_from_nsd (const std::string& session_path, const std::s
 {
        BusProfile bus_profile;
 
-       if (Profile->get_sae()) {
+       if (nsm || Profile->get_sae()) {
 
                bus_profile.master_out_channels = 2;
                bus_profile.input_ac = AutoConnectPhysical;
@@ -2511,8 +2540,6 @@ ARDOUR_UI::build_session_from_nsd (const std::string& session_path, const std::s
                        bus_profile.input_ac = AutoConnectOption (0);
                }
 
-               /// @todo some minor tweaks.
-
                bus_profile.output_ac = AutoConnectOption (0);
 
                if (_startup->connect_outputs ()) {
@@ -2545,44 +2572,12 @@ ARDOUR_UI::idle_load (const std::string& path)
                        /* /path/to/foo/foo.ardour => /path/to/foo, foo */
                        load_session (Glib::path_get_dirname (path), basename_nosuffix (path));
                }
-       } else {
 
+       } else {
                ARDOUR_COMMAND_LINE::session_name = path;
-
-               /*
-                * new_session_dialog doens't exist in A3
-                * Try to remove all references to it to
-                * see if it will compile.  NOTE: this will
-                * likely cause a runtime issue is my somewhat
-                * uneducated guess.
-                */
-
-               //if (new_session_dialog) {
-
-
-                       /* make it break out of Dialog::run() and
-                          start again.
-                        */
-
-                       //new_session_dialog->response (1);
-               //}
        }
 }
 
-void
-ARDOUR_UI::end_loading_messages ()
-{
-       // hide_splash ();
-}
-
-void
-ARDOUR_UI::loading_message (const std::string& /*msg*/)
-{
-       // show_splash ();
-       // splash->message (msg);
-       flush_pending ();
-}
-
 /** @param quit_on_cancel true if exit() should be called if the user clicks `cancel' in the new session dialog */
 int
 ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new, string load_template)
@@ -2593,6 +2588,23 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new, stri
        int ret = -1;
        bool likely_new = false;
 
+       /* deal with any existing DIRTY session now, rather than later. don't
+        * treat a non-dirty session this way, so that it stays visible 
+        * as we bring up the new session dialog.
+        */
+
+       if (_session && ARDOUR_UI::instance()->video_timeline) {
+               ARDOUR_UI::instance()->video_timeline->sync_session_state();
+       }
+
+       if (_session && _session->dirty()) {
+               if (unload_session (false)) {
+                       /* unload cancelled by user */
+                       return 0;
+               }
+               ARDOUR_COMMAND_LINE::session_name = "";
+       }
+
        if (!load_template.empty()) {
                should_be_new = true;
                template_name = load_template;
@@ -2600,7 +2612,7 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new, stri
 
        while (ret != 0) {
 
-               if (!should_be_new && !ARDOUR_COMMAND_LINE::session_name.empty()) {
+               if (!ARDOUR_COMMAND_LINE::session_name.empty()) {
 
                        /* if they named a specific statefile, use it, otherwise they are
                           just giving a session folder, and we want to use it as is
@@ -2617,84 +2629,93 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new, stri
                                session_path = ARDOUR_COMMAND_LINE::session_name;
                                session_name = Glib::path_get_basename (ARDOUR_COMMAND_LINE::session_name);
                        }
-
                } else {
+                       session_path = "";
+                       session_name = "";
+               }
 
-                       bool const apply = run_startup (should_be_new, load_template);
-
-                       if (!apply) {
-                               if (quit_on_cancel) {
-                                       exit (1);
-                               } else {
-                                       return ret;
-                               }
+               delete _startup;
+               _startup = new ArdourStartup (should_be_new, session_name, session_path, load_template);
+               
+               if (!_startup->ready_without_display()) {
+                       _startup->present ();
+                       main().run();
+                       _startup->hide ();
+               }
+               
+               switch (_startup->response()) {
+               case RESPONSE_OK:
+                       break;
+               default:
+                       if (quit_on_cancel) {
+                               exit (1);
+                       } else {
+                               return ret;
                        }
+               }
 
-                       /* if we run the startup dialog again, offer more than just "new session" */
-
-                       should_be_new = false;
-
-                       session_name = _startup->session_name (likely_new);
-
-                       string::size_type suffix = session_name.find (statefile_suffix);
-
-                       if (suffix != string::npos) {
-                               session_name = session_name.substr (0, suffix);
-                       }
+               /* if we run the startup dialog again, offer more than just "new session" */
+               
+               should_be_new = false;
+               
+               session_name = _startup->session_name (likely_new);
+               
+               if (nsm) {
+                       likely_new = true;
+               }
 
-                       /* this shouldn't happen, but we catch it just in case it does */
+               string::size_type suffix = session_name.find (statefile_suffix);
+               
+               if (suffix != string::npos) {
+                       session_name = session_name.substr (0, suffix);
+               }
+               
+               /* this shouldn't happen, but we catch it just in case it does */
+               
+               if (session_name.empty()) {
+                       continue;
+               }
+               
+               if (_startup->use_session_template()) {
+                       template_name = _startup->session_template_name();
+                       _session_is_new = true;
+               }
+               
+               if (session_name[0] == G_DIR_SEPARATOR ||
+                   (session_name.length() > 2 && session_name[0] == '.' && session_name[1] == G_DIR_SEPARATOR) ||
+                   (session_name.length() > 3 && session_name[0] == '.' && session_name[1] == '.' && session_name[2] == G_DIR_SEPARATOR)) {
+                       
+                       /* absolute path or cwd-relative path specified for session name: infer session folder
+                          from what was given.
+                       */
+                       
+                       session_path = Glib::path_get_dirname (session_name);
+                       session_name = Glib::path_get_basename (session_name);
+                       
+               } else {
 
-                       if (session_name.empty()) {
+                       session_path = _startup->session_folder();
+                       
+                       char illegal = Session::session_name_is_legal (session_name);
+                       
+                       if (illegal) {
+                               MessageDialog msg (*_startup,
+                                                  string_compose (_("To ensure compatibility with various systems\n"
+                                                                    "session names may not contain a '%1' character"),
+                                                                  illegal));
+                               msg.run ();
+                               ARDOUR_COMMAND_LINE::session_name = ""; // cancel that
                                continue;
                        }
-
-                       if (_startup->use_session_template()) {
-                               template_name = _startup->session_template_name();
-                               _session_is_new = true;
-                       }
-
-                       if (session_name[0] == G_DIR_SEPARATOR ||
-                           (session_name.length() > 2 && session_name[0] == '.' && session_name[1] == G_DIR_SEPARATOR) ||
-                           (session_name.length() > 3 && session_name[0] == '.' && session_name[1] == '.' && session_name[2] == G_DIR_SEPARATOR)) {
-
-                               /* absolute path or cwd-relative path specified for session name: infer session folder
-                                  from what was given.
-                               */
-
-                               session_path = Glib::path_get_dirname (session_name);
-                               session_name = Glib::path_get_basename (session_name);
-
-                       } else {
-
-                               session_path = _startup->session_folder();
-
-                               if (session_name.find ('/') != string::npos) {
-                                       MessageDialog msg (*_startup,
-                                                          _("To ensure compatibility with various systems\n"
-                                                            "session names may not contain a '/' character"));
-                                       msg.run ();
-                                       ARDOUR_COMMAND_LINE::session_name = ""; // cancel that
-                                       continue;
-                               }
-
-                               if (session_name.find ('\\') != string::npos) {
-                                       MessageDialog msg (*_startup,
-                                                          _("To ensure compatibility with various systems\n"
-                                                            "session names may not contain a '\\' character"));
-                                       msg.run ();
-                                       ARDOUR_COMMAND_LINE::session_name = ""; // cancel that
-                                       continue;
-                               }
-                       }
                }
-
+       
                if (create_engine ()) {
                        break;
                }
 
                if (Glib::file_test (session_path, Glib::FileTest (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))) {
 
-                       if (likely_new) {
+                       if (likely_new && !nsm) {
 
                                std::string existing = Glib::build_filename (session_path, session_name);
 
@@ -2709,25 +2730,23 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new, stri
                } else {
 
                        if (!likely_new) {
-                               MessageDialog msg (string_compose (_("There is no existing session at \"%1\""), session_path));
-                               msg.run ();
-                               ARDOUR_COMMAND_LINE::session_name = ""; // cancel that
-                               continue;
-                       }
+                               if (_startup) {
+                                       pop_back_splash (*_startup);
+                               } else {
+                                       hide_splash ();
+                               }
 
-                       if (session_name.find ('/') != std::string::npos) {
-                               MessageDialog msg (*_startup,
-                                                  _("To ensure compatibility with various systems\n"
-                                                    "session names may not contain a '/' character"));
+                               MessageDialog msg (string_compose (_("There is no existing session at \"%1\""), session_path));
                                msg.run ();
                                ARDOUR_COMMAND_LINE::session_name = ""; // cancel that
                                continue;
                        }
 
-                       if (session_name.find ('\\') != std::string::npos) {
-                               MessageDialog msg (*_startup,
-                                                  _("To ensure compatibility with various systems\n"
-                                                    "session names may not contain a '\\' character"));
+                       char illegal = Session::session_name_is_legal(session_name);
+                       if (illegal) {
+                               pop_back_splash (*_startup);
+                               MessageDialog msg (*_startup, string_compose(_("To ensure compatibility with various systems\n"
+                                                    "session names may not contain a '%1' character"), illegal));
                                msg.run ();
                                ARDOUR_COMMAND_LINE::session_name = ""; // cancel that
                                continue;
@@ -2822,7 +2841,7 @@ ARDOUR_UI::load_session (const std::string& path, const std::string& snap_name,
                msg.set_title (_("Port Registration Error"));
                msg.set_secondary_text (_("Click the Close button to try again."));
                msg.set_position (Gtk::WIN_POS_CENTER);
-               pop_back_splash ();
+               pop_back_splash (msg);
                msg.present ();
 
                int response = msg.run ();
@@ -2851,7 +2870,7 @@ ARDOUR_UI::load_session (const std::string& path, const std::string& snap_name,
                msg.set_secondary_text (_("Click the Refresh button to try again."));
                msg.add_button (Stock::REFRESH, 1);
                msg.set_position (Gtk::WIN_POS_CENTER);
-               pop_back_splash ();
+               pop_back_splash (msg);
                msg.present ();
 
                int response = msg.run ();
@@ -2931,7 +2950,7 @@ ARDOUR_UI::build_session (const std::string& path, const std::string& snap_name,
        catch (...) {
 
                MessageDialog msg (string_compose(_("Could not create session in \"%1\""), path));
-               pop_back_splash ();
+               pop_back_splash (msg);
                msg.run ();
                return -1;
        }
@@ -2974,43 +2993,30 @@ ARDOUR_UI::launch_chat ()
 #endif
 }
 
-void
-ARDOUR_UI::show_about ()
-{
-       if (about == 0) {
-               about = new About;
-               about->signal_response().connect(sigc::mem_fun (*this, &ARDOUR_UI::about_signal_response) );
-       }
-
-       about->set_transient_for(*editor);
-       about->show_all ();
-}
-
 void
 ARDOUR_UI::launch_manual ()
 {
-       PBD::open_uri("http://ardour.org/flossmanual");
+       PBD::open_uri (Config->get_tutorial_manual_url());
 }
 
 void
 ARDOUR_UI::launch_reference ()
 {
-       PBD::open_uri("http://ardour.org/refmanual");
+       PBD::open_uri (Config->get_reference_manual_url());
 }
 
 void
-ARDOUR_UI::hide_about ()
+ARDOUR_UI::loading_message (const std::string& msg)
 {
-       if (about) {
-               about->get_window()->set_cursor ();
-               about->hide ();
+       if (ARDOUR_COMMAND_LINE::no_splash) {
+               return;
        }
-}
 
-void
-ARDOUR_UI::about_signal_response (int /*response*/)
-{
-       hide_about();
+       if (!splash) {
+               show_splash ();
+       }
+
+       splash->message (msg);
 }
 
 void
@@ -3024,24 +3030,18 @@ ARDOUR_UI::show_splash ()
                }
        }
 
-       splash->show ();
-       splash->present ();
-       splash->queue_draw ();
-       splash->get_window()->process_updates (true);
-       flush_pending ();
+       splash->display ();
 }
 
 void
 ARDOUR_UI::hide_splash ()
 {
-       if (splash) {
-               splash->hide();
-       }
+        delete splash;
+        splash = 0;
 }
 
 void
-ARDOUR_UI::display_cleanup_results (ARDOUR::CleanupReport& rep, const gchar* list_title,
-                                   const string& plural_msg, const string& singular_msg)
+ARDOUR_UI::display_cleanup_results (ARDOUR::CleanupReport& rep, const gchar* list_title, const bool msg_delete)
 {
        size_t removed;
 
@@ -3052,7 +3052,7 @@ ARDOUR_UI::display_cleanup_results (ARDOUR::CleanupReport& rep, const gchar* lis
                                    _("No files were ready for clean-up"),
                                    true,
                                    Gtk::MESSAGE_INFO,
-                                   (Gtk::ButtonsType)(Gtk::BUTTONS_OK)  );
+                                   Gtk::BUTTONS_OK);
                msgd.set_title (_("Clean-up"));
                msgd.set_secondary_text (_("If this seems suprising, \n\
 check for any existing snapshots.\n\
@@ -3097,7 +3097,7 @@ require some unused files to continue to exist."));
 
        dimage->set_alignment(ALIGN_LEFT, ALIGN_TOP);
 
-       const string dead_directory = _session->session_directory().dead_path().to_string();
+       const string dead_directory = _session->session_directory().dead_path();
 
        /* subst:
           %1 - number of files removed
@@ -3113,20 +3113,36 @@ require some unused files to continue to exist."));
                bprefix = X_("");
                space_adjusted = rep.space;
        } else if (rep.space < 1000000) {
-               bprefix = X_("kilo");
+               bprefix = _("kilo");
                space_adjusted = truncf((float)rep.space / 1000.0);
        } else if (rep.space < 1000000 * 1000) {
-               bprefix = X_("mega");
+               bprefix = _("mega");
                space_adjusted = truncf((float)rep.space / (1000.0 * 1000.0));
        } else {
-               bprefix = X_("giga");
+               bprefix = _("giga");
                space_adjusted = truncf((float)rep.space / (1000.0 * 1000 * 1000.0));
        }
 
-       if (removed > 1) {
-               txt.set_text (string_compose (plural_msg, removed, dead_directory, space_adjusted, bprefix));
+       if (msg_delete) {
+               txt.set_markup (string_compose (P_("\
+The following file was deleted from %2,\n\
+releasing %3 %4bytes of disk space", "\
+The following %1 files were deleted from %2,\n\
+releasing %3 %4bytes of disk space", removed),
+                                       removed, Glib::Markup::escape_text (dead_directory), space_adjusted, bprefix, PROGRAM_NAME));
        } else {
-               txt.set_text (string_compose (singular_msg, removed, dead_directory, space_adjusted, bprefix));
+               txt.set_markup (string_compose (P_("\
+The following file was not in use and \n\
+has been moved to: %2\n\n\
+After a restart of %5\n\n\
+<span face=\"mono\">Session -> Clean-up -> Flush Wastebasket</span>\n\n\
+will release an additional %3 %4bytes of disk space.\n", "\
+The following %1 files were not in use and \n\
+have been moved to: %2\n\n\
+After a restart of %5\n\n\
+<span face=\"mono\">Session -> Clean-up -> Flush Wastebasket</span>\n\n\
+will release an additional %3 %4bytes of disk space.\n", removed),
+                                       removed, Glib::Markup::escape_text (dead_directory), space_adjusted, bprefix, PROGRAM_NAME));
        }
 
        dhbox.pack_start (*dimage, true, false, 5);
@@ -3178,7 +3194,7 @@ ARDOUR_UI::cleanup ()
        MessageDialog checker (_("Are you sure you want to clean-up?"),
                                true,
                                Gtk::MESSAGE_QUESTION,
-                               (Gtk::ButtonsType)(Gtk::BUTTONS_NONE));
+                               Gtk::BUTTONS_NONE);
 
        checker.set_title (_("Clean-up"));
 
@@ -3220,26 +3236,7 @@ Clean-up will move all unused files to a \"dead\" location."));
        editor->finish_cleanup ();
 
        checker.hide();
-       display_cleanup_results (rep,
-                                _("Cleaned Files"),
-                                _("\
-The following %1 files were not in use and \n\
-have been moved to:\n\n\
-%2\n\n\
-After a restart of Ardour,\n\n\
-Session -> Clean-up -> Flush Wastebasket\n\n\
-will release an additional\n\
-%3 %4bytes of disk space.\n"),
-                                _("\
-The following file was not in use and \n\
-has been moved to:\n                           \
-%2\n\n\
-After a restart of Ardour,\n\n\
-Session -> Clean-up -> Flush Wastebasket\n\n\
-will release an additional\n\
-%3 %4bytes of disk space.\n"
-                                        ));
-
+       display_cleanup_results (rep, _("Cleaned Files"), false);
 }
 
 void
@@ -3256,14 +3253,7 @@ ARDOUR_UI::flush_trash ()
                return;
        }
 
-       display_cleanup_results (rep,
-                                _("deleted file"),
-                                _("The following %1 files were deleted from\n\
-%2,\n\
-releasing %3 %4bytes of disk space"),
-                                _("The following file was deleted from\n\
-%2,\n\
-releasing %3 %4bytes of disk space"));
+       display_cleanup_results (rep, _("deleted file"), true);
 }
 
 void
@@ -3275,18 +3265,15 @@ ARDOUR_UI::add_route (Gtk::Window* float_window)
                return;
        }
 
-       if (add_route_dialog == 0) {
-               add_route_dialog = new AddRouteDialog (_session);
-               if (float_window) {
-                       add_route_dialog->set_transient_for (*float_window);
-               }
-       }
-
        if (add_route_dialog->is_visible()) {
                /* we're already doing this */
                return;
        }
 
+       if (float_window) {
+               add_route_dialog->set_transient_for (*float_window);
+       }
+
        ResponseType r = (ResponseType) add_route_dialog->run ();
 
        add_route_dialog->hide();
@@ -3303,45 +3290,329 @@ ARDOUR_UI::add_route (Gtk::Window* float_window)
                return;
        }
 
+       PBD::ScopedConnection idle_connection;
+
+       if (count > 8) {
+               ARDOUR::GUIIdle.connect (idle_connection, MISSING_INVALIDATOR, boost::bind (&Gtkmm2ext::UI::flush_pending, this), gui_context());
+       }
+
        string template_path = add_route_dialog->track_template();
 
        if (!template_path.empty()) {
-               _session->new_route_from_template (count, template_path);
+               if (add_route_dialog->name_template_is_default())  {
+                       _session->new_route_from_template (count, template_path, string());
+               } else {
+                       _session->new_route_from_template (count, template_path, add_route_dialog->name_template());
+               }
                return;
        }
 
-       uint32_t input_chan = add_route_dialog->channels ();
-       uint32_t output_chan;
+       ChanCount input_chan= add_route_dialog->channels ();
+       ChanCount output_chan;
        string name_template = add_route_dialog->name_template ();
-       bool track = add_route_dialog->track ();
+       PluginInfoPtr instrument = add_route_dialog->requested_instrument ();
        RouteGroup* route_group = add_route_dialog->route_group ();
-
        AutoConnectOption oac = Config->get_output_auto_connect();
 
        if (oac & AutoConnectMaster) {
-               output_chan = (_session->master_out() ? _session->master_out()->n_inputs().n_audio() : input_chan);
+               output_chan.set (DataType::AUDIO, (_session->master_out() ? _session->master_out()->n_inputs().n_audio() : input_chan.n_audio()));
+               output_chan.set (DataType::MIDI, 0);
        } 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 (route_group, count, name_template);
-               } else  {
-                       MessageDialog msg (*editor,
-                                       _("Sorry, MIDI Busses are not supported at this time."));
-                       msg.run ();
-                       //session_add_midi_bus();
+       switch (add_route_dialog->type_wanted()) {
+       case AddRouteDialog::AudioTrack:
+               session_add_audio_track (input_chan.n_audio(), output_chan.n_audio(), add_route_dialog->mode(), route_group, count, name_template);
+               break;
+       case AddRouteDialog::MidiTrack:
+               session_add_midi_track (route_group, count, name_template, instrument);
+               break;
+       case AddRouteDialog::MixedTrack:
+               session_add_mixed_track (input_chan, output_chan, route_group, count, name_template, instrument);
+               break;
+       case AddRouteDialog::AudioBus:
+               session_add_audio_bus (input_chan.n_audio(), output_chan.n_audio(), route_group, count, name_template);
+               break;
+       }
+
+       /* idle connection will end at scope end */
+}
+
+void
+ARDOUR_UI::stop_video_server (bool ask_confirm)
+{
+       if (!video_server_process && ask_confirm) {
+               warning << _("Video-Server was not launched by Ardour. The request to stop it is ignored.") << endmsg;
+       }
+       if (video_server_process) {
+               if(ask_confirm) {
+                       ArdourDialog confirm (_("Stop Video-Server"), true);
+                       Label m (_("Do you really want to stop the Video Server?"));
+                       confirm.get_vbox()->pack_start (m, true, true);
+                       confirm.add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
+                       confirm.add_button (_("Yes, Stop It"), Gtk::RESPONSE_ACCEPT);
+                       confirm.show_all ();
+                       if (confirm.run() == RESPONSE_CANCEL) {
+                               return;
+                       }
                }
-       } else {
-               if (track) {
-                       session_add_audio_track (input_chan, output_chan, add_route_dialog->mode(), route_group, count, name_template);
+               delete video_server_process;
+               video_server_process =0;
+       }
+}
+
+void
+ARDOUR_UI::start_video_server_menu (Gtk::Window* float_window)
+{
+  ARDOUR_UI::start_video_server( float_window, true);
+}
+
+bool
+ARDOUR_UI::start_video_server (Gtk::Window* float_window, bool popup_msg)
+{
+       if (!_session) {
+               return false;
+       }
+       if (popup_msg) {
+               if (ARDOUR_UI::instance()->video_timeline->check_server()) {
+                       if (video_server_process) {
+                               popup_error(_("The Video Server is already started."));
+                       } else {
+                               popup_error(_("An external Video Server is configured and can be reached. Not starting a new instance."));
+                       }
+               }
+       }
+
+       int firsttime = 0;
+       while (!ARDOUR_UI::instance()->video_timeline->check_server()) {
+               if (firsttime++) {
+                       warning << _("Could not connect to the Video Server. Start it or configure its access URL in Edit -> Preferences.") << endmsg;
+               }
+               VideoServerDialog *video_server_dialog = new VideoServerDialog (_session);
+               if (float_window) {
+                       video_server_dialog->set_transient_for (*float_window);
+               }
+
+               if (!Config->get_show_video_server_dialog() && firsttime < 2) {
+                       video_server_dialog->hide();
+               } else {
+                       ResponseType r = (ResponseType) video_server_dialog->run ();
+                       video_server_dialog->hide();
+                       if (r != RESPONSE_ACCEPT) { return false; }
+                       if (video_server_dialog->show_again()) {
+                               Config->set_show_video_server_dialog(false);
+                       }
+               }
+
+               std::string icsd_exec = video_server_dialog->get_exec_path();
+               std::string icsd_docroot = video_server_dialog->get_docroot();
+               if (icsd_docroot.empty()) {icsd_docroot = X_("/");}
+
+               struct stat sb;
+               if (!lstat (icsd_docroot.c_str(), &sb) == 0 || !S_ISDIR(sb.st_mode)) {
+                       warning << _("Specified docroot is not an existing directory.") << endmsg;
+                       continue;
+               }
+               if ( (!lstat (icsd_exec.c_str(), &sb) == 0)
+                    || (sb.st_mode & (S_IXUSR|S_IXGRP|S_IXOTH)) == 0 ) {
+                       warning << _("Given Video Server is not an executable file.") << endmsg;
+                       continue;
+               }
+
+               char **argp;
+               argp=(char**) calloc(9,sizeof(char*));
+               argp[0] = strdup(icsd_exec.c_str());
+               argp[1] = strdup("-P");
+               argp[2] = (char*) calloc(16,sizeof(char)); snprintf(argp[2], 16, "%s", video_server_dialog->get_listenaddr().c_str());
+               argp[3] = strdup("-p");
+               argp[4] = (char*) calloc(6,sizeof(char)); snprintf(argp[4], 6, "%i", video_server_dialog->get_listenport());
+               argp[5] = strdup("-C");
+               argp[6] = (char*) calloc(6,sizeof(char)); snprintf(argp[6], 6, "%i", video_server_dialog->get_cachesize());
+               argp[7] = strdup(icsd_docroot.c_str());
+               argp[8] = 0;
+               stop_video_server();
+
+               if (icsd_docroot == X_("/")) {
+                       Config->set_video_advanced_setup(false);
+               } else {
+                       std::ostringstream osstream;
+                       osstream << "http://localhost:" << video_server_dialog->get_listenport() << "/";
+                       Config->set_video_server_url(osstream.str());
+                       Config->set_video_server_docroot(icsd_docroot);
+                       Config->set_video_advanced_setup(true);
+               }
+
+               if (video_server_process) {
+                       delete video_server_process;
+               }
+
+               video_server_process = new SystemExec(icsd_exec, argp);
+               if (video_server_process->start()) {
+                       warning << _("Cannot launch the video-server") << endmsg;
+                       continue;
+               }
+               int timeout = 120; // 6 sec
+               while (!ARDOUR_UI::instance()->video_timeline->check_server()) {
+                       usleep (50000);
+                       if (--timeout <= 0 || !video_server_process->is_running()) break;
+               }
+               if (timeout <= 0) {
+                       warning << _("Video-server was started but does not respond to requests...") << endmsg;
+               } else {
+                       if (!ARDOUR_UI::instance()->video_timeline->check_server_docroot()) {
+                               delete video_server_process;
+                               video_server_process = 0;
+                       }
+               }
+       }
+       return true;
+}
+
+void
+ARDOUR_UI::add_video (Gtk::Window* float_window)
+{
+       if (!_session) {
+               return;
+       }
+
+       if (!start_video_server(float_window, false)) {
+               warning << _("Could not connect to the Video Server. Start it or configure its access URL in Edit -> Preferences.") << endmsg;
+               return;
+       }
+
+       if (float_window) {
+               add_video_dialog->set_transient_for (*float_window);
+       }
+
+       if (add_video_dialog->is_visible()) {
+               /* we're already doing this */
+               return;
+       }
+
+       ResponseType r = (ResponseType) add_video_dialog->run ();
+       add_video_dialog->hide();
+       if (r != RESPONSE_ACCEPT) { return; }
+
+       bool local_file, orig_local_file;
+       std::string path = add_video_dialog->file_name(local_file);
+
+       std::string orig_path = path;
+       orig_local_file = local_file;
+
+       bool auto_set_session_fps = add_video_dialog->auto_set_session_fps();
+
+       if (local_file && !Glib::file_test(path, Glib::FILE_TEST_EXISTS)) {
+               warning << string_compose(_("could not open %1"), path) << endmsg;
+               return;
+       }
+       if (!local_file && path.length() == 0) {
+               warning << _("no video-file selected") << endmsg;
+               return;
+       }
+
+       switch (add_video_dialog->import_option()) {
+               case VTL_IMPORT_TRANSCODE:
+                       {
+                               TranscodeVideoDialog *transcode_video_dialog;
+                               transcode_video_dialog = new TranscodeVideoDialog (_session, path);
+                               ResponseType r = (ResponseType) transcode_video_dialog->run ();
+                               transcode_video_dialog->hide();
+                               if (r != RESPONSE_ACCEPT) {
+                                       delete transcode_video_dialog;
+                                       return;
+                               }
+                               if (!transcode_video_dialog->get_audiofile().empty()) {
+                                       editor->embed_audio_from_video(
+                                                       transcode_video_dialog->get_audiofile(),
+                                                       video_timeline->get_offset()
+                                                       );
+                               }
+                               switch (transcode_video_dialog->import_option()) {
+                                       case VTL_IMPORT_TRANSCODED:
+                                               path = transcode_video_dialog->get_filename();
+                                               local_file = true;
+                                               break;
+                                       case VTL_IMPORT_REFERENCE:
+                                               break;
+                                       default:
+                                               delete transcode_video_dialog;
+                                               return;
+                               }
+                               delete transcode_video_dialog;
+                       }
+                       break;
+               default:
+               case VTL_IMPORT_NONE:
+                       break;
+       }
+
+       /* strip _session->session_directory().video_path() from video file if possible */
+       if (local_file && !path.compare(0, _session->session_directory().video_path().size(), _session->session_directory().video_path())) {
+                path=path.substr(_session->session_directory().video_path().size());
+                if (path.at(0) == G_DIR_SEPARATOR) {
+                        path=path.substr(1);
+                }
+       }
+
+       video_timeline->set_update_session_fps(auto_set_session_fps);
+       if (video_timeline->video_file_info(path, local_file)) {
+               XMLNode* node = new XMLNode(X_("Videotimeline"));
+               node->add_property (X_("Filename"), path);
+               node->add_property (X_("AutoFPS"), auto_set_session_fps?X_("1"):X_("0"));
+               node->add_property (X_("LocalFile"), local_file?X_("1"):X_("0"));
+               if (orig_local_file) {
+                       node->add_property (X_("OriginalVideoFile"), orig_path);
+               } else {
+                       node->remove_property (X_("OriginalVideoFile"));
+               }
+               _session->add_extra_xml (*node);
+               _session->set_dirty ();
+
+               _session->maybe_update_session_range(
+                       std::max(video_timeline->get_offset(), (ARDOUR::frameoffset_t) 0),
+                       std::max(video_timeline->get_offset() + video_timeline->get_duration(), (ARDOUR::frameoffset_t) 0));
+
+
+               if (add_video_dialog->launch_xjadeo() && local_file) {
+                       editor->set_xjadeo_sensitive(true);
+                       editor->toggle_xjadeo_proc(1);
                } else {
-                       session_add_audio_bus (input_chan, output_chan, route_group, count, name_template);
+                       editor->toggle_xjadeo_proc(0);
                }
+               editor->toggle_ruler_video(true);
+       }
+}
+
+void
+ARDOUR_UI::remove_video ()
+{
+       video_timeline->close_session();
+       editor->toggle_ruler_video(false);
+
+       /* reset state */
+       video_timeline->set_offset_locked(false);
+       video_timeline->set_offset(0);
+
+       /* delete session state */
+       XMLNode* node = new XMLNode(X_("Videotimeline"));
+       _session->add_extra_xml(*node);
+       node = new XMLNode(X_("Videomonitor"));
+       _session->add_extra_xml(*node);
+       stop_video_server();
+}
+
+void
+ARDOUR_UI::flush_videotimeline_cache (bool localcacheonly)
+{
+       if (localcacheonly) {
+               video_timeline->vmon_update();
+       } else {
+               video_timeline->flush_cache();
        }
+       editor->queue_visual_videotimeline_update();
 }
 
 XMLNode*
@@ -3499,14 +3770,14 @@ ARDOUR_UI::pending_state_dialog ()
        HBox* hbox = new HBox();
        Image* image = new Image (Stock::DIALOG_QUESTION, ICON_SIZE_DIALOG);
        ArdourDialog dialog (_("Crash Recovery"), true);
-       Label  message (_("\
-This session appears to have been in\n\
-middle of recording when ardour or\n\
+       Label  message (string_compose (_("\
+This session appears to have been in the\n\
+middle of recording when %1 or\n\
 the computer was shutdown.\n\
 \n\
-Ardour can recover any captured audio for\n\
+%1 can recover any captured audio for\n\
 you, or it can ignore it. Please decide\n\
-what you would like to do.\n"));
+what you would like to do.\n"), PROGRAM_NAME));
        image->set_alignment(ALIGN_CENTER, ALIGN_TOP);
        hbox->pack_start (*image, PACK_EXPAND_WIDGET, 12);
        hbox->pack_end (message, PACK_EXPAND_PADDING, 12);
@@ -3531,12 +3802,12 @@ int
 ARDOUR_UI::sr_mismatch_dialog (framecnt_t desired, framecnt_t actual)
 {
        HBox* hbox = new HBox();
-       Image* image = new Image (Stock::DIALOG_QUESTION, ICON_SIZE_DIALOG);
+       Image* image = new Image (Stock::DIALOG_WARNING, ICON_SIZE_DIALOG);
        ArdourDialog dialog (_("Sample Rate Mismatch"), true);
        Label  message (string_compose (_("\
-This session was created with a sample rate of %1 Hz\n\
-\n\
-The audioengine is currently running at %2 Hz\n"), desired, actual));
+This session was created with a sample rate of %1 Hz, but\n\
+%2 is currently running at %3 Hz.  If you load this session,\n\
+audio may be played at the wrong sample rate.\n"), desired, PROGRAM_NAME, actual));
 
        image->set_alignment(ALIGN_CENTER, ALIGN_TOP);
        hbox->pack_start (*image, PACK_EXPAND_WIDGET, 12);
@@ -3550,12 +3821,14 @@ The audioengine is currently running at %2 Hz\n"), desired, actual));
        image->show();
        hbox->show();
 
-       switch (dialog.run ()) {
+       switch (dialog.run()) {
        case RESPONSE_ACCEPT:
                return 0;
        default:
-               return 1;
+                break;
        }
+
+        return 1;
 }
 
 
@@ -3563,7 +3836,7 @@ void
 ARDOUR_UI::disconnect_from_jack ()
 {
        if (engine) {
-               ifengine->disconnect_from_jack ()) {
+               if (engine->disconnect_from_jack ()) {
                        MessageDialog msg (*editor, _("Could not disconnect from JACK"));
                        msg.run ();
                }
@@ -3598,23 +3871,23 @@ void
 ARDOUR_UI::update_transport_clocks (framepos_t pos)
 {
        if (Config->get_primary_clock_delta_edit_cursor()) {
-               primary_clock->set (pos, false, editor->get_preferred_edit_position(), 1);
+               primary_clock->set (pos, false, editor->get_preferred_edit_position());
        } else {
-               primary_clock->set (pos, 0, true);
+               primary_clock->set (pos);
        }
 
        if (Config->get_secondary_clock_delta_edit_cursor()) {
-               secondary_clock->set (pos, false, editor->get_preferred_edit_position(), 2);
+               secondary_clock->set (pos, false, editor->get_preferred_edit_position());
        } else {
                secondary_clock->set (pos);
        }
 
-       if (big_clock_window->get()) {
+       if (big_clock_window) {
                big_clock->set (pos);
        }
+       ARDOUR_UI::instance()->video_timeline->manual_seek_video_monitor(pos);
 }
 
-
 void
 ARDOUR_UI::step_edit_status_change (bool yn)
 {
@@ -3622,7 +3895,7 @@ ARDOUR_UI::step_edit_status_change (bool yn)
        // we make insensitive
 
        if (yn) {
-               rec_button.set_active_state (Mid);
+               rec_button.set_active_state (Gtkmm2ext::ImplicitActive);
                rec_button.set_sensitive (false);
        } else {
                rec_button.unset_active_state ();;
@@ -3635,18 +3908,15 @@ ARDOUR_UI::record_state_changed ()
 {
        ENSURE_GUI_THREAD (*this, &ARDOUR_UI::record_state_changed);
 
-       if (!_session || !big_clock_window->get()) {
+       if (!_session || !big_clock_window) {
                /* why bother - the clock isn't visible */
                return;
        }
 
-       Session::RecordState const r = _session->record_status ();
-       bool const h = _session->have_rec_enabled_track ();
-
-       if (r == Session::Recording && h)  {
-               big_clock->set_widget_name ("BigClockRecording");
+       if (_session->record_status () == Session::Recording && _session->have_rec_enabled_track ()) {
+               big_clock->set_active (true);
        } else {
-               big_clock->set_widget_name ("BigClockNonRecording");
+               big_clock->set_active (false);
        }
 }
 
@@ -3708,16 +3978,16 @@ ARDOUR_UI::TransportControllable::set_value (double val)
                action = X_("Stop");
                break;
        case GotoStart:
-               action = X_("Goto Start");
+               action = X_("GotoStart");
                break;
        case GotoEnd:
-               action = X_("Goto End");
+               action = X_("GotoEnd");
                break;
        case AutoLoop:
                action = X_("Loop");
                break;
        case PlaySelection:
-               action = X_("Play Selection");
+               action = X_("PlaySelection");
                break;
        case RecordEnable:
                action = X_("Record");
@@ -3767,74 +4037,16 @@ ARDOUR_UI::TransportControllable::get_value (void) const
 void
 ARDOUR_UI::setup_profile ()
 {
-       if (gdk_screen_width() < 1200) {
+       if (gdk_screen_width() < 1200 || getenv ("ARDOUR_NARROW_SCREEN")) {
                Profile->set_small_screen ();
        }
 
-
        if (getenv ("ARDOUR_SAE")) {
                Profile->set_sae ();
                Profile->set_single_package ();
        }
 }
 
-void
-ARDOUR_UI::toggle_translations ()
-{
-       using namespace Glib;
-
-       RefPtr<Action> act = ActionManager::get_action (X_("Main"), X_("EnableTranslation"));
-       if (act) {
-               RefPtr<ToggleAction> ract = RefPtr<ToggleAction>::cast_dynamic (act);
-               if (ract) {
-
-                       string i18n_killer = ARDOUR::translation_kill_path();
-
-                       bool already_enabled = !ARDOUR::translations_are_disabled ();
-
-                       if (ract->get_active ()) {
-/* we don't care about errors */
-                               int fd = ::open (i18n_killer.c_str(), O_RDONLY|O_CREAT, 0644);
-                               close (fd);
-                       } else {
-/* we don't care about errors */
-                               unlink (i18n_killer.c_str());
-                       }
-
-                       if (already_enabled != ract->get_active()) {
-                               MessageDialog win (already_enabled ? _("Translations disabled") : _("Translations enabled"),
-                                                  false,
-                                                  Gtk::MESSAGE_WARNING,
-                                                  Gtk::BUTTONS_OK);
-                               win.set_secondary_text (string_compose (_("You must restart %1 for this to take effect."), PROGRAM_NAME));
-                               win.set_position (Gtk::WIN_POS_CENTER);
-                               win.present ();
-                               win.run ();
-                       }
-               }
-       }
-}
-
-/** Add a window proxy to our list, so that its state will be saved.
- *  This call also causes the window to be created and opened if its
- *  state was saved as `visible'.
- */
-void
-ARDOUR_UI::add_window_proxy (WindowProxyBase* p)
-{
-       _window_proxies.push_back (p);
-       p->maybe_show ();
-}
-
-/** Remove a window proxy from our list.  Must be called if a WindowProxy
- *  is deleted, to prevent hanging pointers.
- */
-void
-ARDOUR_UI::remove_window_proxy (WindowProxyBase* p)
-{
-       _window_proxies.remove (p);
-}
-
 int
 ARDOUR_UI::missing_file (Session*s, std::string str, DataType type)
 {
@@ -3903,3 +4115,50 @@ ARDOUR_UI::midi_panic ()
                _session->midi_panic();
        }
 }
+
+void
+ARDOUR_UI::session_format_mismatch (std::string xml_path, std::string backup_path)
+{
+       const char* start_big = "<span size=\"x-large\" weight=\"bold\">";
+       const char* end_big = "</span>";
+       const char* start_mono = "<tt>";
+       const char* end_mono = "</tt>";
+
+       MessageDialog msg (string_compose (_("%4This is a session from an older version of %3%5\n\n"
+                                            "%3 has copied the old session file\n\n%6%1%7\n\nto\n\n%6%2%7\n\n"
+                                            "From now on, use the -2000 version with older versions of %3"),
+                                          xml_path, backup_path, PROGRAM_NAME,
+                                          start_big, end_big,
+                                          start_mono, end_mono), true);
+
+       msg.run ();
+}
+
+
+void
+ARDOUR_UI::reset_peak_display ()
+{
+       if (!_session || !_session->master_out() || !editor_meter) return;
+       editor_meter->clear_meters();
+       editor_meter_max_peak = -INFINITY;
+       editor_meter_peak_display.set_name ("meterbridge peakindicator");
+       editor_meter_peak_display.set_elements((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body));
+}
+
+void
+ARDOUR_UI::reset_group_peak_display (RouteGroup* group)
+{
+       if (!_session || !_session->master_out()) return;
+       if (group == _session->master_out()->route_group()) {
+               reset_peak_display ();
+       }
+}
+
+void
+ARDOUR_UI::reset_route_peak_display (Route* route)
+{
+       if (!_session || !_session->master_out()) return;
+       if (_session->master_out().get() == route) {
+               reset_peak_display ();
+       }
+}