ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

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:
Paul Davis 2013-01-08 00:22:39 +00:00
parent bc5b49ea3a
commit 44a427f0f9
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gtk2_ardour/location_ui.cc
View File

@ -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);

3
gtk2_ardour/region_editor.cc
View File

@ -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);