diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-12-12 15:28:16 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-12-14 09:36:01 -0500 |
| commit | c98366c7c8a18a7987902dd418d876f2e1ee5372 (patch) | |
| tree | 79a787b40707864b9ddd7083c7997c989056c548 /gtk2_ardour/automation_line.cc | |
| parent | 1b3fb142f0e1e2015d3ea9caee7a9b26734d6881 (diff) | |
fixed merge conflict
Diffstat (limited to 'gtk2_ardour/automation_line.cc')
| -rw-r--r-- | gtk2_ardour/automation_line.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc index aa4f251299..62c9118ef4 100644 --- a/gtk2_ardour/automation_line.cc +++ b/gtk2_ardour/automation_line.cc @@ -926,7 +926,7 @@ AutomationLine::set_selected_points (PointSelection const & points) void AutomationLine::set_colors () { - set_line_color (ARDOUR_UI::config()->get_AutomationLine()); + set_line_color (ARDOUR_UI::config()->color ("automation line")); for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) { (*i)->set_color (); } |