new_grid: Rewrite of Snap and Grid. (squashed commit)
[ardour.git] / gtk2_ardour / ardour_ui.cc
index 1a38773f2eee9a29c198e8aedcfc822ad9f08c4b..37474b498fde13e37451109bbb7715db1277419d 100644 (file)
@@ -86,7 +86,8 @@
 #include "ardour/audioengine.h"
 #include "ardour/audiofilesource.h"
 #include "ardour/automation_watch.h"
-#include "ardour/diskstream.h"
+#include "ardour/disk_reader.h"
+#include "ardour/disk_writer.h"
 #include "ardour/filename_extensions.h"
 #include "ardour/filesystem_paths.h"
 #include "ardour/ltc_file_reader.h"
 #undef check
 #endif
 
-#include "timecode/time.h"
+#include "temporal/time.h"
 
 typedef uint64_t microseconds_t;
 
@@ -137,6 +138,7 @@ typedef uint64_t microseconds_t;
 #include "audio_clock.h"
 #include "audio_region_view.h"
 #include "big_clock_window.h"
+#include "big_transport_window.h"
 #include "bundle_manager.h"
 #include "duplicate_routes_dialog.h"
 #include "debug.h"
@@ -201,7 +203,7 @@ using namespace Editing;
 
 ARDOUR_UI *ARDOUR_UI::theArdourUI = 0;
 
-sigc::signal<void, framepos_t, bool, framepos_t> ARDOUR_UI::Clock;
+sigc::signal<void, samplepos_t> ARDOUR_UI::Clock;
 sigc::signal<void> ARDOUR_UI::CloseAllDialogs;
 
 static bool
@@ -284,13 +286,6 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
        , _initial_verbose_plugin_scan (false)
        , first_time_engine_run (true)
        , secondary_clock_spacer (0)
-       , roll_controllable (new TransportControllable ("transport roll", *this, TransportControllable::Roll))
-       , stop_controllable (new TransportControllable ("transport stop", *this, TransportControllable::Stop))
-       , goto_start_controllable (new TransportControllable ("transport goto start", *this, TransportControllable::GotoStart))
-       , goto_end_controllable (new TransportControllable ("transport goto end", *this, TransportControllable::GotoEnd))
-       , auto_loop_controllable (new TransportControllable ("transport auto loop", *this, TransportControllable::AutoLoop))
-       , play_selection_controllable (new TransportControllable ("transport play selection", *this, TransportControllable::PlaySelection))
-       , rec_controllable (new TransportControllable ("transport rec-enable", *this, TransportControllable::RecordEnable))
        , auto_input_button (ArdourButton::led_default_elements)
        , time_info_box (0)
        , auto_return_button (ArdourButton::led_default_elements)
@@ -322,6 +317,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
        , add_video_dialog (X_("add-video"), _("Add Video"), 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))
+       , big_transport_window (X_("big-transport"), _("Transport Controls"), boost::bind (&ARDOUR_UI::create_big_transport_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))
        , key_editor (X_("key-editor"), _("Keyboard Shortcuts"), boost::bind (&ARDOUR_UI::create_key_editor, this))
@@ -379,25 +375,10 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
        boost::function<void (string)> pc (boost::bind (&ARDOUR_UI::parameter_changed, this, _1));
        UIConfiguration::instance().map_parameters (pc);
 
-       roll_button.set_controllable (roll_controllable);
-       stop_button.set_controllable (stop_controllable);
-       goto_start_button.set_controllable (goto_start_controllable);
-       goto_end_button.set_controllable (goto_end_controllable);
-       auto_loop_button.set_controllable (auto_loop_controllable);
-       play_selection_button.set_controllable (play_selection_controllable);
-       rec_button.set_controllable (rec_controllable);
-
-       roll_button.set_name ("transport button");
-       stop_button.set_name ("transport button");
-       goto_start_button.set_name ("transport button");
-       goto_end_button.set_name ("transport button");
-       auto_loop_button.set_name ("transport button");
-       play_selection_button.set_name ("transport button");
-       rec_button.set_name ("transport recenable button");
-       midi_panic_button.set_name ("transport button");
-
-       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());
+       transport_ctrl.setup (this);
+
+       ARDOUR::DiskWriter::Overrun.connect (forever_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::disk_overrun_handler, this), gui_context());
+       ARDOUR::DiskReader::Underrun.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());
 
@@ -485,6 +466,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
                bundle_manager.set_state (*ui_xml, 0);
                location_ui.set_state (*ui_xml, 0);
                big_clock_window.set_state (*ui_xml, 0);
+               big_transport_window.set_state (*ui_xml, 0);
                audio_port_matrix.set_state (*ui_xml, 0);
                midi_port_matrix.set_state (*ui_xml, 0);
                export_video_dialog.set_state (*ui_xml, 0);
@@ -507,6 +489,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
        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 (&big_transport_window);
        WM::Manager::instance().register_window (&audio_port_matrix);
        WM::Manager::instance().register_window (&midi_port_matrix);
        WM::Manager::instance().register_window (&idleometer);
@@ -543,7 +526,7 @@ release software. So, a few guidelines:\n\
 2) Please wait for a helpful writeup of new features.\n\
 3) <b>Please do NOT use the forums at ardour.org to report issues</b>.\n\
 4) Please <b>DO</b> use the bugtracker at http://tracker.ardour.org/ to report issues\n\
-   making sure to note the product version number as 5.0-pre.\n\
+   making sure to note the product version number as 6.0-pre.\n\
 5) Please <b>DO</b> use the ardour-users mailing list to discuss ideas and pass on comments.\n\
 6) Please <b>DO</b> join us on IRC for real time discussions about %1 %2. You\n\
    can get there directly from within the program via the Help->Chat menu option.\n\
@@ -679,6 +662,8 @@ ARDOUR_UI::post_engine ()
                throw failed_constructor ();
        }
 
+       transport_ctrl.map_actions ();
+
        /* Do this after setup_windows (), as that's when the _status_bar_visibility is created */
        XMLNode* n = Config->extra_xml (X_("UI"));
        if (n) {
@@ -769,7 +754,7 @@ ARDOUR_UI::post_engine ()
                vector<string>::iterator l;
 
                for (p = paths.begin(), l = labels.begin(); p != paths.end(); ++p, ++l) {
-                       output << "     <tr><th><kbd class=\"osc\">" << (*p).substr (9, string::npos);
+                       output << "     <tr><th><kbd class=\"osc\">" << (*p).substr (10, string::npos);
                        output << "</kbd></th><td>" << *l << "</td></tr>" << endl;
                }
                output << "  </tbody>\n  </table>" << endl;
@@ -781,7 +766,7 @@ ARDOUR_UI::post_engine ()
                GError *err = NULL;
                gint fd;
 
-               if ((fd = g_file_open_tmp ("akprintXXXXXX.html", &file_name, &err)) < 0) {
+               if ((fd = g_file_open_tmp ("list-of-menu-actionsXXXXXX.html", &file_name, &err)) < 0) {
                        if (err) {
                                error << string_compose (_("Could not open temporary file to print bindings (%1)"), err->message) << endmsg;
                                g_error_free (err);
@@ -1106,7 +1091,7 @@ ARDOUR_UI::starting ()
                         * The wrapper startup script should set the environment variable 'ARDOUR_SELF'
                         */
                        const char *process_name = g_getenv ("ARDOUR_SELF");
-                       nsm->announce (PROGRAM_NAME, ":dirty:", process_name ? process_name : "ardour4");
+                       nsm->announce (PROGRAM_NAME, ":dirty:", process_name ? process_name : "ardour6");
 
                        unsigned int i = 0;
                        // wait for announce reply from nsm server
@@ -1189,15 +1174,13 @@ ARDOUR_UI::starting ()
                        Searchpath ds (ARDOUR::ardour_data_search_path());
                        ds.add_subdirectory_to_paths ("sessions");
                        vector<string> demos;
-                       find_files_matching_pattern (demos, ds, "*.tar.xz");
+                       find_files_matching_pattern (demos, ds, ARDOUR::session_archive_suffix);
 
                        ARDOUR::RecentSessions rs;
                        ARDOUR::read_recent_sessions (rs);
 
                        for (vector<string>::iterator i = demos.begin(); i != demos.end (); ++i) {
-                               /* "demo-session" must be inside "demo-session.tar.xz"
-                                * strip ".tar.xz"
-                                */
+                               /* "demo-session" must be inside "demo-session.<session_archive_suffix>" */
                                std::string name = basename_nosuffix (basename_nosuffix (*i));
                                std::string path = Glib::build_filename (dspd, name);
                                /* skip if session-dir already exists */
@@ -1548,8 +1531,7 @@ ARDOUR_UI::every_second ()
 void
 ARDOUR_UI::every_point_one_seconds ()
 {
-       // TODO get rid of this..
-       // ShuttleControl is updated directly via TransportStateChange signal
+       if (editor) editor->build_region_boundary_cache();
 }
 
 void
@@ -1580,7 +1562,7 @@ ARDOUR_UI::set_fps_timeout_connection ()
                 * signals to the GUI Thread..
                 */
                interval = floor(500. /* update twice per FPS, since Glib::signal_timeout is very irregular */
-                               * _session->frame_rate() / _session->nominal_frame_rate()
+                               * _session->sample_rate() / _session->nominal_sample_rate()
                                / _session->timecode_frames_per_second()
                                );
 #ifdef PLATFORM_WINDOWS
@@ -1600,7 +1582,7 @@ ARDOUR_UI::set_fps_timeout_connection ()
 }
 
 void
-ARDOUR_UI::update_sample_rate (framecnt_t)
+ARDOUR_UI::update_sample_rate (samplecnt_t)
 {
        char buf[64];
 
@@ -1612,7 +1594,7 @@ ARDOUR_UI::update_sample_rate (framecnt_t)
 
        } else {
 
-               framecnt_t rate = AudioEngine::instance()->sample_rate();
+               samplecnt_t rate = AudioEngine::instance()->sample_rate();
 
                if (rate == 0) {
                        /* no sample rate available */
@@ -1704,6 +1686,7 @@ ARDOUR_UI::update_xrun_count ()
 
        if (_session) {
                const unsigned int x = _session->get_xrun_count ();
+               dsp_load_indicator.set_xrun_count (x);
                if (x > 9999) {
                        snprintf (buf, sizeof (buf), _("X: <span foreground=\"%s\">&gt;10K</span>"), X_("red"));
                } else {
@@ -1711,6 +1694,7 @@ ARDOUR_UI::update_xrun_count ()
                }
        } else {
                snprintf (buf, sizeof (buf), _("X: <span foreground=\"%s\">?</span>"), X_("yellow"));
+               dsp_load_indicator.set_xrun_count (UINT_MAX);
        }
        xrun_label.set_markup (buf);
        set_tip (xrun_label, _("Audio dropouts. Shift+click to reset"));
@@ -1726,6 +1710,7 @@ ARDOUR_UI::update_cpu_load ()
        */
 
        double const c = AudioEngine::instance()->get_dsp_load ();
+       dsp_load_indicator.set_dsp_load (c);
        snprintf (buf, sizeof (buf), _("DSP: <span foreground=\"%s\">%5.1f%%</span>"), c >= 90 ? X_("red") : X_("green"), c);
        cpu_load_label.set_markup (buf);
 }
@@ -1785,46 +1770,52 @@ void
 ARDOUR_UI::update_disk_space()
 {
        if (_session == 0) {
+               disk_space_indicator.set_available_disk_sec (-1);
                return;
        }
 
-       boost::optional<framecnt_t> opt_frames = _session->available_capture_duration();
+       boost::optional<samplecnt_t> opt_samples = _session->available_capture_duration();
        char buf[64];
-       framecnt_t fr = _session->frame_rate();
+       samplecnt_t fr = _session->sample_rate();
 
        if (fr == 0) {
                /* skip update - no SR available */
+               disk_space_indicator.set_available_disk_sec (-1);
                return;
        }
 
-       if (!opt_frames) {
+       if (!opt_samples) {
                /* 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) {
+               disk_space_indicator.set_available_disk_sec (-1);
+       } else if (opt_samples.get_value_or (0) == max_samplecnt) {
                snprintf (buf, sizeof (buf), "%s", _("Disk: <span foreground=\"green\">24hrs+</span>"));
+               disk_space_indicator.set_available_disk_sec (max_samplecnt);
        } else {
                rec_enabled_streams = 0;
                _session->foreach_route (this, &ARDOUR_UI::count_recenabled_streams, false);
 
-               framecnt_t frames = opt_frames.get_value_or (0);
+               samplecnt_t samples = opt_samples.get_value_or (0);
 
                if (rec_enabled_streams) {
-                       frames /= rec_enabled_streams;
+                       samples /= rec_enabled_streams;
                }
 
                int hrs;
                int mins;
                int secs;
 
-               hrs  = frames / (fr * 3600);
+               disk_space_indicator.set_available_disk_sec (samples / (float)fr);
+
+               hrs  = samples / (fr * 3600);
 
                if (hrs > 24) {
                        snprintf (buf, sizeof (buf), "%s", _("Disk: <span foreground=\"green\">&gt;24 hrs</span>"));
                } else {
-                       frames -= hrs * fr * 3600;
-                       mins = frames / (fr * 60);
-                       frames -= mins * fr * 60;
-                       secs = frames / fr;
+                       samples -= hrs * fr * 3600;
+                       mins = samples / (fr * 60);
+                       samples -= mins * fr * 60;
+                       secs = samples / fr;
 
                        bool const low = (hrs == 0 && mins <= 30);
 
@@ -1970,7 +1961,7 @@ ARDOUR_UI::open_session ()
                string default_session_folder = Config->get_default_session_parent_dir();
                open_session_selector.add_shortcut_folder (default_session_folder);
        }
-       catch (Glib::Error & e) {
+       catch (Glib::Error const& e) {
                std::cerr << "open_session_selector.add_shortcut_folder() threw Glib::Error " << e.what() << std::endl;
        }
 
@@ -1980,7 +1971,7 @@ ARDOUR_UI::open_session ()
        open_session_selector.add_filter (session_filter);
 
        FileFilter archive_filter;
-       archive_filter.add_pattern (X_("*.tar.xz"));
+       archive_filter.add_pattern (string_compose(X_("*%1"), ARDOUR::session_archive_suffix));
        archive_filter.set_name (_("Session Archives"));
 
        open_session_selector.add_filter (archive_filter);
@@ -2179,7 +2170,7 @@ ARDOUR_UI::transport_goto_start ()
                */
 
                if (editor) {
-                       editor->center_screen (_session->current_start_frame ());
+                       editor->center_screen (_session->current_start_sample ());
                }
        }
 }
@@ -2207,30 +2198,30 @@ ARDOUR_UI::transport_goto_wallclock ()
 
                time_t now;
                struct tm tmnow;
-               framepos_t frames;
+               samplepos_t samples;
 
                time (&now);
                localtime_r (&now, &tmnow);
 
-               framecnt_t frame_rate = _session->frame_rate();
+               samplecnt_t sample_rate = _session->sample_rate();
 
-               if (frame_rate == 0) {
+               if (sample_rate == 0) {
                        /* no frame rate available */
                        return;
                }
 
-               frames = tmnow.tm_hour * (60 * 60 * frame_rate);
-               frames += tmnow.tm_min * (60 * frame_rate);
-               frames += tmnow.tm_sec * frame_rate;
+               samples = tmnow.tm_hour * (60 * 60 * sample_rate);
+               samples += tmnow.tm_min * (60 * sample_rate);
+               samples += tmnow.tm_sec * sample_rate;
 
-               _session->request_locate (frames, _session->transport_rolling ());
+               _session->request_locate (samples, _session->transport_rolling ());
 
                /* force displayed area in editor to start no matter
                   what "follow playhead" setting is.
                */
 
                if (editor) {
-                       editor->center_screen (frames);
+                       editor->center_screen (samples);
                }
        }
 }
@@ -2239,15 +2230,15 @@ void
 ARDOUR_UI::transport_goto_end ()
 {
        if (_session) {
-               framepos_t const frame = _session->current_end_frame();
-               _session->request_locate (frame);
+               samplepos_t const sample = _session->current_end_sample();
+               _session->request_locate (sample);
 
                /* force displayed area in editor to start no matter
                   what "follow playhead" setting is.
                */
 
                if (editor) {
-                       editor->center_screen (frame);
+                       editor->center_screen (sample);
                }
        }
 }
@@ -2460,9 +2451,9 @@ ARDOUR_UI::toggle_roll (bool with_abort, bool roll_out_of_bounded_mode)
                         * want to do this.
                         */
 
-                       if (UIConfiguration::instance().get_follow_edits() && ( editor->get_selection().time.front().start == _session->transport_frame() ) ) {  //if playhead is exactly at the start of a range, we can assume it was placed there by follow_edits
+                       if (UIConfiguration::instance().get_follow_edits() && ( editor->get_selection().time.front().start == _session->transport_sample() ) ) {  //if playhead is exactly at the start of a range, we can assume it was placed there by follow_edits
                                _session->request_play_range (&editor->get_selection().time, true);
-                               _session->set_requested_return_frame( editor->get_selection().time.front().start );  //force an auto-return here
+                               _session->set_requested_return_sample( editor->get_selection().time.front().start );  //force an auto-return here
                        }
                        _session->request_transport_speed (1.0f);
                }
@@ -2621,10 +2612,6 @@ void
 ARDOUR_UI::map_transport_state ()
 {
        if (!_session) {
-               auto_loop_button.unset_active_state ();
-               play_selection_button.unset_active_state ();
-               roll_button.unset_active_state ();
-               stop_button.set_active_state (Gtkmm2ext::ExplicitActive);
                layered_button.set_sensitive (false);
                return;
        }
@@ -2634,52 +2621,9 @@ ARDOUR_UI::map_transport_state ()
        float sp = _session->transport_speed();
 
        if (sp != 0.0f) {
-
-               /* we're rolling */
-
-               if (_session->get_play_range()) {
-
-                       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 (true);
-                       play_selection_button.set_active (false);
-                       if (Config->get_loop_is_mode()) {
-                               roll_button.set_active (true);
-                       } else {
-                               roll_button.set_active (false);
-                       }
-
-               } else {
-
-                       roll_button.set_active (true);
-                       play_selection_button.set_active (false);
-                       auto_loop_button.set_active (false);
-               }
-
-               if (UIConfiguration::instance().get_follow_edits() && !_session->config.get_external_sync()) {
-                       /* light up both roll and play-selection if they are joined */
-                       roll_button.set_active (true);
-                       play_selection_button.set_active (true);
-               }
                layered_button.set_sensitive (!_session->actively_recording ());
-
-               stop_button.set_active (false);
-
        } else {
-
                layered_button.set_sensitive (true);
-               stop_button.set_active (true);
-               roll_button.set_active (false);
-               play_selection_button.set_active (false);
-               if (Config->get_loop_is_mode ()) {
-                       auto_loop_button.set_active (_session->get_play_loop());
-               } else {
-                       auto_loop_button.set_active (false);
-               }
                update_disk_space ();
        }
 }
@@ -2687,7 +2631,6 @@ ARDOUR_UI::map_transport_state ()
 void
 ARDOUR_UI::blink_handler (bool blink_on)
 {
-       transport_rec_enable_blink (blink_on);
        sync_blink (blink_on);
 
        if (!UIConfiguration::instance().get_blink_alert_indicators()) {
@@ -2705,7 +2648,7 @@ ARDOUR_UI::update_clocks ()
        if (!_session) return;
 
        if (editor && !editor->dragging_playhead()) {
-               Clock (_session->audible_frame(), false, editor->get_preferred_edit_position (EDIT_IGNORE_PHEAD)); /* EMIT_SIGNAL */
+               Clock (_session->audible_sample()); /* EMIT_SIGNAL */
        }
 }
 
@@ -2876,7 +2819,7 @@ ARDOUR_UI::archive_session ()
                return;
        }
 
-       if (_session->archive_session (sad.target_folder(), sad.name(), sad.encode_option (), sad.only_used_sources (), &sad)) {
+       if (_session->archive_session (sad.target_folder(), sad.name(), sad.encode_option (), sad.compression_level (), sad.only_used_sources (), &sad)) {
                MessageDialog msg (_("Session Archiving failed."));
                msg.run ();
        }
@@ -3131,34 +3074,6 @@ ARDOUR_UI::secondary_clock_value_changed ()
                _session->request_locate (secondary_clock->current_time ());
        }
 }
-
-void
-ARDOUR_UI::transport_rec_enable_blink (bool onoff)
-{
-       if (_session == 0) {
-               return;
-       }
-
-       if (_session->step_editing()) {
-               return;
-       }
-
-       Session::RecordState const r = _session->record_status ();
-       bool const h = _session->have_rec_enabled_track ();
-
-       if (r == Session::Enabled || (r == Session::Recording && !h)) {
-               if (onoff) {
-                       rec_button.set_active_state (Gtkmm2ext::ExplicitActive);
-               } else {
-                       rec_button.set_active_state (Gtkmm2ext::Off);
-               }
-       } else if (r == Session::Recording && h) {
-               rec_button.set_active_state (Gtkmm2ext::ExplicitActive);
-       } else {
-               rec_button.unset_active_state ();
-       }
-}
-
 void
 ARDOUR_UI::save_template_dialog_response (int response, SaveTemplateDialog* d)
 {
@@ -3192,10 +3107,9 @@ ARDOUR_UI::save_template ()
                return;
        }
 
-       SaveTemplateDialog* d = new SaveTemplateDialog (_session->name());
-
+       const std::string desc = SessionMetadata::Metadata()->description ();
+       SaveTemplateDialog* d = new SaveTemplateDialog (_session->name (), desc);
        d->signal_response().connect (sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::save_template_dialog_response), d));
-
        d->show ();
 }
 
@@ -3644,7 +3558,7 @@ ARDOUR_UI::load_session (const std::string& path, const std::string& snap_name,
 
        /* this one is special */
 
-       catch (AudioEngine::PortRegistrationFailure& err) {
+       catch (AudioEngine::PortRegistrationFailure const& err) {
 
                MessageDialog msg (err.what(),
                                   true,
@@ -3669,7 +3583,7 @@ ARDOUR_UI::load_session (const std::string& path, const std::string& snap_name,
                }
                goto out;
        }
-       catch (SessionException e) {
+       catch (SessionException const& e) {
                MessageDialog msg (string_compose(
                                           _("Session \"%1 (snapshot %2)\" did not load successfully:\n%3"),
                                           path, snap_name, e.what()),
@@ -3805,7 +3719,7 @@ ARDOUR_UI::build_session (const std::string& path, const std::string& snap_name,
                new_session = new Session (*AudioEngine::instance(), path, snap_name, bus_profile);
        }
 
-       catch (SessionException e) {
+       catch (SessionException const& e) {
                cerr << "Here are the errors associated with this failed session:\n";
                dump_errors (cerr);
                cerr << "---------\n";
@@ -4345,7 +4259,7 @@ ARDOUR_UI::cleanup_peakfiles ()
        RegionSelection rs;
        TrackViewList empty;
        empty.clear();
-       editor->get_regions_after(rs, (framepos_t) 0, empty);
+       editor->get_regions_after(rs, (samplepos_t) 0, empty);
        std::list<RegionView*> views = rs.by_layer();
 
        // remove displayed audio-region-views waveforms
@@ -4450,6 +4364,7 @@ ARDOUR_UI::add_route_dialog_response (int r)
 
        switch (r) {
        case AddRouteDialog::Add:
+               add_route_dialog->reset_name_edited ();
                break;
        case AddRouteDialog::AddAndClose:
                add_route_dialog->ArdourDialog::on_response (r);
@@ -4793,10 +4708,10 @@ ARDOUR_UI::add_video (Gtk::Window* float_window)
                                LTCFileReader ltcr (audio_from_video, video_timeline->get_video_file_fps());
                                /* TODO ASK user which channel:  0 .. ltcr->channels() - 1 */
 
-                               ltc_seq = ltcr.read_ltc (/*channel*/ 0, /*max LTC frames to decode*/ 15);
+                               ltc_seq = ltcr.read_ltc (/*channel*/ 0, /*max LTC samples to decode*/ 15);
 
                                /* TODO seek near end of file, and read LTC until end.
-                                * if it fails to find any LTC frames, scan complete file
+                                * if it fails to find any LTC samples, scan complete file
                                 *
                                 * calculate drift of LTC compared to video-duration,
                                 * ask user for reference (timecode from start/mid/end)
@@ -4812,16 +4727,16 @@ ARDOUR_UI::add_video (Gtk::Window* float_window)
                        } else {
                                /* the very first TC in the file is somteimes not aligned properly */
                                int i = ltc_seq.size() -1;
-                               ARDOUR::frameoffset_t video_start_offset =
-                                       _session->nominal_frame_rate() * (ltc_seq[i].timecode_sec - ltc_seq[i].framepos_sec);
+                               ARDOUR::sampleoffset_t video_start_offset =
+                                       _session->nominal_sample_rate() * (ltc_seq[i].timecode_sec - ltc_seq[i].framepos_sec);
                                PBD::info << string_compose (_("Align video-start to %1 [samples]"), video_start_offset) << endmsg;
                                video_timeline->set_offset(video_start_offset);
                        }
                }
 
                _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));
+                       std::max(video_timeline->get_offset(), (ARDOUR::sampleoffset_t) 0),
+                       std::max(video_timeline->get_offset() + video_timeline->get_duration(), (ARDOUR::sampleoffset_t) 0));
 
 
                if (add_video_dialog->launch_xjadeo() && local_file) {
@@ -4987,7 +4902,7 @@ ARDOUR_UI::keyboard_settings () const
 }
 
 void
-ARDOUR_UI::create_xrun_marker (framepos_t where)
+ARDOUR_UI::create_xrun_marker (samplepos_t where)
 {
        if (_session) {
                Location *location = new Location (*_session, where, where, _("xrun"), Location::IsMark, 0);
@@ -5004,7 +4919,7 @@ ARDOUR_UI::halt_on_xrun_message ()
 }
 
 void
-ARDOUR_UI::xrun_handler (framepos_t where)
+ARDOUR_UI::xrun_handler (samplepos_t where)
 {
        if (!_session) {
                return;
@@ -5228,7 +5143,7 @@ what you would like to do.\n"), PROGRAM_NAME));
 }
 
 int
-ARDOUR_UI::sr_mismatch_dialog (framecnt_t desired, framecnt_t actual)
+ARDOUR_UI::sr_mismatch_dialog (samplecnt_t desired, samplecnt_t actual)
 {
        HBox* hbox = new HBox();
        Image* image = new Image (Stock::DIALOG_WARNING, ICON_SIZE_DIALOG);
@@ -5261,7 +5176,7 @@ audio may be played at the wrong sample rate.\n"), desired, PROGRAM_NAME, actual
 }
 
 void
-ARDOUR_UI::sr_mismatch_message (framecnt_t desired, framecnt_t actual)
+ARDOUR_UI::sr_mismatch_message (samplecnt_t desired, samplecnt_t actual)
 {
        MessageDialog msg (string_compose (_("\
 This session was created with a sample rate of %1 Hz, but\n\
@@ -5285,18 +5200,36 @@ ARDOUR_UI::use_config ()
 }
 
 void
-ARDOUR_UI::update_transport_clocks (framepos_t pos)
+ARDOUR_UI::update_transport_clocks (samplepos_t pos)
 {
-       if (UIConfiguration::instance().get_primary_clock_delta_edit_cursor()) {
-               primary_clock->set (pos, false, editor->get_preferred_edit_position (EDIT_IGNORE_PHEAD));
-       } else {
-               primary_clock->set (pos);
+       switch (UIConfiguration::instance().get_primary_clock_delta_mode()) {
+               case NoDelta:
+                       primary_clock->set (pos);
+                       break;
+               case DeltaEditPoint:
+                       primary_clock->set (pos, false, editor->get_preferred_edit_position (EDIT_IGNORE_PHEAD));
+                       break;
+               case DeltaOriginMarker:
+                       {
+                               Location* loc = _session->locations()->clock_origin_location ();
+                               primary_clock->set (pos, false, loc ? loc->start() : 0);
+                       }
+                       break;
        }
 
-       if (UIConfiguration::instance().get_secondary_clock_delta_edit_cursor()) {
-               secondary_clock->set (pos, false, editor->get_preferred_edit_position (EDIT_IGNORE_PHEAD));
-       } else {
-               secondary_clock->set (pos);
+       switch (UIConfiguration::instance().get_secondary_clock_delta_mode()) {
+               case NoDelta:
+                       secondary_clock->set (pos);
+                       break;
+               case DeltaEditPoint:
+                       secondary_clock->set (pos, false, editor->get_preferred_edit_position (EDIT_IGNORE_PHEAD));
+                       break;
+               case DeltaOriginMarker:
+                       {
+                               Location* loc = _session->locations()->clock_origin_location ();
+                               secondary_clock->set (pos, false, loc ? loc->start() : 0);
+                       }
+                       break;
        }
 
        if (big_clock_window) {
@@ -5305,20 +5238,6 @@ ARDOUR_UI::update_transport_clocks (framepos_t pos)
        ARDOUR_UI::instance()->video_timeline->manual_seek_video_monitor(pos);
 }
 
-void
-ARDOUR_UI::step_edit_status_change (bool yn)
-{
-       // XXX should really store pre-step edit status of things
-       // we make insensitive
-
-       if (yn) {
-               rec_button.set_active_state (Gtkmm2ext::ImplicitActive);
-               rec_button.set_sensitive (false);
-       } else {
-               rec_button.unset_active_state ();;
-               rec_button.set_sensitive (true);
-       }
-}
 
 void
 ARDOUR_UI::record_state_changed ()
@@ -5385,86 +5304,6 @@ ARDOUR_UI::store_clock_modes ()
        _session->set_dirty ();
 }
 
-ARDOUR_UI::TransportControllable::TransportControllable (std::string name, ARDOUR_UI& u, ToggleType tp)
-       : Controllable (name), ui (u), type(tp)
-{
-
-}
-
-void
-ARDOUR_UI::TransportControllable::set_value (double val, PBD::Controllable::GroupControlDisposition /*group_override*/)
-{
-       if (val < 0.5) {
-               /* do nothing: these are radio-style actions */
-               return;
-       }
-
-       const char *action = 0;
-
-       switch (type) {
-       case Roll:
-               action = X_("Roll");
-               break;
-       case Stop:
-               action = X_("Stop");
-               break;
-       case GotoStart:
-               action = X_("GotoStart");
-               break;
-       case GotoEnd:
-               action = X_("GotoEnd");
-               break;
-       case AutoLoop:
-               action = X_("Loop");
-               break;
-       case PlaySelection:
-               action = X_("PlaySelection");
-               break;
-       case RecordEnable:
-               action = X_("Record");
-               break;
-       default:
-               break;
-       }
-
-       if (action == 0) {
-               return;
-       }
-
-       Glib::RefPtr<Action> act = ActionManager::get_action ("Transport", action);
-
-       if (act) {
-               act->activate ();
-       }
-}
-
-double
-ARDOUR_UI::TransportControllable::get_value (void) const
-{
-       float val = 0.0;
-
-       switch (type) {
-       case Roll:
-               break;
-       case Stop:
-               break;
-       case GotoStart:
-               break;
-       case GotoEnd:
-               break;
-       case AutoLoop:
-               break;
-       case PlaySelection:
-               break;
-       case RecordEnable:
-               break;
-       default:
-               break;
-       }
-
-       return val;
-}
-
 void
 ARDOUR_UI::setup_profile ()
 {