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
This commit is contained in:
parent
bc5b49ea3a
commit
44a427f0f9
@ -27,6 +27,7 @@
|
|||||||
|
|
||||||
#include "ardour_ui.h"
|
#include "ardour_ui.h"
|
||||||
#include "clock_group.h"
|
#include "clock_group.h"
|
||||||
|
#include "main_clock.h"
|
||||||
#include "gui_thread.h"
|
#include "gui_thread.h"
|
||||||
#include "keyboard.h"
|
#include "keyboard.h"
|
||||||
#include "location_ui.h"
|
#include "location_ui.h"
|
||||||
@ -1120,7 +1121,7 @@ LocationUI::clock_mode_from_session_instant_xml () const
|
|||||||
|
|
||||||
XMLProperty* p = node->property (X_("clock-mode"));
|
XMLProperty* p = node->property (X_("clock-mode"));
|
||||||
if (!p) {
|
if (!p) {
|
||||||
return AudioClock::Frames;
|
return ARDOUR_UI::instance()->secondary_clock->mode();
|
||||||
}
|
}
|
||||||
|
|
||||||
return (AudioClock::Mode) string_2_enum (p->value (), AudioClock::Mode);
|
return (AudioClock::Mode) string_2_enum (p->value (), AudioClock::Mode);
|
||||||
|
@ -30,6 +30,7 @@
|
|||||||
|
|
||||||
#include "ardour_ui.h"
|
#include "ardour_ui.h"
|
||||||
#include "clock_group.h"
|
#include "clock_group.h"
|
||||||
|
#include "main_clock.h"
|
||||||
#include "gui_thread.h"
|
#include "gui_thread.h"
|
||||||
#include "region_editor.h"
|
#include "region_editor.h"
|
||||||
#include "utils.h"
|
#include "utils.h"
|
||||||
@ -60,7 +61,7 @@ RegionEditor::RegionEditor (Session* s, boost::shared_ptr<Region> r)
|
|||||||
{
|
{
|
||||||
set_session (s);
|
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 (position_clock);
|
||||||
_clock_group->add (end_clock);
|
_clock_group->add (end_clock);
|
||||||
_clock_group->add (length_clock);
|
_clock_group->add (length_clock);
|
||||||
|
Loading…
Reference in New Issue
Block a user