Make sure we don't deactivate un-activated plugins or re-activate already activated...

[ardour.git] / gtk2_ardour / audio_time_axis.cc

diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc
index 8484bbceca93100e52f7801624adec550e66b136..1766da943c42e9004135c3764133d30daa57f140 100644 (file)
--- a/gtk2_ardour/audio_time_axis.cc
+++ b/gtk2_ardour/audio_time_axis.cc
@@ -359,7 +359,7 @@ AudioTimeAxisView::add_gain_automation_child ()
                                       *gain_track->canvas_display,
                                       _route->gain_automation_curve());
 
-       line->set_line_color (color_map[cAutomationLine]);
+       line->set_line_color (ARDOUR_UI::config()->canvasvar_AutomationLine.get());
        
 
        gain_track->add_line (*line);
@@ -439,11 +439,9 @@ AudioTimeAxisView::update_pans ()
                                              (*p)->automation());
 
                if (p == _route->panner().begin()) {
-                       /* first line is a nice orange */
-                       line->set_line_color (color_map[cLeftPanAutomationLine]);
+                       line->set_line_color (ARDOUR_UI::config()->canvasvar_AutomationLine.get());
                } else {
-                       /* second line is a nice blue */
-                       line->set_line_color (color_map[cRightPanAutomationLine]);
+                       line->set_line_color (ARDOUR_UI::config()->canvasvar_AutomationLine.get());
                }
 
                pan_track->add_line (*line);
@@ -453,7 +451,6 @@ AudioTimeAxisView::update_pans ()
 void
 AudioTimeAxisView::toggle_gain_track ()
 {
-
        bool showit = gain_automation_item->get_active();
 
        if (showit != gain_track->marked_for_display()) {