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

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

diff --git a/gtk2_ardour/location_ui.cc b/gtk2_ardour/location_ui.cc
index d1b82f8c66459c257d755b22ef7fa4d1277f5180..30a5b62426dc422e97fe632d00ea377974eb8467 100644 (file)
--- a/gtk2_ardour/location_ui.cc
+++ b/gtk2_ardour/location_ui.cc
@@ -27,6 +27,7 @@
 
 #include "ardour_ui.h"
 #include "clock_group.h"
+#include "main_clock.h"
 #include "gui_thread.h"
 #include "keyboard.h"
 #include "location_ui.h"
@@ -1120,7 +1121,7 @@ LocationUI::clock_mode_from_session_instant_xml () const
 
        XMLProperty* p = node->property (X_("clock-mode"));
        if (!p) {
-               return AudioClock::Frames;
+               return ARDOUR_UI::instance()->secondary_clock->mode();
        }
              
        return (AudioClock::Mode) string_2_enum (p->value (), AudioClock::Mode);

diff --git a/gtk2_ardour/region_editor.cc b/gtk2_ardour/region_editor.cc
index cf1bfcfb62fbb1ea0fecf5bfbee3e45d70c49c77..51e4deddc88a88de66d6eb8c792ed9109da23fa5 100755 (executable)
--- a/gtk2_ardour/region_editor.cc
+++ b/gtk2_ardour/region_editor.cc
@@ -30,6 +30,7 @@
 
 #include "ardour_ui.h"
 #include "clock_group.h"
+#include "main_clock.h"
 #include "gui_thread.h"
 #include "region_editor.h"
 #include "utils.h"
@@ -60,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);