Revert "cairo sub-surface prototype & example

This reverts commit c57fcde78cc0fb393fb7420f1edbc71edf572bd0.
and also     commit f1f8f89fcb9312065a818233dff4a3f1871fa7fe.

2 files changed, 4 insertions, 10 deletions

diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc
index b85706ec4b..da07c9f324 100644
--- a/gtk2_ardour/audio_region_view.cc
+++ b/gtk2_ardour/audio_region_view.cc
@@ -91,7 +91,6 @@ AudioRegionView::AudioRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView
 	, _end_xfade_visible (false)
 	, _amplitude_above_axis(1.0)
 	, fade_color(0)
-	, curve_surface(new ArdourCanvas::SurfaceGroup(group))
 {
 	Config->ParameterChanged.connect (*this, invalidator (*this), boost::bind (&AudioRegionView::parameter_changed, this, _1), gui_context());
 }
@@ -112,7 +111,6 @@ AudioRegionView::AudioRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView
 	, _end_xfade_visible (false)
 	, _amplitude_above_axis(1.0)
 	, fade_color(0)
-	, curve_surface(new ArdourCanvas::SurfaceGroup(group))
 {
 	Config->ParameterChanged.connect (*this, invalidator (*this), boost::bind (&AudioRegionView::parameter_changed, this, _1), gui_context());
 }
@@ -131,7 +129,6 @@ AudioRegionView::AudioRegionView (const AudioRegionView& other, boost::shared_pt
 	, _end_xfade_visible (false)
 	, _amplitude_above_axis (other._amplitude_above_axis)
 	, fade_color(0)
-	, curve_surface(new ArdourCanvas::SurfaceGroup(group))
 {
 	Gdk::Color c;
 	int r,g,b,a;
@@ -693,7 +690,7 @@ AudioRegionView::redraw_start_xfade_to (boost::shared_ptr<AudioRegion> ar, frame
 	}
 
 	if (!start_xfade_out) {
-		start_xfade_out = new ArdourCanvas::Curve (curve_surface);
+		start_xfade_out = new ArdourCanvas::Curve (group);
 		CANVAS_DEBUG_NAME (start_xfade_out, string_compose ("xfade start out line for %1", region()->name()));
 		start_xfade_out->set_fill_color (UINT_RGBA_CHANGE_A (ARDOUR_UI::config()->get_canvasvar_ActiveCrossfade(), 32));
 		start_xfade_out->set_fill_mode (ArdourCanvas::Curve::Inside);
@@ -703,7 +700,7 @@ AudioRegionView::redraw_start_xfade_to (boost::shared_ptr<AudioRegion> ar, frame
 	}
 
 	if (!start_xfade_in) {
-		start_xfade_in = new ArdourCanvas::Curve (curve_surface);
+		start_xfade_in = new ArdourCanvas::Curve (group);
 		CANVAS_DEBUG_NAME (start_xfade_in, string_compose ("xfade start in line for %1", region()->name()));
 		start_xfade_in->set_fill_color (UINT_RGBA_CHANGE_A (ARDOUR_UI::config()->get_canvasvar_CrossfadeLine(), 96));
 		start_xfade_in->set_fill_mode (ArdourCanvas::Curve::Outside);
@@ -798,7 +795,7 @@ AudioRegionView::redraw_end_xfade_to (boost::shared_ptr<AudioRegion> ar, framecn
 	}
 
 	if (!end_xfade_out) {
-		end_xfade_out = new ArdourCanvas::Curve (curve_surface);
+		end_xfade_out = new ArdourCanvas::Curve (group);
 		CANVAS_DEBUG_NAME (end_xfade_out, string_compose ("xfade end out line for %1", region()->name()));
 		end_xfade_out->set_fill_color (UINT_RGBA_CHANGE_A (ARDOUR_UI::config()->get_canvasvar_ActiveCrossfade(), 32));
 		end_xfade_out->set_fill_mode (ArdourCanvas::Curve::Inside);
@@ -808,7 +805,7 @@ AudioRegionView::redraw_end_xfade_to (boost::shared_ptr<AudioRegion> ar, framecn
 	}
 
 	if (!end_xfade_in) {
-		end_xfade_in = new ArdourCanvas::Curve (curve_surface);
+		end_xfade_in = new ArdourCanvas::Curve (group);
 		CANVAS_DEBUG_NAME (end_xfade_in, string_compose ("xfade end in line for %1", region()->name()));
 		end_xfade_in->set_fill_color (UINT_RGBA_CHANGE_A (ARDOUR_UI::config()->get_canvasvar_CrossfadeLine(), 96));
 		end_xfade_in->set_fill_mode (ArdourCanvas::Curve::Outside);
diff --git a/gtk2_ardour/audio_region_view.h b/gtk2_ardour/audio_region_view.h
index 5444b1b569..3c6b675692 100644
--- a/gtk2_ardour/audio_region_view.h
+++ b/gtk2_ardour/audio_region_view.h
@@ -30,7 +30,6 @@
 
 #include "canvas/fwd.h"
 #include "canvas/wave_view.h"
-#include "canvas/surface_group.h"
 
 #include "region_view.h"
 #include "time_axis_view_item.h"
@@ -205,8 +204,6 @@ class AudioRegionView : public RegionView
 	AutomationLine::VisibleAspects automation_line_visibility () const;
 
 private:
-	ArdourCanvas::SurfaceGroup *curve_surface;
-
 	void setup_fade_handle_positions ();
 
 	void parameter_changed (std::string const &);