Fix playhead smoothing when auditioning.

[ardour.git] / gtk2_ardour / region_editor.cc

diff --git a/gtk2_ardour/region_editor.cc b/gtk2_ardour/region_editor.cc
index b4807508103bf4fc23fb3dff55b2bb27fee5d305..36c648b7128d71815777a4aa52693d614359a5bb 100644 (file)
--- a/gtk2_ardour/region_editor.cc
+++ b/gtk2_ardour/region_editor.cc
@@ -20,10 +20,13 @@
 #include <cmath>
 
 #include <gtkmm/listviewtext.h>
+#include <gtkmm/stock.h>
 
 #include "pbd/memento_command.h"
 #include "pbd/stateful_diff_command.h"
 
+#include "widgets/tooltips.h"
+
 #include "ardour/region.h"
 #include "ardour/session.h"
 #include "ardour/source.h"
@@ -34,7 +37,6 @@
 #include "gui_thread.h"
 #include "region_editor.h"
 #include "public_editor.h"
-#include "tooltips.h"
 
 #include "pbd/i18n.h"
 
@@ -42,7 +44,6 @@ using namespace ARDOUR;
 using namespace PBD;
 using namespace std;
 using namespace Gtkmm2ext;
-using namespace ARDOUR_UI_UTILS;
 
 RegionEditor::RegionEditor (Session* s, boost::shared_ptr<Region> r)
        : ArdourDialog (_("Region"))
@@ -63,7 +64,9 @@ RegionEditor::RegionEditor (Session* s, boost::shared_ptr<Region> r)
 {
        set_session (s);
 
-       _clock_group->set_clock_mode (ARDOUR_UI::instance()->secondary_clock->mode());
+       _clock_group->set_clock_mode (ARDOUR_UI::instance()->primary_clock->mode());
+       ARDOUR_UI::instance()->primary_clock->mode_changed.connect (sigc::mem_fun (*this, &RegionEditor::set_clock_mode_from_primary));
+
        _clock_group->add (position_clock);
        _clock_group->add (end_clock);
        _clock_group->add (length_clock);
@@ -78,7 +81,7 @@ RegionEditor::RegionEditor (Session* s, boost::shared_ptr<Region> r)
        sync_offset_absolute_clock.set_session (_session);
        start_clock.set_session (_session);
 
-       set_tooltip (audition_button, _("audition this region"));
+       ArdourWidgets::set_tooltip (audition_button, _("audition this region"));
 
        audition_button.unset_flags (Gtk::CAN_FOCUS);
 
@@ -201,6 +204,12 @@ RegionEditor::~RegionEditor ()
        delete _clock_group;
 }
 
+void
+RegionEditor::set_clock_mode_from_primary ()
+{
+       _clock_group->set_clock_mode (ARDOUR_UI::instance()->primary_clock->mode());
+}
+
 void
 RegionEditor::region_changed (const PBD::PropertyChange& what_changed)
 {
@@ -314,7 +323,7 @@ RegionEditor::end_clock_changed ()
 void
 RegionEditor::length_clock_changed ()
 {
-       framecnt_t frames = length_clock.current_time();
+       samplecnt_t samples = length_clock.current_time();
        bool in_command = false;
        boost::shared_ptr<Playlist> pl = _region->playlist();
 
@@ -323,7 +332,7 @@ RegionEditor::length_clock_changed ()
                in_command = true;
 
                _region->clear_changes ();
-               _region->trim_end (_region->position() + frames - 1);
+               _region->trim_end (_region->position() + samples - 1);
                _session->add_command(new StatefulDiffCommand (_region));
        }
 
@@ -369,7 +378,7 @@ RegionEditor::bounds_changed (const PropertyChange& what_changed)
 
        if (what_changed.contains (ARDOUR::Properties::sync_position) || what_changed.contains (ARDOUR::Properties::position)) {
                int dir;
-               frameoffset_t off = _region->sync_offset (dir);
+               sampleoffset_t off = _region->sync_offset (dir);
                if (dir == -1) {
                        off = -off;
                }