patch from colinf tomake region property editor clocks use 2ndary clock mode (#5200)

[ardour.git] / gtk2_ardour / region_editor.cc

diff --git a/gtk2_ardour/region_editor.cc b/gtk2_ardour/region_editor.cc
index 8a4a8b9d1e3d49023aa94f2e3b37cd0da5dcf87e..51e4deddc88a88de66d6eb8c792ed9109da23fa5 100755 (executable)
--- a/gtk2_ardour/region_editor.cc
+++ b/gtk2_ardour/region_editor.cc
@@ -17,21 +17,20 @@
 
 */
 
+#include <cmath>
+
+#include <gtkmm/listviewtext.h>
+
 #include "pbd/memento_command.h"
 #include "pbd/stateful_diff_command.h"
 
-#include "ardour/session.h"
 #include "ardour/region.h"
-#include "ardour/playlist.h"
-#include "ardour/utils.h"
-#include "ardour/dB.h"
+#include "ardour/session.h"
 #include "ardour/source.h"
-#include "gtkmm2ext/utils.h"
-#include <gtkmm/listviewtext.h>
-#include <cmath>
 
 #include "ardour_ui.h"
 #include "clock_group.h"
+#include "main_clock.h"
 #include "gui_thread.h"
 #include "region_editor.h"
 #include "utils.h"
@@ -49,7 +48,7 @@ RegionEditor::RegionEditor (Session* s, boost::shared_ptr<Region> r)
         , _table_row (0)
         , _region (r)
         , name_label (_("Name:"))
-        , audition_button (_("Play"))
+        , audition_button (_("Audition"))
         , _clock_group (new ClockGroup)
         , position_clock (X_("regionposition"), true, "", true, false)
         , end_clock (X_("regionend"), true, "", true, false)
@@ -62,7 +61,7 @@ RegionEditor::RegionEditor (Session* s, boost::shared_ptr<Region> r)
 {
        set_session (s);
 
-        _clock_group->set_clock_mode (AudioClock::Frames);
+        _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);
@@ -121,38 +120,38 @@ RegionEditor::RegionEditor (Session* s, boost::shared_ptr<Region> r)
        Gtk::HBox* nb = Gtk::manage (new Gtk::HBox);
        nb->set_spacing (6);
        nb->pack_start (name_entry);
-       nb->pack_start (audition_button);
+       nb->pack_start (audition_button, false, false);
 
        _table.attach (name_label, 0, 1, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
-       _table.attach (*nb, 1, 2, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
+       _table.attach (*nb, 1, 2, _table_row, _table_row + 1, Gtk::FILL | Gtk::EXPAND, Gtk::FILL);
        ++_table_row;
 
        _table.attach (position_label, 0, 1, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
-       _table.attach (position_clock, 1, 2, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
+       _table.attach (position_clock, 1, 2, _table_row, _table_row + 1, Gtk::FILL | Gtk::EXPAND, Gtk::FILL);
        ++_table_row;
 
        _table.attach (end_label, 0, 1, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
-       _table.attach (end_clock, 1, 2, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
+       _table.attach (end_clock, 1, 2, _table_row, _table_row + 1, Gtk::FILL | Gtk::EXPAND, Gtk::FILL);
        ++_table_row;
 
        _table.attach (length_label, 0, 1, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
-       _table.attach (length_clock, 1, 2, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
+       _table.attach (length_clock, 1, 2, _table_row, _table_row + 1, Gtk::FILL | Gtk::EXPAND, Gtk::FILL);
        ++_table_row;
 
        _table.attach (sync_relative_label, 0, 1, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
-       _table.attach (sync_offset_relative_clock, 1, 2, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
+       _table.attach (sync_offset_relative_clock, 1, 2, _table_row, _table_row + 1, Gtk::FILL | Gtk::EXPAND, Gtk::FILL);
        ++_table_row;
 
        _table.attach (sync_absolute_label, 0, 1, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
-       _table.attach (sync_offset_absolute_clock, 1, 2, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
+       _table.attach (sync_offset_absolute_clock, 1, 2, _table_row, _table_row + 1, Gtk::FILL | Gtk::EXPAND, Gtk::FILL);
        ++_table_row;
 
        _table.attach (start_label, 0, 1, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
-       _table.attach (start_clock, 1, 2, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
+       _table.attach (start_clock, 1, 2, _table_row, _table_row + 1, Gtk::FILL | Gtk::EXPAND, Gtk::FILL);
        ++_table_row;
 
        _table.attach (_sources_label, 0, 1, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
-       _table.attach (_sources, 1, 2, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
+       _table.attach (_sources, 1, 2, _table_row, _table_row + 1, Gtk::FILL | Gtk::EXPAND, Gtk::FILL);
        ++_table_row;
 
        get_vbox()->pack_start (_table, true, true);
@@ -189,7 +188,7 @@ RegionEditor::RegionEditor (Session* s, boost::shared_ptr<Region> r)
 
        bounds_changed (change);
 
-       _region->PropertyChanged.connect (state_connection, invalidator (*this), ui_bind (&RegionEditor::region_changed, this, _1), gui_context());
+       _region->PropertyChanged.connect (state_connection, invalidator (*this), boost::bind (&RegionEditor::region_changed, this, _1), gui_context());
 
        spin_arrow_grab = false;
 
@@ -266,7 +265,7 @@ RegionEditor::connect_editor_events ()
 
        audition_button.signal_toggled().connect (sigc::mem_fun(*this, &RegionEditor::audition_button_toggled));
 
-       _session->AuditionActive.connect (audition_connection, invalidator (*this), ui_bind (&RegionEditor::audition_state_changed, this, _1), gui_context());
+       _session->AuditionActive.connect (audition_connection, invalidator (*this), boost::bind (&RegionEditor::audition_state_changed, this, _1), gui_context());
 }
 
 void