X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fregion_editor.cc;h=36c648b7128d71815777a4aa52693d614359a5bb;hb=76f9764a440231722fbf256a07dc8f88eb2ab64c;hp=596f6009aad5a6ded0263eec68e772aae707e583;hpb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;p=ardour.git

diff --git a/gtk2_ardour/region_editor.cc b/gtk2_ardour/region_editor.cc
index 596f6009aa..36c648b712 100644
--- 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,34 +44,35 @@ 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"))
-        , _table (9, 2)
-        , _table_row (0)
-        , _region (r)
-        , name_label (_("Name:"))
-        , audition_button (_("Audition"))
-        , _clock_group (new ClockGroup)
-        , position_clock (X_("regionposition"), true, "", true, false)
-        , end_clock (X_("regionend"), true, "", true, false)
-        , length_clock (X_("regionlength"), true, "", true, false, true)
-        , sync_offset_relative_clock (X_("regionsyncoffsetrelative"), true, "", true, false)
-        , sync_offset_absolute_clock (X_("regionsyncoffsetabsolute"), true, "", true, false)
-          /* XXX cannot file start yet */
-        , start_clock (X_("regionstart"), true, "", false, false)
-        , _sources (1)
+	, _table (9, 2)
+	, _table_row (0)
+	, _region (r)
+	, name_label (_("Name:"))
+	, audition_button (_("Audition"))
+	, _clock_group (new ClockGroup)
+	, position_clock (X_("regionposition"), true, "", true, false)
+	, end_clock (X_("regionend"), true, "", true, false)
+	, length_clock (X_("regionlength"), true, "", true, false, true)
+	, sync_offset_relative_clock (X_("regionsyncoffsetrelative"), true, "", true, false)
+	, sync_offset_absolute_clock (X_("regionsyncoffsetabsolute"), true, "", true, false)
+	  /* XXX cannot file start yet */
+	, start_clock (X_("regionstart"), true, "", false, false)
+	, _sources (1)
 {
 	set_session (s);
 
-        _clock_group->set_clock_mode (ARDOUR_UI::instance()->secondary_clock->mode());
-        _clock_group->add (position_clock);
-        _clock_group->add (end_clock);
-        _clock_group->add (length_clock);
-        _clock_group->add (sync_offset_relative_clock);
-        _clock_group->add (sync_offset_absolute_clock);
-        _clock_group->add (start_clock);
+	_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);
+	_clock_group->add (sync_offset_relative_clock);
+	_clock_group->add (sync_offset_absolute_clock);
+	_clock_group->add (start_clock);
 
 	position_clock.set_session (_session);
 	end_clock.set_session (_session);
@@ -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);
 
@@ -198,7 +201,13 @@ RegionEditor::RegionEditor (Session* s, boost::shared_ptr<Region> r)
 
 RegionEditor::~RegionEditor ()
 {
-        delete _clock_group;
+	delete _clock_group;
+}
+
+void
+RegionEditor::set_clock_mode_from_primary ()
+{
+	_clock_group->set_clock_mode (ARDOUR_UI::instance()->primary_clock->mode());
 }
 
 void
@@ -299,7 +308,7 @@ RegionEditor::end_clock_changed ()
 		PublicEditor::instance().begin_reversible_command (_("change region end position"));
 		in_command = true;
 
-                _region->clear_changes ();
+		_region->clear_changes ();
 		_region->trim_end (end_clock.current_time());
 		_session->add_command(new StatefulDiffCommand (_region));
 	}
@@ -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;
 		}
@@ -415,7 +424,7 @@ RegionEditor::sync_offset_absolute_clock_changed ()
 {
 	PublicEditor::instance().begin_reversible_command (_("change region sync point"));
 
-        _region->clear_changes ();
+	_region->clear_changes ();
 	_region->set_sync_position (sync_offset_absolute_clock.current_time());
 	_session->add_command (new StatefulDiffCommand (_region));
 
@@ -427,7 +436,7 @@ RegionEditor::sync_offset_relative_clock_changed ()
 {
 	PublicEditor::instance().begin_reversible_command (_("change region sync point"));
 
-        _region->clear_changes ();
+	_region->clear_changes ();
 	_region->set_sync_position (sync_offset_relative_clock.current_time() + _region->position ());
 	_session->add_command (new StatefulDiffCommand (_region));