diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2015-10-22 19:19:24 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-02-22 15:31:24 -0500 |
commit | 9b9a7beb130d183fc08a57927a3eaf4441be6809 (patch) | |
tree | 2857fa4cdf41c3949d262634fbff8af9ac6f95f0 /gtk2_ardour/editor.cc | |
parent | ec65e351acea329de1d09b8ce518a023001dfdab (diff) |
cleanup various merge conflict resolution errors/omissions
Diffstat (limited to 'gtk2_ardour/editor.cc')
-rw-r--r-- | gtk2_ardour/editor.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index ecececc40c..ed02d6db9f 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -492,11 +492,11 @@ Editor::Editor () build_snap_type_menu(); build_edit_point_menu(); - location_marker_color = ARDOUR_UI::config()->color ("location marker"); - location_range_color = ARDOUR_UI::config()->color ("location range"); - location_cd_marker_color = ARDOUR_UI::config()->color ("location cd marker"); - location_loop_color = ARDOUR_UI::config()->color ("location loop"); - location_punch_color = ARDOUR_UI::config()->color ("location punch"); + location_marker_color = UIConfiguration::instance().color ("location marker"); + location_range_color = UIConfiguration::instance().color ("location range"); + location_cd_marker_color = UIConfiguration::instance().color ("location cd marker"); + location_loop_color = UIConfiguration::instance().color ("location loop"); + location_punch_color = UIConfiguration::instance().color ("location punch"); timebar_height = std::max(12., ceil (15. * ARDOUR_UI::ui_scale)); |