group clocks in location UI and region editor so that they all change modes together

git-svn-id: svn://localhost/ardour2/branches/3.0@9048 d708f5d6-7413-0410-9779-e7cbd77b26cf

8 files changed, 331 insertions, 149 deletions

diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc
index 6e65e512b2..dd781c270d 100644
--- a/gtk2_ardour/audio_clock.cc
+++ b/gtk2_ardour/audio_clock.cc
@@ -2056,10 +2056,11 @@ AudioClock::set_mode (Mode m)
 	clock_base.show_all ();
 	key_entry_state = 0;
 
-	if (!is_transient) {
-		ModeChanged (); /* EMIT SIGNAL */
-		mode_changed (); /* EMIT SIGNAL */
-	}
+        if (!is_transient) {
+                ModeChanged (); /* EMIT SIGNAL (the static one)*/
+        }
+
+        mode_changed (); /* EMIT SIGNAL (the member one) */
 }
 
 void
diff --git a/gtk2_ardour/clock_group.cc b/gtk2_ardour/clock_group.cc
new file mode 100644
index 0000000000..5a03064e85
--- /dev/null
+++ b/gtk2_ardour/clock_group.cc
@@ -0,0 +1,66 @@
+/*
+    Copyright (C) 2011 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include "clock_group.h"
+
+ClockGroup::ClockGroup ()
+        : ignore_changes (false)
+        , _clock_mode (AudioClock::Frames)
+{
+}
+
+ClockGroup::~ClockGroup()
+{
+}
+
+void
+ClockGroup::add (AudioClock& clock)
+{
+        if (clocks.insert (&clock).second) {
+                clock.mode_changed.connect (sigc::bind (sigc::mem_fun (*this, &ClockGroup::one_clock_changed), &clock));
+                clock.set_mode (_clock_mode);
+        }
+}
+
+void
+ClockGroup::remove (AudioClock& clock)
+{
+        clocks.erase (&clock);
+}
+        
+void
+ClockGroup::one_clock_changed (AudioClock* clock)
+{
+        if (!ignore_changes) {
+                set_clock_mode (clock->mode());
+        }
+}
+
+void
+ClockGroup::set_clock_mode (AudioClock::Mode mode)
+{
+        _clock_mode = mode;
+
+        ignore_changes = true;
+        for (std::set<AudioClock*>::iterator c = clocks.begin(); c != clocks.end(); ++c) {
+                (*c)->set_mode (mode);
+        }
+        ignore_changes = false;
+}        
+
diff --git a/gtk2_ardour/clock_group.h b/gtk2_ardour/clock_group.h
new file mode 100644
index 0000000000..db8b8f7196
--- /dev/null
+++ b/gtk2_ardour/clock_group.h
@@ -0,0 +1,47 @@
+/*
+    Copyright (C) 2011 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#ifndef __gtk_ardour_clock_group_h__
+#define __gtk_ardour_clock_group_h__
+
+#include <set>
+#include <sigc++/signal.h>
+
+#include "audio_clock.h"
+
+class ClockGroup : public sigc::trackable {
+  public:
+        ClockGroup ();
+        ~ClockGroup ();
+
+        void set_clock_mode (AudioClock::Mode);
+        AudioClock::Mode clock_mode() const { return _clock_mode; }
+
+        void add (AudioClock&);
+        void remove (AudioClock&);
+
+  private:
+        std::set<AudioClock*> clocks;
+        bool ignore_changes;
+        AudioClock::Mode _clock_mode;
+
+        void one_clock_changed (AudioClock*);
+};
+
+#endif /* __gtk_ardour_clock_group_h__ */
diff --git a/gtk2_ardour/location_ui.cc b/gtk2_ardour/location_ui.cc
index 0284921ba5..849ce9de22 100644
--- a/gtk2_ardour/location_ui.cc
+++ b/gtk2_ardour/location_ui.cc
@@ -28,11 +28,12 @@
 #include "pbd/memento_command.h"
 
 #include "ardour_ui.h"
-#include "prompter.h"
-#include "location_ui.h"
+#include "clock_group.h"
+#include "gui_thread.h"
 #include "keyboard.h"
+#include "location_ui.h"
+#include "prompter.h"
 #include "utils.h"
-#include "gui_thread.h"
 
 #include "i18n.h"
 
@@ -43,120 +44,142 @@ using namespace Gtk;
 using namespace Gtkmm2ext;
 
 LocationEditRow::LocationEditRow(Session * sess, Location * loc, int32_t num)
-	: SessionHandlePtr (0), /* explicitly set below */
-	  location(0), 
-	  item_table (1, 6, false),
-	  start_clock (X_("locationstart"), true, X_("LocationEditRowClock"), true, false),
-	  end_clock (X_("locationend"), true, X_("LocationEditRowClock"), true, false),
-	  length_clock (X_("locationlength"), true, X_("LocationEditRowClock"), true, false, true),
-	  cd_check_button (_("CD")),
-	  hide_check_button (_("Hide")),
-	  lock_check_button (_("Lock")),
-	  glue_check_button (_("Glue")),
-	  scms_check_button (_("SCMS")),
-	  preemph_check_button (_("Pre-Emphasis"))
-
-{
-	i_am_the_modifier = 0;
-
-	start_go_button.set_image (*manage (new Image (Stock::JUMP_TO, Gtk::ICON_SIZE_SMALL_TOOLBAR)));
-	end_go_button.set_image (*manage (new Image (Stock::JUMP_TO, Gtk::ICON_SIZE_SMALL_TOOLBAR)));
-	remove_button.set_image (*manage (new Image (Stock::REMOVE, Gtk::ICON_SIZE_SMALL_TOOLBAR)));
-
-	number_label.set_name ("LocationEditNumberLabel");
-	name_label.set_name ("LocationEditNameLabel");
-	name_entry.set_name ("LocationEditNameEntry");
-	start_go_button.set_name ("LocationEditGoButton");
-	end_go_button.set_name ("LocationEditGoButton");
-	cd_check_button.set_name ("LocationEditCdButton");
-	hide_check_button.set_name ("LocationEditHideButton");
-	lock_check_button.set_name ("LocationEditLockButton");
-	glue_check_button.set_name ("LocationEditGlueButton");
-	remove_button.set_name ("LocationEditRemoveButton");
-	isrc_label.set_name ("LocationEditNumberLabel");
-	isrc_entry.set_name ("LocationEditNameEntry");
-	scms_check_button.set_name ("LocationEditCdButton");
-	preemph_check_button.set_name ("LocationEditCdButton");
-	performer_label.set_name ("LocationEditNumberLabel");
-	performer_entry.set_name ("LocationEditNameEntry");
-	composer_label.set_name ("LocationEditNumberLabel");
-	composer_entry.set_name ("LocationEditNameEntry");
-
-	isrc_label.set_text ("ISRC: ");
-	isrc_label.set_size_request (30, -1);
-	performer_label.set_text ("Performer: ");
-	performer_label.set_size_request (60, -1);
-	composer_label.set_text ("Composer: ");
-	composer_label.set_size_request (60, -1);
-
-	isrc_entry.set_size_request (112, -1);
-	isrc_entry.set_max_length(12);
-	isrc_entry.set_editable (true);
-
-	performer_entry.set_size_request (100, -1);
-	performer_entry.set_editable (true);
-
-	composer_entry.set_size_request (100, -1);
-	composer_entry.set_editable (true);
-
-	name_label.set_alignment (0, 0.5);
-
-	cd_track_details_hbox.pack_start (isrc_label, false, false);
-	cd_track_details_hbox.pack_start (isrc_entry, false, false);
-	cd_track_details_hbox.pack_start (scms_check_button, false, false);
-	cd_track_details_hbox.pack_start (preemph_check_button, false, false);
-	cd_track_details_hbox.pack_start (performer_label, false, false);
-	cd_track_details_hbox.pack_start (performer_entry, true, true);
-	cd_track_details_hbox.pack_start (composer_label, false, false);
-	cd_track_details_hbox.pack_start (composer_entry, true, true);
-
-	isrc_entry.signal_changed().connect (sigc::mem_fun(*this, &LocationEditRow::isrc_entry_changed));
-	performer_entry.signal_changed().connect (sigc::mem_fun(*this, &LocationEditRow::performer_entry_changed));
-	composer_entry.signal_changed().connect (sigc::mem_fun(*this, &LocationEditRow::composer_entry_changed));
-	scms_check_button.signal_toggled().connect(sigc::mem_fun(*this, &LocationEditRow::scms_toggled));
-	preemph_check_button.signal_toggled().connect(sigc::mem_fun(*this, &LocationEditRow::preemph_toggled));
-
-	set_session (sess);
-
-	start_hbox.pack_start (start_go_button, false, false);
-	start_hbox.pack_start (start_clock, false, false);
-
-	/* this is always in this location, no matter what the location is */
-
-	item_table.attach (start_hbox, 1, 2, 0, 1, FILL, FILL, 4, 0);
-
-	start_go_button.signal_clicked().connect(sigc::bind (sigc::mem_fun (*this, &LocationEditRow::go_button_pressed), LocStart));
- 	start_clock.ValueChanged.connect (sigc::bind (sigc::mem_fun (*this, &LocationEditRow::clock_changed), LocStart));
- 	start_clock.ChangeAborted.connect (sigc::bind (sigc::mem_fun (*this, &LocationEditRow::change_aborted), LocStart));
-
-	end_hbox.pack_start (end_go_button, false, false);
-	end_hbox.pack_start (end_clock, false, false);
-
-	end_go_button.signal_clicked().connect(sigc::bind (sigc::mem_fun (*this, &LocationEditRow::go_button_pressed), LocEnd));
-	end_clock.ValueChanged.connect (sigc::bind (sigc::mem_fun (*this, &LocationEditRow::clock_changed), LocEnd));
- 	end_clock.ChangeAborted.connect (sigc::bind (sigc::mem_fun (*this, &LocationEditRow::change_aborted), LocEnd));
-
-	length_clock.ValueChanged.connect (sigc::bind ( sigc::mem_fun(*this, &LocationEditRow::clock_changed), LocLength));
- 	length_clock.ChangeAborted.connect (sigc::bind (sigc::mem_fun (*this, &LocationEditRow::change_aborted), LocLength));
-
-	cd_check_button.signal_toggled().connect(sigc::mem_fun(*this, &LocationEditRow::cd_toggled));
-	hide_check_button.signal_toggled().connect(sigc::mem_fun(*this, &LocationEditRow::hide_toggled));
-	lock_check_button.signal_toggled().connect(sigc::mem_fun(*this, &LocationEditRow::lock_toggled));
-	glue_check_button.signal_toggled().connect(sigc::mem_fun(*this, &LocationEditRow::glue_toggled));
-
-	remove_button.signal_clicked().connect(sigc::mem_fun(*this, &LocationEditRow::remove_button_pressed));
-
-	pack_start(item_table, true, true);
-
-	set_location (loc);
-	set_number (num);
-}
-
-LocationEditRow::~LocationEditRow()
-{
-	if (location) {
-		connections.drop_connections ();
-	}
+	: SessionHandlePtr (0) /* explicitly set below */
+        , location(0) 
+        , item_table (1, 6, false)
+        , start_clock (X_("locationstart"), true, X_("LocationEditRowClock"), true, false)
+        , end_clock (X_("locationend"), true, X_("LocationEditRowClock"), true, false)
+        , length_clock (X_("locationlength"), true, X_("LocationEditRowClock"), true, false, true)
+        , cd_check_button (_("CD"))
+        , hide_check_button (_("Hide"))
+        , lock_check_button (_("Lock"))
+        , glue_check_button (_("Glue"))
+        , scms_check_button (_("SCMS"))
+        , preemph_check_button (_("Pre-Emphasis"))
+        , _clock_group (0)
+ {
+         i_am_the_modifier = 0;
+
+         start_go_button.set_image (*manage (new Image (Stock::JUMP_TO, Gtk::ICON_SIZE_SMALL_TOOLBAR)));
+         end_go_button.set_image (*manage (new Image (Stock::JUMP_TO, Gtk::ICON_SIZE_SMALL_TOOLBAR)));
+         remove_button.set_image (*manage (new Image (Stock::REMOVE, Gtk::ICON_SIZE_SMALL_TOOLBAR)));
+
+         number_label.set_name ("LocationEditNumberLabel");
+         name_label.set_name ("LocationEditNameLabel");
+         name_entry.set_name ("LocationEditNameEntry");
+         start_go_button.set_name ("LocationEditGoButton");
+         end_go_button.set_name ("LocationEditGoButton");
+         cd_check_button.set_name ("LocationEditCdButton");
+         hide_check_button.set_name ("LocationEditHideButton");
+         lock_check_button.set_name ("LocationEditLockButton");
+         glue_check_button.set_name ("LocationEditGlueButton");
+         remove_button.set_name ("LocationEditRemoveButton");
+         isrc_label.set_name ("LocationEditNumberLabel");
+         isrc_entry.set_name ("LocationEditNameEntry");
+         scms_check_button.set_name ("LocationEditCdButton");
+         preemph_check_button.set_name ("LocationEditCdButton");
+         performer_label.set_name ("LocationEditNumberLabel");
+         performer_entry.set_name ("LocationEditNameEntry");
+         composer_label.set_name ("LocationEditNumberLabel");
+         composer_entry.set_name ("LocationEditNameEntry");
+
+         isrc_label.set_text ("ISRC: ");
+         isrc_label.set_size_request (30, -1);
+         performer_label.set_text ("Performer: ");
+         performer_label.set_size_request (60, -1);
+         composer_label.set_text ("Composer: ");
+         composer_label.set_size_request (60, -1);
+
+         isrc_entry.set_size_request (112, -1);
+         isrc_entry.set_max_length(12);
+         isrc_entry.set_editable (true);
+
+         performer_entry.set_size_request (100, -1);
+         performer_entry.set_editable (true);
+
+         composer_entry.set_size_request (100, -1);
+         composer_entry.set_editable (true);
+
+         name_label.set_alignment (0, 0.5);
+
+         cd_track_details_hbox.pack_start (isrc_label, false, false);
+         cd_track_details_hbox.pack_start (isrc_entry, false, false);
+         cd_track_details_hbox.pack_start (scms_check_button, false, false);
+         cd_track_details_hbox.pack_start (preemph_check_button, false, false);
+         cd_track_details_hbox.pack_start (performer_label, false, false);
+         cd_track_details_hbox.pack_start (performer_entry, true, true);
+         cd_track_details_hbox.pack_start (composer_label, false, false);
+         cd_track_details_hbox.pack_start (composer_entry, true, true);
+
+         isrc_entry.signal_changed().connect (sigc::mem_fun(*this, &LocationEditRow::isrc_entry_changed));
+         performer_entry.signal_changed().connect (sigc::mem_fun(*this, &LocationEditRow::performer_entry_changed));
+         composer_entry.signal_changed().connect (sigc::mem_fun(*this, &LocationEditRow::composer_entry_changed));
+         scms_check_button.signal_toggled().connect(sigc::mem_fun(*this, &LocationEditRow::scms_toggled));
+         preemph_check_button.signal_toggled().connect(sigc::mem_fun(*this, &LocationEditRow::preemph_toggled));
+
+         set_session (sess);
+
+         start_hbox.pack_start (start_go_button, false, false);
+         start_hbox.pack_start (start_clock, false, false);
+
+         /* this is always in this location, no matter what the location is */
+
+         item_table.attach (start_hbox, 1, 2, 0, 1, FILL, FILL, 4, 0);
+
+         start_go_button.signal_clicked().connect(sigc::bind (sigc::mem_fun (*this, &LocationEditRow::go_button_pressed), LocStart));
+         start_clock.ValueChanged.connect (sigc::bind (sigc::mem_fun (*this, &LocationEditRow::clock_changed), LocStart));
+         start_clock.ChangeAborted.connect (sigc::bind (sigc::mem_fun (*this, &LocationEditRow::change_aborted), LocStart));
+
+         end_hbox.pack_start (end_go_button, false, false);
+         end_hbox.pack_start (end_clock, false, false);
+
+         end_go_button.signal_clicked().connect(sigc::bind (sigc::mem_fun (*this, &LocationEditRow::go_button_pressed), LocEnd));
+         end_clock.ValueChanged.connect (sigc::bind (sigc::mem_fun (*this, &LocationEditRow::clock_changed), LocEnd));
+         end_clock.ChangeAborted.connect (sigc::bind (sigc::mem_fun (*this, &LocationEditRow::change_aborted), LocEnd));
+
+         length_clock.ValueChanged.connect (sigc::bind ( sigc::mem_fun(*this, &LocationEditRow::clock_changed), LocLength));
+         length_clock.ChangeAborted.connect (sigc::bind (sigc::mem_fun (*this, &LocationEditRow::change_aborted), LocLength));
+
+         cd_check_button.signal_toggled().connect(sigc::mem_fun(*this, &LocationEditRow::cd_toggled));
+         hide_check_button.signal_toggled().connect(sigc::mem_fun(*this, &LocationEditRow::hide_toggled));
+         lock_check_button.signal_toggled().connect(sigc::mem_fun(*this, &LocationEditRow::lock_toggled));
+         glue_check_button.signal_toggled().connect(sigc::mem_fun(*this, &LocationEditRow::glue_toggled));
+
+         remove_button.signal_clicked().connect(sigc::mem_fun(*this, &LocationEditRow::remove_button_pressed));
+
+         pack_start(item_table, true, true);
+
+         set_location (loc);
+         set_number (num);
+ }
+
+ LocationEditRow::~LocationEditRow()
+ {
+         if (location) {
+                 connections.drop_connections ();
+         }
+
+         if (_clock_group) {
+                 _clock_group->remove (start_clock);
+                 _clock_group->remove (end_clock);
+                 _clock_group->remove (length_clock);
+         }
+ }
+
+ void
+ LocationEditRow::set_clock_group (ClockGroup& cg)
+ {
+         if (_clock_group) {
+                 _clock_group->remove (start_clock);
+                 _clock_group->remove (end_clock);
+                 _clock_group->remove (length_clock);
+         }
+
+         _clock_group = &cg;
+
+         _clock_group->add (start_clock);
+         _clock_group->add (end_clock);
+         _clock_group->add (length_clock);
 }
 
 void
@@ -659,6 +682,15 @@ LocationEditRow::focus_name() {
 	name_entry.grab_focus();
 }
 
+void
+LocationEditRow::set_clock_sensitivity ()
+{
+	start_clock.set_sensitive (!location->locked());
+	end_clock.set_sensitive (!location->locked());
+	length_clock.set_sensitive (!location->locked());
+}
+
+/*------------------------------------------------------------------------*/
 
 LocationUI::LocationUI ()
 	: add_location_button (_("New Marker"))
@@ -666,6 +698,9 @@ LocationUI::LocationUI ()
 {
 	i_am_the_modifier = 0;
 
+        _clock_group = new ClockGroup;
+        _clock_group->set_clock_mode (AudioClock::Frames);
+
 	VBox* vbox = manage (new VBox);
 
 	Table* table = manage (new Table (2, 2));
@@ -679,6 +714,9 @@ LocationUI::LocationUI ()
 	table->attach (*l, 0, 2, table_row, table_row + 1);
 	++table_row;
 
+        loop_edit_row.set_clock_group (*_clock_group);
+        punch_edit_row.set_clock_group (*_clock_group);
+
 	loop_punch_box.pack_start (loop_edit_row, false, false);
 	loop_punch_box.pack_start (punch_edit_row, false, false);
 	
@@ -771,6 +809,7 @@ LocationUI::LocationUI ()
 
 LocationUI::~LocationUI()
 {
+        delete _clock_group;
 }
 
 gint 
@@ -830,7 +869,10 @@ LocationUI::location_added (Location* location)
 		loc.sort (LocationSortByStart ());
 
 		LocationEditRow* erow = manage (new LocationEditRow (_session, location));
+
+                erow->set_clock_group (*_clock_group);
 		erow->remove_requested.connect (sigc::mem_fun (*this, &LocationUI::location_remove_requested));
+
 		Box_Helpers::BoxList & children = location->is_range_marker() ? range_rows.children () : location_rows.children ();
 
 		/* Step through the location list and the GUI list to find the place to insert */
@@ -900,9 +942,12 @@ LocationUI::map_locations (Locations::LocationList& locations)
 
 		if (location->is_mark()) {
 			LocationEditRow* erow = manage (new LocationEditRow (_session, location, mark_n));
+
+                        erow->set_clock_group (*_clock_group);
 			erow->remove_requested.connect (sigc::mem_fun(*this, &LocationUI::location_remove_requested));
 			erow->redraw_ranges.connect (sigc::mem_fun(*this, &LocationUI::location_redraw_ranges));
-			Box_Helpers::BoxList & loc_children = location_rows.children();
+
+                        Box_Helpers::BoxList & loc_children = location_rows.children();
 			loc_children.push_back(Box_Helpers::Element(*erow, PACK_SHRINK, 1, PACK_START));
 			if (location == newest_location) {
 				newest_location = 0;
@@ -918,7 +963,10 @@ LocationUI::map_locations (Locations::LocationList& locations)
 			loop_edit_row.show_all();
 		} else {
 			LocationEditRow* erow = manage (new LocationEditRow(_session, location));
+
+                        erow->set_clock_group (*_clock_group);
 			erow->remove_requested.connect (sigc::mem_fun(*this, &LocationUI::location_remove_requested));
+
 			Box_Helpers::BoxList & range_children = range_rows.children();
 			range_children.push_back(Box_Helpers::Element(*erow,  PACK_SHRINK, 1, PACK_START));
 		}
@@ -1039,13 +1087,6 @@ LocationUI::session_going_away()
 	SessionHandlePtr::session_going_away ();
 }
 
-void
-LocationEditRow::set_clock_sensitivity ()
-{
-	start_clock.set_sensitive (!location->locked());
-	end_clock.set_sensitive (!location->locked());
-	length_clock.set_sensitive (!location->locked());
-}
 
 /*------------------------*/
 
diff --git a/gtk2_ardour/location_ui.h b/gtk2_ardour/location_ui.h
index 5ab297f69c..bf4474e669 100644
--- a/gtk2_ardour/location_ui.h
+++ b/gtk2_ardour/location_ui.h
@@ -42,6 +42,8 @@ namespace ARDOUR {
 	class Location;
 }
 
+class ClockGroup;
+
 class LocationEditRow  : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 {
   public:
@@ -55,7 +57,8 @@ class LocationEditRow  : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 
 	void set_number (int);
 	void focus_name();
-
+        void set_clock_group (ClockGroup&);
+        
 	sigc::signal<void,ARDOUR::Location*> remove_requested;
 	sigc::signal<void> redraw_ranges;
 
@@ -97,11 +100,12 @@ class LocationEditRow  : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 
 
 	Gtk::Label    performer_label;
-	Gtk::Entry  performer_entry;
+	Gtk::Entry    performer_entry;
 	Gtk::Label    composer_label;
- 	Gtk::Entry  composer_entry;
+ 	Gtk::Entry    composer_entry;
 	Gtk::CheckButton   scms_check_button;
 	Gtk::CheckButton   preemph_check_button;
+        ClockGroup* _clock_group;
 
 	guint32 i_am_the_modifier;
 	int   number;
@@ -146,6 +150,7 @@ class LocationUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 	~LocationUI ();
 	
 	void set_session (ARDOUR::Session *);
+        void set_clock_mode (AudioClock::Mode);
 
 	void add_new_location();
 	void add_new_range();
@@ -191,6 +196,8 @@ class LocationUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 	void location_added (ARDOUR::Location *);
 	void locations_changed (ARDOUR::Locations::Change);
 	void map_locations (ARDOUR::Locations::LocationList&);
+
+        ClockGroup* _clock_group;
 };
 
 class LocationUIWindow : public ArdourDialog
diff --git a/gtk2_ardour/region_editor.cc b/gtk2_ardour/region_editor.cc
index c95d9bbd20..5e9f13db43 100755
--- a/gtk2_ardour/region_editor.cc
+++ b/gtk2_ardour/region_editor.cc
@@ -30,10 +30,11 @@
 #include <gtkmm/listviewtext.h>
 #include <cmath>
 
-#include "region_editor.h"
 #include "ardour_ui.h"
-#include "utils.h"
+#include "clock_group.h"
 #include "gui_thread.h"
+#include "region_editor.h"
+#include "utils.h"
 
 #include "i18n.h"
 
@@ -43,22 +44,31 @@ using namespace std;
 using namespace Gtkmm2ext;
 
 RegionEditor::RegionEditor (Session* s, boost::shared_ptr<Region> r)
-	: ArdourDialog (_("Region")),
-	  _table (9, 2),
-	  _table_row (0),
-	  _region (r),
-	  name_label (_("Name:")),
-	  audition_button (_("Play")),
-	  position_clock (X_("regionposition"), true, X_("RegionEditorClock"), true, false),
-	  end_clock (X_("regionend"), true, X_("RegionEditorClock"), true, false),
-	  length_clock (X_("regionlength"), true, X_("RegionEditorClock"), true, false, true),
-	  sync_offset_relative_clock (X_("regionsyncoffsetrelative"), true, X_("RegionEditorClock"), true, false),
-	  sync_offset_absolute_clock (X_("regionsyncoffsetabsolute"), true, X_("RegionEditorClock"), true, false),
-	  /* XXX cannot file start yet */
-	  start_clock (X_("regionstart"), true, X_("RegionEditorClock"), false, false),
-	  _sources (1)
+	: ArdourDialog (_("Region"))
+        , _table (9, 2)
+        , _table_row (0)
+        , _region (r)
+        , name_label (_("Name:"))
+        , audition_button (_("Play"))
+        , _clock_group (new ClockGroup)
+        , position_clock (X_("regionposition"), true, X_("RegionEditorClock"), true, false)
+        , end_clock (X_("regionend"), true, X_("RegionEditorClock"), true, false)
+        , length_clock (X_("regionlength"), true, X_("RegionEditorClock"), true, false, true)
+        , sync_offset_relative_clock (X_("regionsyncoffsetrelative"), true, X_("RegionEditorClock"), true, false)
+        , sync_offset_absolute_clock (X_("regionsyncoffsetabsolute"), true, X_("RegionEditorClock"), true, false)
+          /* XXX cannot file start yet */
+        , start_clock (X_("regionstart"), true, X_("RegionEditorClock"), false, false)
+        , _sources (1)
 {
 	set_session (s);
+
+        _clock_group->set_clock_mode (AudioClock::Frames);
+        _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);
@@ -186,6 +196,11 @@ RegionEditor::RegionEditor (Session* s, boost::shared_ptr<Region> r)
 	connect_editor_events ();
 }
 
+RegionEditor::~RegionEditor ()
+{
+        delete _clock_group;
+}
+
 void
 RegionEditor::region_changed (const PBD::PropertyChange& what_changed)
 {
diff --git a/gtk2_ardour/region_editor.h b/gtk2_ardour/region_editor.h
index 66f0f6226d..9417ddfdd7 100644
--- a/gtk2_ardour/region_editor.h
+++ b/gtk2_ardour/region_editor.h
@@ -48,11 +48,13 @@ namespace ARDOUR {
 	class Session;
 }
 
+class ClockGroup;
+
 class RegionEditor : public ArdourDialog
 {
   public:
 	RegionEditor (ARDOUR::Session*, boost::shared_ptr<ARDOUR::Region>);
-	virtual ~RegionEditor () {}
+	virtual ~RegionEditor ();
 
   protected:	
 	virtual void region_changed (const PBD::PropertyChange&);
@@ -76,6 +78,8 @@ class RegionEditor : public ArdourDialog
 	Gtk::Label sync_absolute_label;
 	Gtk::Label start_label;
 
+        ClockGroup* _clock_group;
+
 	AudioClock position_clock;
 	AudioClock end_clock;
 	AudioClock length_clock;
diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index ef2bfc5277..fe4714ae07 100644
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -60,6 +60,7 @@ gtk2_ardour_sources = [
 	'canvas-simplerect.c',
 	'canvas-sysex.cc',
 	'canvas-waveview.c',
+        'clock_group.cc',
 	'configinfo.cc',
 	'control_point.cc',
 	'control_point_dialog.cc',