Revert "switch fade in/out lines to ArdourCanvas::Curve rather than ArdourCanvas...

This reverts commit e169f5c17f5acdefc53b5c1373b64113cdd64ac8.

diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc
index 73fa167e2f84b58ba1b4cb3e47570ed388f20d0e..84cdfc4998de998f1b83ffda4593938ffbf90660 100644 (file)
--- a/gtk2_ardour/audio_region_view.cc
+++ b/gtk2_ardour/audio_region_view.cc
@@ -159,12 +159,12 @@ AudioRegionView::init (Gdk::Color const & basic_color, bool wfd)
 
        create_waves ();
 
-       fade_in_shape = new ArdourCanvas::Curve (group);
+       fade_in_shape = new ArdourCanvas::PolyLine (group);
        CANVAS_DEBUG_NAME (fade_in_shape, string_compose ("fade in shape for %1", region()->name()));
        fade_in_shape->set_outline_color (fade_color);
        fade_in_shape->set_data ("regionview", this);
 
-       fade_out_shape = new ArdourCanvas::Curve (group);
+       fade_out_shape = new ArdourCanvas::PolyLine (group);
        CANVAS_DEBUG_NAME (fade_out_shape, string_compose ("fade out shape for %1", region()->name()));
        fade_out_shape->set_outline_color (fade_color);
        fade_out_shape->set_data ("regionview", this);
@@ -705,14 +705,14 @@ AudioRegionView::redraw_start_xfade_to (boost::shared_ptr<AudioRegion> ar, frame
        }
 
        if (!start_xfade_in) {
-               start_xfade_in = new ArdourCanvas::Curve (group);
+               start_xfade_in = new ArdourCanvas::PolyLine (group);
                CANVAS_DEBUG_NAME (start_xfade_in, string_compose ("xfade start in line for %1", region()->name()));
                start_xfade_in->set_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeLine());
                start_xfade_in->set_outline_width (1.5);
        }
 
        if (!start_xfade_out) {
-               start_xfade_out = new ArdourCanvas::Curve (group);
+               start_xfade_out = new ArdourCanvas::PolyLine (group);
                CANVAS_DEBUG_NAME (start_xfade_out, string_compose ("xfade start out line for %1", region()->name()));
                uint32_t col = UINT_RGBA_CHANGE_A (ARDOUR_UI::config()->get_canvasvar_CrossfadeLine(), 128);
                start_xfade_out->set_outline_color (col);
@@ -791,7 +791,7 @@ AudioRegionView::redraw_end_xfade_to (boost::shared_ptr<AudioRegion> ar, framecn
        }
 
        if (!end_xfade_in) {
-               end_xfade_in = new ArdourCanvas::Curve (group);
+               end_xfade_in = new ArdourCanvas::PolyLine (group);
                CANVAS_DEBUG_NAME (end_xfade_in, string_compose ("xfade end in line for %1", region()->name()));
                uint32_t col UINT_RGBA_CHANGE_A (ARDOUR_UI::config()->get_canvasvar_CrossfadeLine(), 128);
                end_xfade_in->set_outline_color (col);
@@ -799,7 +799,7 @@ AudioRegionView::redraw_end_xfade_to (boost::shared_ptr<AudioRegion> ar, framecn
        }
 
        if (!end_xfade_out) {
-               end_xfade_out = new ArdourCanvas::Curve (group);
+               end_xfade_out = new ArdourCanvas::PolyLine (group);
                CANVAS_DEBUG_NAME (end_xfade_out, string_compose ("xfade end out line for %1", region()->name()));
                end_xfade_out->set_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeLine());
                end_xfade_out->set_outline_width (2.0);

diff --git a/gtk2_ardour/audio_region_view.h b/gtk2_ardour/audio_region_view.h
index 01f062d93d2aea745486c14428a213bcbc0a6fef..bb5cbf29c4be3f7b8e122639841eb36ad1534ab9 100644 (file)
--- a/gtk2_ardour/audio_region_view.h
+++ b/gtk2_ardour/audio_region_view.h
@@ -151,18 +151,18 @@ class AudioRegionView : public RegionView
        std::list<std::pair<framepos_t, ArdourCanvas::Line*> > feature_lines;
 
        ArdourCanvas::Polygon*          sync_mark; ///< polgyon for sync position
-       ArdourCanvas::Curve*         fade_in_shape;
-       ArdourCanvas::Curve*         fade_out_shape;
+       ArdourCanvas::PolyLine*         fade_in_shape;
+       ArdourCanvas::PolyLine*         fade_out_shape;
        ArdourCanvas::Rectangle*        fade_in_handle; ///< fade in handle, or 0
        ArdourCanvas::Rectangle*        fade_out_handle; ///< fade out handle, or 0
 
-       ArdourCanvas::Curve *start_xfade_in;
-       ArdourCanvas::Curve *start_xfade_out;
+       ArdourCanvas::PolyLine *start_xfade_in;
+       ArdourCanvas::PolyLine *start_xfade_out;
        ArdourCanvas::Rectangle* start_xfade_rect;
        bool _start_xfade_visible;
 
-       ArdourCanvas::Curve *end_xfade_in;
-       ArdourCanvas::Curve *end_xfade_out;
+       ArdourCanvas::PolyLine *end_xfade_in;
+       ArdourCanvas::PolyLine *end_xfade_out;
        ArdourCanvas::Rectangle* end_xfade_rect;
        bool _end_xfade_visible;