diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-01-08 00:22:39 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-01-08 00:22:39 +0000 |
| commit | 44a427f0f936313734070e74f079fc3e0ed741cf (patch) | |
| tree | 581ce26fd25af6e0d2cba5f8a79db8188f1e2f73 /gtk2_ardour/location_ui.cc | |
| parent | bc5b49ea3a6ef7a19d2e47faed572a56d135329a (diff) | |
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
Diffstat (limited to 'gtk2_ardour/location_ui.cc')
| -rw-r--r-- | gtk2_ardour/location_ui.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gtk2_ardour/location_ui.cc b/gtk2_ardour/location_ui.cc index d1b82f8c66..30a5b62426 100644 --- 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); |