region list patch #2 from chris g, slightly reworked by me; sv_se po changes, possibl...

[ardour.git] / gtk2_ardour / crossfade_view.cc

diff --git a/gtk2_ardour/crossfade_view.cc b/gtk2_ardour/crossfade_view.cc
index c320d07638e85898d63c4d498e0c8bdc7b68df1a..8507d5e4d9eca8c5047248c8faa29c7621caa480 100644 (file)
--- a/gtk2_ardour/crossfade_view.cc
+++ b/gtk2_ardour/crossfade_view.cc
@@ -31,6 +31,7 @@
 #include "audio_region_view.h"
 #include "utils.h"
 #include "canvas_impl.h"
+#include "ardour_ui.h"
 
 using namespace sigc;
 using namespace ARDOUR;
@@ -51,7 +52,7 @@ CrossfadeView::CrossfadeView (ArdourCanvas::Group *parent,
                              
 
        : TimeAxisViewItem ("xfade" /*xf.name()*/, *parent, tv, spu, basic_color, xf->position(), 
-                           xf->length(), TimeAxisViewItem::Visibility (TimeAxisViewItem::ShowFrame)),
+                           xf->length(), false, TimeAxisViewItem::Visibility (TimeAxisViewItem::ShowFrame)),
          crossfade (xf),
          left_view (lview),
          right_view (rview)
@@ -61,14 +62,14 @@ CrossfadeView::CrossfadeView (ArdourCanvas::Group *parent,
        _visible = true;
 
        fade_in = new Line (*group);
-       fade_in->property_fill_color_rgba() = color_map[cCrossfadeLine];
+       fade_in->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_CrossfadeLine.get();
        fade_in->property_width_pixels() = 1;
 
        fade_out = new Line (*group);
-       fade_out->property_fill_color_rgba() = color_map[cCrossfadeLine];
+       fade_out->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_CrossfadeLine.get();
        fade_out->property_width_pixels() = 1;
        
-       set_height (get_time_axis_view().height);
+       set_height (get_time_axis_view().current_height());
 
        /* no frame around the xfade or overlap rects */
 
@@ -84,11 +85,12 @@ CrossfadeView::CrossfadeView (ArdourCanvas::Group *parent,
        crossfade_changed (Change (~0));
 
        crossfade->StateChanged.connect (mem_fun(*this, &CrossfadeView::crossfade_changed));
+       ColorsChanged.connect (mem_fun (*this, &CrossfadeView::color_handler));
 }
 
 CrossfadeView::~CrossfadeView ()
 {
-       GoingAway (this) ; /* EMIT_SIGNAL */
+        GoingAway (this) ; /* EMIT_SIGNAL */
 }
 
 void
@@ -107,11 +109,11 @@ CrossfadeView::reset_width_dependent_items (double pixel_width)
 void
 CrossfadeView::set_height (double height)
 {
-       if (height == TimeAxisView::hSmaller ||
-           height == TimeAxisView::hSmall)
-               TimeAxisViewItem::set_height (height - 3 );
-       else
+       if (height <= TimeAxisView::hSmaller) {
+               TimeAxisViewItem::set_height (height - 3);
+       } else {
                TimeAxisViewItem::set_height (height - NAME_HIGHLIGHT_SIZE - 3 );
+       }
 
        redraw_curves ();
 }
@@ -158,7 +160,8 @@ CrossfadeView::redraw_curves ()
         At "height - 3.0" the bottom of the crossfade touches the name highlight or the bottom of the track (if the
         track is either Small or Smaller.
         */
-       double tav_height = get_time_axis_view().height;
+
+       double tav_height = get_time_axis_view().current_height();
        if (tav_height == TimeAxisView::hSmaller ||
            tav_height == TimeAxisView::hSmall) {
                h = tav_height - 3.0;
@@ -186,19 +189,19 @@ CrossfadeView::redraw_curves ()
        points = get_canvas_points ("xfade edit redraw", npoints);
        vec = new float[npoints];
 
-       crossfade->fade_in().get_vector (0, crossfade->length(), vec, npoints);
+       crossfade->fade_in().curve().get_vector (0, crossfade->length(), vec, npoints);
        for (int i = 0, pci = 0; i < npoints; ++i) {
                Art::Point &p = (*points)[pci++];
                p.set_x(i);
-               p.set_y(2.0 + h - (h * vec[i]));
+               p.set_y(_y_position + 2.0 + h - (h * vec[i]));
        }
        fade_in->property_points() = *points;
 
-       crossfade->fade_out().get_vector (0, crossfade->length(), vec, npoints);
+       crossfade->fade_out().curve().get_vector (0, crossfade->length(), vec, npoints);
        for (int i = 0, pci = 0; i < npoints; ++i) {
                Art::Point &p = (*points)[pci++];
                p.set_x(i);
-               p.set_y(2.0 + h - (h * vec[i]));
+               p.set_y(_y_position + 2.0 + h - (h * vec[i]));
        }
        fade_out->property_points() = *points;
 
@@ -217,14 +220,20 @@ void
 CrossfadeView::active_changed ()
 {
        if (crossfade->active()) {
-               frame->property_fill_color_rgba() = color_map[cActiveCrossfade];
+               frame->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_ActiveCrossfade.get();
        } else {
-               frame->property_fill_color_rgba() = color_map[cInactiveCrossfade];
+               frame->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_InactiveCrossfade.get();
        }
 
        redraw_curves ();
 }
 
+void
+CrossfadeView::color_handler ()
+{
+       active_changed ();
+}
+
 void
 CrossfadeView::set_valid (bool yn)
 {
@@ -260,3 +269,4 @@ CrossfadeView::fake_hide ()
 {
        group->hide();
 }
+