Use signal_toggled instead of signal_clicked in ThemeManager so a theme is only ...

[ardour.git] / gtk2_ardour / automation_time_axis.cc

diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc
index 12998ee7d6ce429bd7d6f0e6cca00daaf3649e0f..04ac1ee0763835d54c0c2415b29bb49073d7df8f 100644 (file)
--- a/gtk2_ardour/automation_time_axis.cc
+++ b/gtk2_ardour/automation_time_axis.cc
@@ -74,11 +74,11 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptr<Ro
        base_rect->property_x1() = 0.0;
        base_rect->property_y1() = 0.0;
        base_rect->property_x2() = editor.frame_to_pixel (max_frames);
-       base_rect->property_outline_color_rgba() = color_map[cAutomationTrackOutline];
+       base_rect->property_outline_color_rgba() = Config->canvasvar_AutomationTrackOutline.get();
        /* outline ends and bottom */
        base_rect->property_outline_what() = (guint32) (0x1|0x2|0x8);
-       base_rect->property_fill_color_rgba() = color_map[cAutomationTrackFill];
-       //base_rect->property_fill_color_rgba() = color_map[cEnteredControlPoint];
+       base_rect->property_fill_color_rgba() = Config->canvasvar_AutomationTrackFill.get();
+       //base_rect->property_fill_color_rgba() = Config->canvasvar_EnteredControlPoint.get();
        
        base_rect->set_data ("trackview", this);
 
@@ -182,7 +182,7 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptr<Ro
        /* make sure labels etc. are correct */
 
        automation_state_changed ();
-       ColorChanged.connect (mem_fun (*this, &AutomationTimeAxisView::color_handler));
+       ColorsChanged.connect (mem_fun (*this, &AutomationTimeAxisView::color_handler));
 }
 
 AutomationTimeAxisView::~AutomationTimeAxisView ()
@@ -313,7 +313,7 @@ AutomationTimeAxisView::set_height (TrackHeight ht)
        base_rect->property_y2() = h;
 
        for (vector<AutomationLine*>::iterator i = lines.begin(); i != lines.end(); ++i) {
-               (*i)->set_height (h);
+               (*i)->set_y_position_and_height (0, h);
        }
 
        for (list<GhostRegion*>::iterator i = ghosts.begin(); i != ghosts.end(); ++i) {
@@ -771,7 +771,7 @@ AutomationTimeAxisView::add_line (AutomationLine& line)
        }
 
        lines.push_back (&line);
-       line.set_height (height);
+       line.set_y_position_and_height (0, height);
 
        if (get) {
                /* pick up the current state */
@@ -821,24 +821,19 @@ AutomationTimeAxisView::set_colors () {
 }
 
 void
-AutomationTimeAxisView::color_handler (ColorID id, uint32_t val) {
+AutomationTimeAxisView::color_handler () 
+{
     
-       switch (id) {
-       case cGhostTrackWave:
-       case cGhostTrackWaveClip:
-       case cGhostTrackZeroLine:
-
-       case cControlPoint:
-       case cControlPointFill:
-       case cControlPointOutline:
-       case cAutomationLine:
-               set_colors ();
+       //case cGhostTrackWave:
+       //case cGhostTrackWaveClip:
+       //case cGhostTrackZeroLine:
 
-               break;
+       //case cControlPoint:
+       //case cControlPointFill:
+       //case cControlPointOutline:
+       //case cAutomationLine:
+       set_colors ();
 
-       default: 
-               break;
-       }
 }