Remove old gnome-canvas src code.

4 files changed, 0 insertions, 3955 deletions

diff --git a/gtk2_ardour/canvas-simpleline.c b/gtk2_ardour/canvas-simpleline.c
deleted file mode 100644
index aa6cf715ad..0000000000
--- a/gtk2_ardour/canvas-simpleline.c
+++ /dev/null
@@ -1,448 +0,0 @@
-#include <stdio.h>
-#include <math.h>
-#include <cairo.h>
-#include <libgnomecanvas/libgnomecanvas.h>
-
-#include "canvas-simpleline.h"
-#include "rgb_macros.h"
-#include "gettext.h"
-#define _(Text)  dgettext (PACKAGE,Text)
-
-enum {
-	PROP_0,
-	PROP_X1,
-	PROP_Y1,
-	PROP_X2,
-	PROP_Y2,
-	PROP_COLOR_RGBA
-};
-
-static void gnome_canvas_simpleline_class_init   (GnomeCanvasSimpleLineClass *class);
-
-static void gnome_canvas_simpleline_init         (GnomeCanvasSimpleLine      *simpleline);
-
-static void gnome_canvas_simpleline_destroy      (GtkObject            *object);
-
-static void gnome_canvas_simpleline_set_property (GObject        *object,
-						  guint           prop_id,
-						  const GValue   *value,
-						  GParamSpec     *pspec);
-static void gnome_canvas_simpleline_get_property (GObject        *object,
-						  guint           prop_id,
-						  GValue         *value,
-						  GParamSpec     *pspec);
-
-static void   gnome_canvas_simpleline_update     (GnomeCanvasItem *item,
-						  double          *affine,
-						  ArtSVP          *clip_path,
-						  int flags);
-
-static void   gnome_canvas_simpleline_bounds     (GnomeCanvasItem *item,
-						  double          *x1,
-						  double          *y1,
-						  double          *x2,
-						  double          *y2);
-
-static double gnome_canvas_simpleline_point      (GnomeCanvasItem  *item,
-						  double            x,
-						  double            y,
-						  int               cx,
-						  int               cy,
-						  GnomeCanvasItem **actual_item);
-
-static void   gnome_canvas_simpleline_render     (GnomeCanvasItem *item,
-						  GnomeCanvasBuf  *buf);
-
-static void   gnome_canvas_simpleline_draw       (GnomeCanvasItem *item,
-						  GdkDrawable     *drawable,
-						  int              x,
-						  int              y,
-						  int              w,
-						  int              h);
-
-static GnomeCanvasItemClass *parent_class;
-
-
-GType
-gnome_canvas_simpleline_get_type (void)
-{
-	static GType simpleline_type;
-
-	if (!simpleline_type) {
-		static const GTypeInfo object_info = {
-			sizeof (GnomeCanvasSimpleLineClass),
-			(GBaseInitFunc) NULL,
-			(GBaseFinalizeFunc) NULL,
-			(GClassInitFunc) gnome_canvas_simpleline_class_init,
-			(GClassFinalizeFunc) NULL,
-			NULL,			/* class_data */
-			sizeof (GnomeCanvasSimpleLine),
-			0,			/* n_preallocs */
-			(GInstanceInitFunc) gnome_canvas_simpleline_init,
-			NULL			/* value_table */
-		};
-
-		simpleline_type = g_type_register_static (GNOME_TYPE_CANVAS_ITEM, "GnomeCanvasSimpleLine",
-							  &object_info, 0);
-	}
-
-	return simpleline_type;
-}
-
-static void
-gnome_canvas_simpleline_class_init (GnomeCanvasSimpleLineClass *class)
-{
-	GObjectClass *gobject_class;
-	GtkObjectClass *object_class;
-	GnomeCanvasItemClass *item_class;
-
-	gobject_class = (GObjectClass *) class;
-	object_class = (GtkObjectClass *) class;
-	item_class = (GnomeCanvasItemClass *) class;
-
-	parent_class = g_type_class_peek_parent (class);
-
-	gobject_class->set_property = gnome_canvas_simpleline_set_property;
-	gobject_class->get_property = gnome_canvas_simpleline_get_property;
-
-	g_object_class_install_property (gobject_class,
-					 PROP_X1,
-					 g_param_spec_double ("x1",
-							      _("x1"),
-							      _("x coordinate of upper left corner of rect"),
-							      -G_MAXDOUBLE,
-							      G_MAXDOUBLE,
-							      0.0,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (gobject_class,
-					 PROP_Y1,
-					 g_param_spec_double ("y1",
-							      _("y1"),
-							      _("y coordinate of upper left corner of rect "),
-							      -G_MAXDOUBLE,
-							      G_MAXDOUBLE,
-							      0.0,
-							      G_PARAM_READWRITE));
-
-
-	g_object_class_install_property (gobject_class,
-					 PROP_X2,
-					 g_param_spec_double ("x2",
-							      _("x2"),
-							      _("x coordinate of lower right corner of rect"),
-							      -G_MAXDOUBLE,
-							      G_MAXDOUBLE,
-							      0.0,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (gobject_class,
-					 PROP_Y2,
-					 g_param_spec_double ("y2",
-							      _("y2"),
-							      _("y coordinate of lower right corner of rect "),
-							      -G_MAXDOUBLE,
-							      G_MAXDOUBLE,
-							      0.0,
-							      G_PARAM_READWRITE));
-	g_object_class_install_property (gobject_class,
-					 PROP_COLOR_RGBA,
-					 g_param_spec_uint ("color_rgba",
-							    _("color rgba"),
-							    _("color of line"),
-							    0,
-							    G_MAXUINT,
-							    0,
-							    G_PARAM_READWRITE));
-
-	object_class->destroy = gnome_canvas_simpleline_destroy;
-
-	item_class->update = gnome_canvas_simpleline_update;
-	item_class->bounds = gnome_canvas_simpleline_bounds;
-	item_class->point = gnome_canvas_simpleline_point;
-	item_class->render = gnome_canvas_simpleline_render;
-	item_class->draw = gnome_canvas_simpleline_draw;
-}
-
-static void
-gnome_canvas_simpleline_init (GnomeCanvasSimpleLine *simpleline)
-{
-	simpleline->x1 = 0.0;
-	simpleline->y1 = 0.0;
-	simpleline->x2 = 0.0;
-	simpleline->y2 = 0.0;
-	simpleline->color = RGBA_TO_UINT(98,123,174,241);
-}
-
-static void
-gnome_canvas_simpleline_destroy (GtkObject *object)
-{
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (GNOME_IS_CANVAS_SIMPLELINE (object));
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-/*
- * CANVAS CALLBACKS
- */
-
-static void
-gnome_canvas_simpleline_set_property (GObject      *object,
-				      guint         prop_id,
-				      const GValue *value,
-				      GParamSpec   *pspec)
-
-{
-	(void) pspec;
-
-	GnomeCanvasSimpleLine *simpleline;
-	int update = FALSE;
-	int bounds_changed = FALSE;
-	double d;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (GNOME_IS_CANVAS_SIMPLELINE (object));
-
-	simpleline = GNOME_CANVAS_SIMPLELINE (object);
-
-	switch (prop_id) {
-	case PROP_X1:
-		d = g_value_get_double (value);
-		if (simpleline->x1 != d) {
-			simpleline->x1 = d;
-			bounds_changed = TRUE;
-		}
-		break;
-
-	case PROP_Y1:
-		d = g_value_get_double (value);
-		if (simpleline->y1 != d) {
-			simpleline->y1 = d;
-			bounds_changed = TRUE;
-		}
-		break;
-
-	case PROP_X2:
-		d = g_value_get_double (value);
-		if (simpleline->x2 != d) {
-			simpleline->x2 = d;
-			bounds_changed = TRUE;
-		}
-		break;
-
-	case PROP_Y2:
-		d = g_value_get_double (value);
-		if (simpleline->y2 != d) {
-			simpleline->y2 = d;
-			bounds_changed = TRUE;
-		}
-		break;
-
-	case PROP_COLOR_RGBA:
-		if (simpleline->color != g_value_get_uint(value)) {
-			simpleline->color = g_value_get_uint(value);
-			UINT_TO_RGBA (simpleline->color, &simpleline->r, &simpleline->g, &simpleline->b, &simpleline->a);
-			update = TRUE;
-		}
-		break;
-	default:
-		break;
-	}
-
-	if (update || bounds_changed) {
-		gnome_canvas_item_request_update (GNOME_CANVAS_ITEM(object));
-	}
-}
-
-static void
-gnome_canvas_simpleline_get_property (GObject      *object,
-				      guint         prop_id,
-				      GValue       *value,
-				      GParamSpec   *pspec)
-{
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (GNOME_IS_CANVAS_SIMPLELINE (object));
-
-	GnomeCanvasSimpleLine *line = GNOME_CANVAS_SIMPLELINE (object);
-
-	switch (prop_id) {
-	case PROP_X1:
-		g_value_set_double (value, line->x1);
-		break;
-	case PROP_X2:
-		g_value_set_double (value, line->x2);
-		break;
-	case PROP_Y1:
-		g_value_set_double (value, line->y1);
-		break;
-	case PROP_Y2:
-		g_value_set_double (value, line->y2);
-		break;
-	case PROP_COLOR_RGBA:
-		g_value_set_uint (value, line->color);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-gnome_canvas_simpleline_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, int flags)
-{
-	GnomeCanvasSimpleLine *simpleline;
-	double x1, x2, y1, y2;
-
-	simpleline = GNOME_CANVAS_SIMPLELINE (item);
-
-	if (parent_class->update)
-		(* parent_class->update) (item, affine, clip_path, flags);
-
-	/* redraw old location */
-
-	gnome_canvas_request_redraw (item->canvas, item->x1, item->y1, item->x2, item->y2);
-
-	/* get current bounding box in parent-relative world coordinates */
-
-	gnome_canvas_simpleline_bounds (item, &x1, &y1, &x2, &y2);
-
-	/* convert parent-relative item coordinates to world coordinates */
-
-	gnome_canvas_item_i2w (item, &x1, &y1);
-	gnome_canvas_item_i2w (item, &x2, &y2);
-
-	/* don't suffer from rounding errors */
-
-	x1 = floor (x1);
-	y1 = floor (y1);
-	x2 = ceil (x2);
-	y2 = ceil (y2);
-
-	/* force non-zero dimensionality for both axes */
-
-	if (x1 == x2) {
-		x2 += 1.0;
-	}
-
-	if (y1 == y2) {
-		y2 += 1.0;
-	}
-
-	/* reset item bounding box (canvas coordinates, so integral. but stored in doubles) */
-
-	gnome_canvas_w2c_d (GNOME_CANVAS(item->canvas), x1, y1, &item->x1, &item->y1);
-	gnome_canvas_w2c_d (GNOME_CANVAS(item->canvas), x2, y2, &item->x2, &item->y2);
-
-	/* redraw new location */
-
-	gnome_canvas_request_redraw (item->canvas, item->x1, item->y1, item->x2, item->y2);
-
-	/* store actual line coords as canvas coordinates for use in render() */
-
-	x1 = simpleline->x1;
-	y1 = simpleline->y1;
-	x2 = simpleline->x2;
-	y2 = simpleline->y2;
-	/* convert to world */
-	gnome_canvas_item_i2w (item, &x1, &y1);
-	gnome_canvas_item_i2w (item, &x2, &y2);
-	/* avoid rounding errors */
-	x1 = (int) floor (item->x1);
-	y1 = (int) floor (item->y1);
-	x2 = (int) ceil (item->x2);
-	y2 = (int) ceil (item->y2);
-	/* convert to canvas coordinates, integral, stored in integers */
-	gnome_canvas_w2c (GNOME_CANVAS(item->canvas), x1, y1, &simpleline->cx1, &simpleline->cy1);
-	gnome_canvas_w2c (GNOME_CANVAS(item->canvas), x2, y2, &simpleline->cx2, &simpleline->cy2);
-}
-
-static void
-gnome_canvas_simpleline_render (GnomeCanvasItem *item,
-                                GnomeCanvasBuf *buf)
-{
-	GnomeCanvasSimpleLine *simpleline;
-	int x1, x2;
-	int y1, y2;
-
-	simpleline = GNOME_CANVAS_SIMPLELINE (item);
-
-	x1 = simpleline->cx1;
-	x2 = simpleline->cx2;
-	y1 = simpleline->cy1;
-
-	if (buf->is_bg) {
-		gnome_canvas_buf_ensure_buf (buf);
-		buf->is_bg = FALSE;
-	}
-
-	if (simpleline->x1 != simpleline->x2) {
-		PAINT_HORIZA(buf, simpleline->r, simpleline->g, simpleline->b, simpleline->a,
-		             x1, x2, y1);
-	} else {
-		y2 = simpleline->cy2;
-		PAINT_VERTA (buf, simpleline->r, simpleline->g, simpleline->b, simpleline->a,
-		             x1, y1, y2);
-
-	}
-}
-
-static void
-gnome_canvas_simpleline_draw (GnomeCanvasItem* canvas,
-                              GdkDrawable* drawable,
-                              int x, int y,
-                              int width, int height)
-{
-        /* XXX not implemented */
-}
-
-static void
-gnome_canvas_simpleline_bounds (GnomeCanvasItem *item, double *x1, double *y1, double *x2, double *y2)
-{
-	GnomeCanvasSimpleLine *simpleline = GNOME_CANVAS_SIMPLELINE (item);
-
-	*x1 = simpleline->x1;
-	*y1 = simpleline->y1;
-	*x2 = simpleline->x1;
-	*y2 = simpleline->y2;
-}
-
-static double
-gnome_canvas_simpleline_point (GnomeCanvasItem *item, double x, double y, int cx, int cy, GnomeCanvasItem **actual_item)
-{
-	(void) cx;
-	(void) cy;
-
-	double x1, y1, x2, y2;
-	double dx, dy;
-
-	*actual_item = item;
-
-	/* Find the bounds for the line */
-
-	gnome_canvas_simpleline_bounds (item, &x1, &y1, &x2, &y2);
-
-	/* Is point inside line */
-
-	if ((x >= x1) && (y >= y1) && (x <= x2) && (y <= y2)) {
-		return 0.0;
-	}
-	/* Point is outside line */
-
-	if (x < x1)
-		dx = x1 - x;
-	else if (x > x2)
-		dx = x - x2;
-	else
-		dx = 0.0;
-
-	if (y < y1)
-		dy = y1 - y;
-	else if (y > y2)
-		dy = y - y2;
-	else
-		dy = 0.0;
-
-	return sqrt (dx * dx + dy * dy);
-}
diff --git a/gtk2_ardour/canvas-simplerect.c b/gtk2_ardour/canvas-simplerect.c
deleted file mode 100644
index 0d26a42a5e..0000000000
--- a/gtk2_ardour/canvas-simplerect.c
+++ /dev/null
@@ -1,878 +0,0 @@
-#include <stdio.h>
-#include <math.h>
-#include <cairo.h>
-#include <libgnomecanvas/libgnomecanvas.h>
-
-#include "canvas-simplerect.h"
-#include "rgb_macros.h"
-#include "gettext.h"
-#define _(Text)  dgettext (PACKAGE,Text)
-
-enum {
-	PROP_0,
-	PROP_X1,
-	PROP_Y1,
-	PROP_X2,
-	PROP_Y2,
-	PROP_OUTLINE_PIXELS,
-	PROP_OUTLINE_WHAT,
-	PROP_FILL,
-	PROP_FILL_COLOR_RGBA,
-	PROP_OUTLINE_COLOR_RGBA,
-	PROP_DRAW
-};
-
-static void   gnome_canvas_simplerect_class_init    (GnomeCanvasSimpleRectClass *class);
-
-static void   gnome_canvas_simplerect_init          (GnomeCanvasSimpleRect      *simplerect);
-
-static void   gnome_canvas_simplerect_destroy       (GtkObject                  *object);
-
-static void   gnome_canvas_simplerect_set_property  (GObject        *object,
-						     guint            prop_id,
-						     const GValue   *value,
-						     GParamSpec     *pspec);
-
-static void   gnome_canvas_simplerect_get_property  (GObject        *object,
-						     guint           prop_id,
-						     GValue         *value,
-						     GParamSpec     *pspec);
-
-static void   gnome_canvas_simplerect_update        (GnomeCanvasItem *item,
-						     double          *affine,
-						     ArtSVP          *clip_path,
-						     int              flags);
-
-static void   gnome_canvas_simplerect_bounds        (GnomeCanvasItem *item,
-						     double          *x1,
-						     double          *y1,
-						     double          *x2,
-						     double          *y2);
-
-static double gnome_canvas_simplerect_point         (GnomeCanvasItem *item, double x, double y, int cx, int cy, GnomeCanvasItem **actual_item);
-
-static void   gnome_canvas_simplerect_render        (GnomeCanvasItem *item, GnomeCanvasBuf *buf);
-
-static void   gnome_canvas_simplerect_draw          (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int w, int h);
-
-static GnomeCanvasItemClass *parent_class;
-
-
-GType
-gnome_canvas_simplerect_get_type (void)
-{
-	static GType simplerect_type;
-
-	if (!simplerect_type) {
-		static const GTypeInfo object_info = {
-			sizeof (GnomeCanvasSimpleRectClass),
-			(GBaseInitFunc) NULL,
-			(GBaseFinalizeFunc) NULL,
-			(GClassInitFunc) gnome_canvas_simplerect_class_init,
-			(GClassFinalizeFunc) NULL,
-			NULL,			/* class_data */
-			sizeof (GnomeCanvasSimpleRect),
-			0,			/* n_preallocs */
-			(GInstanceInitFunc) gnome_canvas_simplerect_init,
-			NULL			/* value_table */
-		};
-
-		simplerect_type = g_type_register_static (GNOME_TYPE_CANVAS_ITEM, "GnomeCanvasSimpleRect",
-							  &object_info, 0);
-	}
-
-	return simplerect_type;
-}
-
-static void
-gnome_canvas_simplerect_class_init (GnomeCanvasSimpleRectClass *class)
-{
-	GObjectClass *gobject_class;
-	GtkObjectClass *object_class;
-	GnomeCanvasItemClass *item_class;
-
-	gobject_class = (GObjectClass *) class;
-	object_class = (GtkObjectClass *) class;
-	item_class = (GnomeCanvasItemClass *) class;
-
-	parent_class = g_type_class_peek_parent (class);
-
-	gobject_class->set_property = gnome_canvas_simplerect_set_property;
-	gobject_class->get_property = gnome_canvas_simplerect_get_property;
-
-	g_object_class_install_property (gobject_class,
-					 PROP_X1,
-					 g_param_spec_double ("x1",
-							      _("x1"),
-							      _("x coordinate of upper left corner of rect"),
-							      -G_MAXDOUBLE,
-							      G_MAXDOUBLE,
-							      0.0,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (gobject_class,
-					 PROP_Y1,
-					 g_param_spec_double ("y1",
-							      _("y1"),
-							      _("y coordinate of upper left corner of rect "),
-							      -G_MAXDOUBLE,
-							      G_MAXDOUBLE,
-							      0.0,
-							      G_PARAM_READWRITE));
-
-
-	g_object_class_install_property (gobject_class,
-					 PROP_X2,
-					 g_param_spec_double ("x2",
-							      _("x2"),
-							      _("x coordinate of lower right corner of rect"),
-							      -G_MAXDOUBLE,
-							      G_MAXDOUBLE,
-							      0.0,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (gobject_class,
-					 PROP_Y2,
-					 g_param_spec_double ("y2",
-							      _("y2"),
-							      _("y coordinate of lower right corner of rect "),
-							      -G_MAXDOUBLE,
-							      G_MAXDOUBLE,
-							      0.0,
-							      G_PARAM_READWRITE));
-
-
-	g_object_class_install_property (gobject_class,
-					 PROP_OUTLINE_PIXELS,
-					 g_param_spec_uint ("outline_pixels",
-							      _("outline pixels"),
-							      _("width in pixels of outline"),
-							      0,
-							      G_MAXUINT,
-							      0,
-							      G_PARAM_READWRITE));
-
-
-	g_object_class_install_property (gobject_class,
-					 PROP_OUTLINE_WHAT,
-					 g_param_spec_uint ("outline_what",
-							      _("outline what"),
-							      _("which boundaries to outline (mask)"),
-							      0,
-							      G_MAXUINT,
-							      0,
-							      G_PARAM_READWRITE));
-
-
-
-	g_object_class_install_property (gobject_class,
-					 PROP_FILL,
-					 g_param_spec_boolean ("fill",
-							       _("fill"),
-							       _("fill rectangle"),
-							       TRUE,
-							       G_PARAM_READWRITE));
-
-	g_object_class_install_property (gobject_class,
-					 PROP_DRAW,
-					 g_param_spec_boolean ("draw",
-							       _("draw"),
-							       _("draw rectangle"),
-							       TRUE,
-							       G_PARAM_READWRITE));
-
-
-	g_object_class_install_property (gobject_class,
-					 PROP_OUTLINE_COLOR_RGBA,
-					 g_param_spec_uint ("outline_color_rgba",
-							    _("outline color rgba"),
-							    _("color of outline"),
-							    0,
-							    G_MAXUINT,
-							    0,
-							    G_PARAM_READWRITE));
-
-
-	g_object_class_install_property (gobject_class,
-					 PROP_FILL_COLOR_RGBA,
-					 g_param_spec_uint ("fill_color_rgba",
-							    _("fill color rgba"),
-							    _("color of fill"),
-							    0,
-							    G_MAXUINT,
-							    0,
-							    G_PARAM_READWRITE));
-
-	object_class->destroy = gnome_canvas_simplerect_destroy;
-
-	item_class->update = gnome_canvas_simplerect_update;
-	item_class->draw = gnome_canvas_simplerect_draw;
-	item_class->bounds = gnome_canvas_simplerect_bounds;
-	item_class->point = gnome_canvas_simplerect_point;
-	item_class->render = gnome_canvas_simplerect_render;
-
-}
-
-static void
-gnome_canvas_simplerect_init (GnomeCanvasSimpleRect *simplerect)
-{
-	simplerect->x1 = 0.0;
-	simplerect->y1 = 0.0;
-	simplerect->x2 = 0.0;
-	simplerect->y2 = 0.0;
-	simplerect->fill = TRUE;
-	simplerect->draw = TRUE;
-	simplerect->full_draw_on_update = TRUE;
-	simplerect->fill_color = 0;
-	simplerect->outline_color = 0;
-	simplerect->outline_pixels = 1;
-	simplerect->outline_what = 0xf;
-}
-
-static void
-gnome_canvas_simplerect_destroy (GtkObject *object)
-{
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (GNOME_IS_CANVAS_SIMPLERECT (object));
-
-	/* remember, destroy can be run multiple times! */
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-	      (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-static void
-gnome_canvas_simplerect_bounds (GnomeCanvasItem *item, double *x1, double *y1, double *x2, double *y2)
-{
-	GnomeCanvasSimpleRect *simplerect = GNOME_CANVAS_SIMPLERECT (item);
-
-	*x1 = simplerect->x1;
-	*y1 = simplerect->y1;
-	*x2 = simplerect->x2 + 1;
-	*y2 = simplerect->y2 + 1;
-}
-
-
-static void
-gnome_canvas_simplerect_reset_bounds (GnomeCanvasItem *item)
-{
-	GnomeCanvasSimpleRect* simplerect;
-	double x1, x2, y1, y2;
-	double old_x1, old_x2, old_y1, old_y2;
-	ArtDRect unionrect, old, new;
-
-	old_x1 = item->x1;
-	old_y1 = item->y1;
-	old_x2 = item->x2;
-	old_y2 = item->y2;
-
-	gnome_canvas_simplerect_bounds (item, &x1, &y1, &x2, &y2);
-	gnome_canvas_item_i2w (item, &x1, &y1);
-	gnome_canvas_item_i2w (item, &x2, &y2);
-
-	item->x1 = x1;
-	item->y1 = y1;
-	item->x2 = x2;
-	item->y2 = y2;
-
-	/* now compute bounding box in canvas units */
-
-	simplerect = GNOME_CANVAS_SIMPLERECT (item);
-
-	gnome_canvas_w2c (GNOME_CANVAS(item->canvas), x1, y1, &simplerect->bbox_ulx, &simplerect->bbox_uly);
-	gnome_canvas_w2c (GNOME_CANVAS(item->canvas), x2, y2, &simplerect->bbox_lrx, &simplerect->bbox_lry);
-
-	/* now queue redraws for changed areas */
-
-	if (item->x1 == old_x1 && item->x2 == old_x2) {
-
-		/* no change in x-axis position */
-
-		if (item->y1 == old_y1) {
-			/* top didn't change, so just draw bottom */
-
-			double start_y = MIN (item->y2, old_y2);
-			double end_y = MAX (item->y2, old_y2);
-
-			gnome_canvas_request_redraw (item->canvas, item->x1, start_y - 0.5, item->x2, end_y + 1.5);
-			return;
-
-		} else if (item->y2 == old_y2) {
-
-			/* bottom didn't change, just draw top */
-
-			double start_y = MIN (item->y1, old_y1);
-			double end_y = MAX (item->y1, old_y1);
-
-			gnome_canvas_request_redraw (item->canvas, item->x1, start_y - 0.5, item->x2, end_y + 1.5);
-			return;
-
-		}
-
-	} else if (item->y1 == old_y1 && item->y2 == old_y2) {
-
-		/* no change in y-axis position */
-
-		if (item->x1 == old_x1) {
-			/* start didn't change, so just draw at the end */
-
-			double start_x = MIN (item->x2, old_x2);
-			double end_x = MAX (item->x2, old_x2);
-
-			gnome_canvas_request_redraw (item->canvas, start_x - 0.5, item->y1, end_x + 1.5, item->y2 + 0.5);
-			return;
-
-		} else if (item->x2 == old_x2) {
-
-			/* end didn't change, so just draw at the start */
-
-			double start_x = MIN (item->x1, old_x1);
-			double end_x = MAX (item->x1, old_x1);
-
-			gnome_canvas_request_redraw (item->canvas, start_x - 0.5, item->y1, end_x + 1.5, item->y2 + 0.5);
-			return;
-
-		}
-	}
-
-	new.x0 = x1;
-	new.y0 = y1;
-	new.x1 = x2;
-	new.y1 = y2;
-
-	old.x0 = old_x1;
-	old.y0 = old_y1;
-	old.x1 = old_x2;
-	old.y1 = old_y2;
-
-	art_drect_union (&unionrect, &old, &new);
-	gnome_canvas_request_redraw (item->canvas,
-				     unionrect.x0 - 0.5,
-				     unionrect.y0 - 0.5,
-				     unionrect.x1 + 1.5,
-				     unionrect.y1 + 1.5);
-}
-
-/*
- * CANVAS CALLBACKS
- */
-
-static void
-gnome_canvas_simplerect_set_property (GObject      *object,
-				      guint         prop_id,
-				      const GValue *value,
-				      GParamSpec   *pspec)
-
-{
-	(void) pspec;
-
-	GnomeCanvasSimpleRect *simplerect;
-	int update = FALSE;
-	int bounds_changed = FALSE;
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (GNOME_IS_CANVAS_SIMPLERECT (object));
-
-	simplerect = GNOME_CANVAS_SIMPLERECT (object);
-
-	switch (prop_id) {
-	case PROP_X1:
-		if (simplerect->x1 != g_value_get_double (value)) {
-			simplerect->x1 = g_value_get_double (value);
-			bounds_changed = TRUE;
-		}
-		break;
-
-	case PROP_Y1:
-		if (simplerect->y1 != g_value_get_double (value)) {
-			simplerect->y1 = g_value_get_double (value);
-			bounds_changed = TRUE;
-		}
-		break;
-
-	case PROP_X2:
-		if (simplerect->x2 != g_value_get_double (value)) {
-			simplerect->x2 = g_value_get_double (value);
-			bounds_changed = TRUE;
-		}
-		break;
-
-	case PROP_Y2:
-		if (simplerect->y2 != g_value_get_double (value)) {
-			simplerect->y2 = g_value_get_double (value);
-			bounds_changed = TRUE;
-		}
-		break;
-
-	case PROP_DRAW:
-		if (simplerect->draw != g_value_get_boolean (value)) {
-			simplerect->draw = g_value_get_boolean (value);
-			update = TRUE;
-		}
-		break;
-
-
-	case PROP_FILL:
-		if (simplerect->fill != g_value_get_boolean (value)) {
-			simplerect->fill = g_value_get_boolean (value);
-			update = TRUE;
-		}
-		break;
-
-	case PROP_FILL_COLOR_RGBA:
-		if (simplerect->fill_color != g_value_get_uint(value)) {
-			simplerect->fill_color = g_value_get_uint(value);
-			update = TRUE;
-		}
-		break;
-
-	case PROP_OUTLINE_COLOR_RGBA:
-		if (simplerect->outline_color != g_value_get_uint(value)) {
-			simplerect->outline_color = g_value_get_uint(value);
-			update = TRUE;
-		}
-		break;
-
-	case PROP_OUTLINE_PIXELS:
-		if (simplerect->outline_pixels != g_value_get_uint(value)) {
-			simplerect->outline_pixels = g_value_get_uint(value);
-			update = TRUE;
-		}
-		break;
-
-	case PROP_OUTLINE_WHAT:
-		if (simplerect->outline_what != g_value_get_uint(value)) {
-			simplerect->outline_what = g_value_get_uint(value);
-			update = TRUE;
-		}
-		break;
-
-	default:
-		break;
-	}
-
-	if (!simplerect->full_draw_on_update) {
-		/* XXX: not sure about this;
-		 *
-		 * I changed the next line to be conditional, rather than always
-		 * being executed.  Without the condition, the following bug occurs:
-		 *
-		 * caller sets a property (e.g. outline colour); this sets update = TRUE and hence full_draw_on_update = TRUE
-		 * update is requested (and it is intended, I suppose, that during this update, full_draw_on_update is noted)
-		 * ... update does not occur before ...
-		 * caller sets the same property again to the same value; this sets update = FALSE and hence full_draw_on_update = FALSE
-		 * update now occurs, but full_draw_on_update is FALSE, so the full redraw does not happen,
-		 * which results in graphical glitches.
-		 *
-		 * (Carl, 2/1/2010)
-		 */
-		simplerect->full_draw_on_update = update;
-	}
-
-	if (update || bounds_changed) {
-		gnome_canvas_item_request_update (GNOME_CANVAS_ITEM(object));
-	}
-}
-
-static void
-gnome_canvas_simplerect_get_property (GObject      *object,
-				      guint         prop_id,
-				      GValue       *value,
-				      GParamSpec   *pspec)
-{
-	GnomeCanvasSimpleRect *rect = GNOME_CANVAS_SIMPLERECT (object);
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (GNOME_IS_CANVAS_SIMPLERECT (object));
-
-	switch (prop_id) {
-	case PROP_X1:
-		g_value_set_double (value, rect->x1);
-		break;
-	case PROP_X2:
-		g_value_set_double (value, rect->x2);
-		break;
-	case PROP_Y1:
-		g_value_set_double (value, rect->y1);
-		break;
-	case PROP_Y2:
-		g_value_set_double (value, rect->y2);
-		break;
-	case PROP_OUTLINE_WHAT:
-		g_value_set_uint (value, rect->outline_what);
-		break;
-	case PROP_FILL:
-		g_value_set_boolean (value, rect->fill);
-		break;
-	case PROP_OUTLINE_PIXELS:
-		g_value_set_uint (value, rect->outline_pixels);
-		break;
-	case PROP_FILL_COLOR_RGBA:
-		g_value_set_uint (value, rect->fill_color);
-		break;
-	case PROP_OUTLINE_COLOR_RGBA:
-		g_value_set_uint (value, rect->outline_color);
-		break;
-	case PROP_DRAW:
-		g_value_set_boolean (value, rect->draw);
-		break;
-
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-
-static void
-gnome_canvas_simplerect_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, int flags)
-{
-	GnomeCanvasSimpleRect *simplerect;
-
-	simplerect = GNOME_CANVAS_SIMPLERECT (item);
-
-	if (parent_class->update)
-		(* parent_class->update) (item, affine, clip_path, flags);
-
-	gnome_canvas_simplerect_reset_bounds (item);
-
-	if (simplerect->full_draw_on_update) {
-		gnome_canvas_request_redraw (item->canvas,
-		                             simplerect->bbox_ulx,
-        	                             simplerect->bbox_uly,
-        	                             simplerect->bbox_lrx+0.5,
-        	                             simplerect->bbox_lry+0.5);
-		simplerect->full_draw_on_update = FALSE;
-	}
-
-	UINT_TO_RGBA (simplerect->fill_color, &simplerect->fill_r, &simplerect->fill_g, &simplerect->fill_b, &simplerect->fill_a);
-	UINT_TO_RGBA (simplerect->outline_color, &simplerect->outline_r, &simplerect->outline_g, &simplerect->outline_b, &simplerect->outline_a);
-}
-
-// this can be useful for debugging/understanding how the canvas redraws
-// stuff.
-
-#undef HARLEQUIN_DEBUGGING
-
-#undef SIMPLERECT_FAST_RENDERER
-#ifdef SIMPLERECT_FAST_RENDERER
-
-static void
-gnome_canvas_simplerect_render (GnomeCanvasItem *item,
-			      GnomeCanvasBuf *buf)
-{
-	GnomeCanvasSimpleRect *simplerect;
-	int end, begin;
-	int ey, sy;
-	unsigned int i;
-	ArtIRect intersection;
-	ArtIRect self;
-
-	simplerect = GNOME_CANVAS_SIMPLERECT (item);
-
-	if (parent_class->render) {
-		(*parent_class->render) (item, buf);
-	}
-
-	if (buf->is_bg) {
-
-#ifdef HARLEQUIN_DEBUGGING
-		gint randr, randg, randb;
-		randr = random() % 255;
-		randg = random() % 255;
-		randb = random() % 255;
-		PAINT_BOX(buf, randr, randg, randb, 255, buf->rect.x0, buf->rect.y0, buf->rect.x1, buf->rect.y1);
-#endif
-		gnome_canvas_buf_ensure_buf (buf);
-		buf->is_bg = FALSE;
-	}
-
-	if (!simplerect->draw) {
-		return;
-	}
-
-	self.x0 = simplerect->bbox_ulx;
-	self.y0 = simplerect->bbox_uly;
-	self.x1 = simplerect->bbox_lrx;
-	self.y1 = simplerect->bbox_lry;
-
-	art_irect_intersect (&intersection, &self, &buf->rect);
-
-	begin = MAX(simplerect->bbox_ulx, buf->rect.x0);
-	end = MIN((simplerect->bbox_lrx-1), buf->rect.x1);
-
-	sy = simplerect->bbox_uly;
-	ey = simplerect->bbox_lry-1;
-
-	if (simplerect->fill) {
-
-		// this can be useful for debugging/understanding how the canvas redraws
-		// stuff.
-
-#ifdef HARLEQUIN_DEBUGGING
-		gint randr, randg, randb;
-		randr = random() % 255;
-		randg = random() % 255;
-		randb = random() % 255;
-		PAINT_BOX(buf, randr, randg, randb, simplerect->fill_a, begin, sy, end, ey);
-#else
-		PAINT_BOX (buf, simplerect->fill_r, simplerect->fill_g, simplerect->fill_b, simplerect->fill_a,
-			   intersection.x0, intersection.y0,
-			   intersection.x1, intersection.y1);
-#endif
-
-	}
-
-	if (simplerect->outline_a > 0) {
-		for (i = 0; i < simplerect->outline_pixels; ++i) {
-
-			if (simplerect->outline_what & 0x1) {
-				if (begin == simplerect->bbox_ulx) {
-					PAINT_VERTA(buf, simplerect->outline_r, simplerect->outline_g, simplerect->outline_b, simplerect->outline_a, begin + i, sy, ey);
-				}
-			}
-
-			if (simplerect->outline_what & 0x2) {
-				if (end == (simplerect->bbox_lrx - 1)) {
-					PAINT_VERTA(buf, simplerect->outline_r, simplerect->outline_g, simplerect->outline_b, simplerect->outline_a, end - i, sy, ey + 1);
-				}
-			}
-
-			if (simplerect->outline_what & 0x4) {
-				PAINT_HORIZA(buf, simplerect->outline_r, simplerect->outline_g, simplerect->outline_b, simplerect->outline_a, begin, end, sy+i);
-			}
-
-			if (simplerect->outline_what & 0x8) {
-				PAINT_HORIZA(buf, simplerect->outline_r, simplerect->outline_g, simplerect->outline_b, simplerect->outline_a, begin, end + 1, ey-i);
-			}
-		}
-	}
-}
-
-#else /* SIMPLERECT_FAST_RENDERER */
-
-static void
-gnome_canvas_simplerect_render (GnomeCanvasItem *item,
-			      GnomeCanvasBuf *buf)
-{
-	GnomeCanvasSimpleRect *simplerect;
-	int end, begin;
-	int ey, sy;
-	int i;
-
-	simplerect = GNOME_CANVAS_SIMPLERECT (item);
-
-	if (parent_class->render) {
-		(*parent_class->render) (item, buf);
-	}
-
-	if (buf->is_bg) {
-
-#ifdef HARLEQUIN_DEBUGGING
-		gint randr, randg, randb;
-		randr = random() % 255;
-		randg = random() % 255;
-		randb = random() % 255;
-		PAINT_BOX(buf, randr, randg, randb, 255, buf->rect.x0, buf->rect.y0, buf->rect.x1, buf->rect.y1);
-#endif
-		gnome_canvas_buf_ensure_buf (buf);
-		buf->is_bg = FALSE;
-	}
-
-	if (!simplerect->draw) {
-		return;
-	}
-
-	begin = MAX(simplerect->bbox_ulx,buf->rect.x0);
-	end = MIN((simplerect->bbox_lrx-1),buf->rect.x1);
-
-	sy = simplerect->bbox_uly;
-	ey = simplerect->bbox_lry-1;
-
-	if (simplerect->fill) {
-
-#ifdef HARLEQUIN_DEBUGGING
-		gint randr, randg, randb;
-		randr = random() % 255;
-		randg = random() % 255;
-		randb = random() % 255;
-		PAINT_BOX(buf, randr, randg, randb, simplerect->fill_a, begin, sy, end, ey);
-#else
-		PAINT_BOX(buf, simplerect->fill_r, simplerect->fill_g, simplerect->fill_b, simplerect->fill_a, begin, sy, end, ey);
-#endif
-	}
-
-	if (simplerect->outline_a) {
-		for (i = 0; i < (int) simplerect->outline_pixels; ++i) {
-
-			if (simplerect->outline_what & 0x1) {
-				if (begin == simplerect->bbox_ulx) {
-					PAINT_VERTA(buf, simplerect->outline_r, simplerect->outline_g, simplerect->outline_b, simplerect->outline_a, begin + i, sy, ey);
-				}
-			}
-
-			if (simplerect->outline_what & 0x2) {
-				if (end == (simplerect->bbox_lrx - 1)) {
-					PAINT_VERTA(buf, simplerect->outline_r, simplerect->outline_g, simplerect->outline_b, simplerect->outline_a, end - i, sy, ey + 1);
-				}
-			}
-
-			if (simplerect->outline_what & 0x4) {
-				PAINT_HORIZA(buf, simplerect->outline_r, simplerect->outline_g, simplerect->outline_b, simplerect->outline_a, begin, end, sy+i);
-			}
-
-			if (simplerect->outline_what & 0x8) {
-				PAINT_HORIZA(buf, simplerect->outline_r, simplerect->outline_g, simplerect->outline_b, simplerect->outline_a, begin, end + 1, ey-i);
-			}
-		}
-	}
-}
-#endif /* SIMPLERECT_FAST_RENDERER */
-
-static void
-gnome_canvas_simplerect_draw (GnomeCanvasItem *item,
-			      GdkDrawable *drawable,
-			      int x, int y,
-			      int width, int height)
-{
-	GnomeCanvasSimpleRect *simplerect;
-	cairo_t* cr;
-	double ulx;
-	double uly;
-	double lrx;
-	double lry;
-
-	simplerect = GNOME_CANVAS_SIMPLERECT (item);
-
-	cr = gdk_cairo_create (drawable);
-
-	if (x > simplerect->bbox_ulx) {
-		ulx = x;
-	} else {
-		ulx = simplerect->bbox_ulx;
-	}
-
-	if (y > simplerect->bbox_uly) {
-		uly = y;
-	} else {
-		uly = simplerect->bbox_uly;
-	}
-
-	if (x + width > simplerect->bbox_lrx) {
-		lrx = simplerect->bbox_lrx;
-	} else {
-		lrx = x + width;
-	}
-
-	if (y + height > simplerect->bbox_lry) {
-		lry = simplerect->bbox_lry;
-	} else {
-		lry = y + height;
-	}
-
-	ulx -= x;
-	uly -= y;
-	lrx -= x;
-	lry -= y;
-
-	cairo_rectangle (cr, ulx, uly, lrx - ulx, lry - uly);
-
-	if (simplerect->fill) {
-		cairo_set_source_rgba (cr,
-				       simplerect->fill_r/255.0,
-				       simplerect->fill_g/255.0,
-				       simplerect->fill_b/255.0,
-				       simplerect->fill_a/255.0);
-		cairo_fill (cr);
-	}
-
-	if (simplerect->outline_what && simplerect->outline_pixels) {
-
-#define x_in_range(a) (x <= (a) && (a) < x + width)
-#define y_in_range(a) (y <= (a) && (a) < y + height)
-
-		cairo_set_line_width (cr, simplerect->outline_pixels);
-
-		cairo_set_source_rgb (cr,
-				      simplerect->outline_r/255.0,
-				      simplerect->outline_g/255.0,
-				      simplerect->outline_b/255.0);
-
-		if (simplerect->outline_what & 0x1) {
-			/* left edge, if visible */
-			if (x_in_range (simplerect->bbox_ulx)) {
-				cairo_move_to (cr, ulx+0.5, uly+0.5);
-				cairo_line_to (cr, ulx+0.5, lry+0.5);
-				cairo_stroke (cr);
-			}
-		}
-
-		if (simplerect->outline_what & 0x2) {
-			/* right edge, if visible */
-			if (x_in_range (simplerect->bbox_lrx)) {
-				cairo_move_to (cr, lrx+0.5, uly+0.5);
-				cairo_line_to (cr, lrx+0.5, lry+0.5);
-				cairo_stroke (cr);
-			}
-		}
-
-		if (simplerect->outline_what & 0x4) {
-			/* top edge */
-			if (y_in_range (simplerect->bbox_uly)) {
-				cairo_move_to (cr, ulx+0.5, uly+0.5);
-				cairo_line_to (cr, lrx+0.5, uly+0.5);
-				cairo_stroke (cr);
-			}
-		}
-
-		if (simplerect->outline_what & 0x8) {
-			/* bottom edge */
-			if (y_in_range (simplerect->bbox_lry)) {
-				cairo_move_to (cr, ulx+0.5, lry+0.5);
-				cairo_line_to (cr, lrx+0.5, lry+0.5);
-				cairo_stroke (cr);
-			}
-		}
-	}
-
-	cairo_destroy (cr);
-}
-
-static double
-gnome_canvas_simplerect_point (GnomeCanvasItem *item, double x, double y, int cx, int cy, GnomeCanvasItem **actual_item)
-{
-	(void) cx;
-	(void) cy;
-
-	double x1, y1, x2, y2;
-	double dx, dy;
-
-	*actual_item = item;
-
-	/* Find the bounds for the rectangle plus its outline width */
-
-	gnome_canvas_simplerect_bounds (item, &x1, &y1, &x2, &y2);
-
-	/* Is point inside rectangle */
-
-	if ((x >= x1) && (y >= y1) && (x <= x2) && (y <= y2)) {
-		return 0.0;
-	}
-
-	/* Point is outside rectangle */
-
-	if (x < x1)
-		dx = x1 - x;
-	else if (x > x2)
-		dx = x - x2;
-	else
-		dx = 0.0;
-
-	if (y < y1)
-		dy = y1 - y;
-	else if (y > y2)
-		dy = y - y2;
-	else
-		dy = 0.0;
-
-	return sqrt (dx * dx + dy * dy);
-}
diff --git a/gtk2_ardour/canvas-waveview.c b/gtk2_ardour/canvas-waveview.c
deleted file mode 100644
index f5fc9e827f..0000000000
--- a/gtk2_ardour/canvas-waveview.c
+++ /dev/null
@@ -1,2486 +0,0 @@
-/*
-     Copyright (C) 2000-2002 Paul Davis
-
-     This program is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-     the Free Software Foundation; either version 2 of the License, or
-     (at your option) any later version.
-
-     This program is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-     GNU General Public License for more details.
-
-     You should have received a copy of the GNU General Public License
-     along with this program; if not, write to the Free Software
-     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-     $Id$
-*/
-
-#include <stdio.h>
-#include <math.h>
-#include <libgnomecanvas/libgnomecanvas.h>
-#include <cairo.h>
-#include <string.h>
-#include <limits.h>
-#include <unistd.h>
-
-#include "ardour/dB.h"
-
-#include "logmeter.h"
-#include "canvas-waveview.h"
-#include "rgb_macros.h"
-
-/* POSIX guarantees casting between void* and function pointers, ISO C doesn't
- * We can work around warnings by going one step deeper in our casts
- */
-#if defined(_POSIX_VERSION) || defined(COMPILER_MINGW)
-#define POSIX_FUNC_PTR_CAST(type, object) *((type*) &(object))
-#endif // _POSIX_VERSION
-
-extern void c_stacktrace(void);
-
-enum {
-	 PROP_0,
-	 PROP_DATA_SRC,
-	 PROP_CHANNEL,
-	 PROP_LENGTH_FUNCTION,
-	 PROP_SOURCEFILE_LENGTH_FUNCTION,
-	 PROP_PEAK_FUNCTION,
-	 PROP_GAIN_FUNCTION,
-	 PROP_GAIN_SRC,
-	 PROP_CACHE,
-	 PROP_CACHE_UPDATER,
-	 PROP_SAMPLES_PER_UNIT,
-	 PROP_AMPLITUDE_ABOVE_AXIS,
-	 PROP_X,
-	 PROP_Y,
-	 PROP_HEIGHT,
-	 PROP_WAVE_COLOR,
-	 PROP_CLIP_COLOR,
-	 PROP_ZERO_COLOR,
-	 PROP_FILL_COLOR,
-	 PROP_FILLED,
-	 PROP_RECTIFIED,
-	 PROP_ZERO_LINE,
-	 PROP_REGION_START,
-	 PROP_LOGSCALED,
-};
-
-static void gnome_canvas_waveview_class_init     (GnomeCanvasWaveViewClass *class);
-
-static void gnome_canvas_waveview_init           (GnomeCanvasWaveView      *waveview);
-
-static void gnome_canvas_waveview_destroy        (GtkObject            *object);
-
-static void gnome_canvas_waveview_set_property   (GObject        *object,
-						   guint           prop_id,
-						   const GValue   *value,
-						   GParamSpec     *pspec);
-static void gnome_canvas_waveview_get_property   (GObject        *object,
-						   guint           prop_id,
-						   GValue         *value,
-						   GParamSpec     *pspec);
-
-static void   gnome_canvas_waveview_update       (GnomeCanvasItem *item,
-						   double          *affine,
-						   ArtSVP          *clip_path,
-						   int              flags);
-
-static void   gnome_canvas_waveview_bounds       (GnomeCanvasItem *item,
-						   double          *x1,
-						   double          *y1,
-						   double          *x2,
-						   double          *y2);
-
-static double gnome_canvas_waveview_point        (GnomeCanvasItem  *item,
-						   double            x,
-						   double            y,
-						   int               cx,
-						   int               cy,
-						   GnomeCanvasItem **actual_item);
-
-static void gnome_canvas_waveview_render         (GnomeCanvasItem *item,
-						   GnomeCanvasBuf  *buf);
-
-static void gnome_canvas_waveview_draw           (GnomeCanvasItem *item,
-						   GdkDrawable     *drawable,
-						   int              x,
-						   int              y,
-						   int              w,
-						   int              h);
-
-static void gnome_canvas_waveview_set_data_src   (GnomeCanvasWaveView *,
-						   void *);
-
-static void gnome_canvas_waveview_set_channel    (GnomeCanvasWaveView *,
-						   guint32);
-
-static guint32 gnome_canvas_waveview_ensure_cache (GnomeCanvasWaveView *waveview,
-						   gulong               start_sample,
-						   gulong               end_sample);
-
-
-static int _gradient_rendering = 0;
-
-static GnomeCanvasItemClass *parent_class;
-
-GType
-gnome_canvas_waveview_get_type (void)
-{
-	static GType waveview_type;
-
-	if (!waveview_type) {
-		static const GTypeInfo object_info = {
-			sizeof (GnomeCanvasWaveViewClass),
-			(GBaseInitFunc) NULL,
-			(GBaseFinalizeFunc) NULL,
-			(GClassInitFunc) gnome_canvas_waveview_class_init,
-			(GClassFinalizeFunc) NULL,
-			NULL,			/* class_data */
-			sizeof (GnomeCanvasWaveView),
-			0,			/* n_preallocs */
-			(GInstanceInitFunc) gnome_canvas_waveview_init,
-			NULL			/* value_table */
-		};
-
-		waveview_type = g_type_register_static (GNOME_TYPE_CANVAS_ITEM, "GnomeCanvasWaveView",
-							&object_info, 0);
-	}
-
-	return waveview_type;
- }
-
-static void
-gnome_canvas_waveview_class_init (GnomeCanvasWaveViewClass *class)
-{
-	GObjectClass *gobject_class;
-	GtkObjectClass *object_class;
-	GnomeCanvasItemClass *item_class;
-
-	gobject_class = (GObjectClass *) class;
-	object_class = (GtkObjectClass *) class;
-	item_class = (GnomeCanvasItemClass *) class;
-
-	parent_class = g_type_class_peek_parent (class);
-
-	gobject_class->set_property = gnome_canvas_waveview_set_property;
-	gobject_class->get_property = gnome_canvas_waveview_get_property;
-
-	g_object_class_install_property
-		(gobject_class,
-		 PROP_DATA_SRC,
-		 g_param_spec_pointer ("data_src", NULL, NULL,
-					(G_PARAM_READABLE | G_PARAM_WRITABLE)));
-
-	g_object_class_install_property
-		(gobject_class,
-		 PROP_CHANNEL,
-		 g_param_spec_uint ("channel", NULL, NULL,
-				    0, G_MAXUINT, 0,
-				    (G_PARAM_READABLE | G_PARAM_WRITABLE)));
-
-	g_object_class_install_property
-		(gobject_class,
-		 PROP_LENGTH_FUNCTION,
-		 g_param_spec_pointer ("length_function", NULL, NULL,
-					(G_PARAM_READABLE | G_PARAM_WRITABLE)));
-
-	g_object_class_install_property
-                (gobject_class,
-                 PROP_SOURCEFILE_LENGTH_FUNCTION,
-                 g_param_spec_pointer ("sourcefile_length_function", NULL, NULL,
-				      (G_PARAM_READABLE | G_PARAM_WRITABLE)));
-
-	g_object_class_install_property
-		(gobject_class,
-		 PROP_PEAK_FUNCTION,
-		 g_param_spec_pointer ("peak_function", NULL, NULL,
-					(G_PARAM_READABLE | G_PARAM_WRITABLE)));
-
-	g_object_class_install_property
-		(gobject_class,
-		 PROP_GAIN_FUNCTION,
-		 g_param_spec_pointer ("gain_function", NULL, NULL,
-					(G_PARAM_READABLE | G_PARAM_WRITABLE)));
-
-	g_object_class_install_property
-		(gobject_class,
-                 PROP_GAIN_SRC,
-                 g_param_spec_pointer ("gain_src", NULL, NULL,
-				      (G_PARAM_READABLE | G_PARAM_WRITABLE)));
-
-	g_object_class_install_property
-		(gobject_class,
-		 PROP_CACHE,
-		 g_param_spec_pointer ("cache", NULL, NULL,
-					(G_PARAM_READABLE | G_PARAM_WRITABLE)));
-
-	g_object_class_install_property
-		(gobject_class,
-		 PROP_CACHE_UPDATER,
-                 g_param_spec_boolean ("cache_updater", NULL, NULL,
-				      FALSE,
-				      (G_PARAM_READABLE | G_PARAM_WRITABLE)));
-
-	g_object_class_install_property
-		(gobject_class,
-		 PROP_SAMPLES_PER_UNIT,
-		 g_param_spec_double ("samples_per_unit", NULL, NULL,
-				      0.0, G_MAXDOUBLE, 0.0,
-				      (G_PARAM_READABLE | G_PARAM_WRITABLE)));
-
-	g_object_class_install_property
-		(gobject_class,
-		 PROP_AMPLITUDE_ABOVE_AXIS,
-		 g_param_spec_double ("amplitude_above_axis", NULL, NULL,
-				      0.0, G_MAXDOUBLE, 0.0,
-				      (G_PARAM_READABLE | G_PARAM_WRITABLE)));
-
-	g_object_class_install_property
-		(gobject_class,
-		 PROP_X,
-		 g_param_spec_double ("x", NULL, NULL,
-				      0.0, G_MAXDOUBLE, 0.0,
-				      (G_PARAM_READABLE | G_PARAM_WRITABLE)));
-
-	g_object_class_install_property
-		(gobject_class,
-		 PROP_Y,
-		 g_param_spec_double ("y", NULL, NULL,
-				      0.0, G_MAXDOUBLE, 0.0,
-				      (G_PARAM_READABLE | G_PARAM_WRITABLE)));
-
-	g_object_class_install_property
-		(gobject_class,
-		 PROP_HEIGHT,
-		 g_param_spec_double ("height", NULL, NULL,
-				      0.0, G_MAXDOUBLE, 0.0,
-				      (G_PARAM_READABLE | G_PARAM_WRITABLE)));
-
-	g_object_class_install_property
-		(gobject_class,
-		 PROP_WAVE_COLOR,
-		 g_param_spec_uint ("wave_color", NULL, NULL,
-				    0, G_MAXUINT, 0,
-				    (G_PARAM_READABLE | G_PARAM_WRITABLE)));
-
-	g_object_class_install_property
-		(gobject_class,
-		 PROP_CLIP_COLOR,
-		 g_param_spec_uint ("clip_color", NULL, NULL,
-				    0, G_MAXUINT, 0,
-				    (G_PARAM_READABLE | G_PARAM_WRITABLE)));
-
-	g_object_class_install_property
-		(gobject_class,
-		 PROP_ZERO_COLOR,
-		 g_param_spec_uint ("zero_color", NULL, NULL,
-				    0, G_MAXUINT, 0,
-				    (G_PARAM_READABLE | G_PARAM_WRITABLE)));
-
-	g_object_class_install_property
-		(gobject_class,
-		 PROP_FILL_COLOR,
-		 g_param_spec_uint ("fill_color", NULL, NULL,
-				    0, G_MAXUINT, 0,
-				    (G_PARAM_READABLE | G_PARAM_WRITABLE)));
-
-	g_object_class_install_property
-		(gobject_class,
-		 PROP_FILLED,
-		 g_param_spec_boolean ("filled", NULL, NULL,
-					FALSE,
-					(G_PARAM_READABLE | G_PARAM_WRITABLE)));
-
-	g_object_class_install_property
-		(gobject_class,
-		 PROP_RECTIFIED,
-		 g_param_spec_boolean ("rectified", NULL, NULL,
-					FALSE,
-					(G_PARAM_READABLE | G_PARAM_WRITABLE)));
-
-	g_object_class_install_property
-		(gobject_class,
-		 PROP_ZERO_LINE,
-		 g_param_spec_boolean ("zero_line", NULL, NULL,
-					FALSE,
-					(G_PARAM_READABLE | G_PARAM_WRITABLE)));
-
-	g_object_class_install_property
-		(gobject_class,
-		 PROP_LOGSCALED,
-		 g_param_spec_boolean ("logscaled", NULL, NULL,
-					FALSE,
-					(G_PARAM_READABLE | G_PARAM_WRITABLE)));
-
-	g_object_class_install_property
-		(gobject_class,
-		 PROP_REGION_START,
-		 g_param_spec_uint ("region_start", NULL, NULL,
-				    0, G_MAXUINT, 0,
-				    (G_PARAM_READABLE | G_PARAM_WRITABLE)));
-
-	object_class->destroy = gnome_canvas_waveview_destroy;
-
-	item_class->update = gnome_canvas_waveview_update;
-	item_class->bounds = gnome_canvas_waveview_bounds;
-	item_class->point = gnome_canvas_waveview_point;
-	item_class->render = gnome_canvas_waveview_render;
-	item_class->draw = gnome_canvas_waveview_draw;
-}
-
-void
-gnome_canvas_waveview_set_gradient_waveforms (int yn)
-{
-	_gradient_rendering = yn;
-}
-
-GnomeCanvasWaveViewCache*
-gnome_canvas_waveview_cache_new (void)
-{
-	GnomeCanvasWaveViewCache *c;
-
-	c = g_malloc (sizeof (GnomeCanvasWaveViewCache));
-
-	c->allocated = 2048;
-	c->data = g_malloc (sizeof (GnomeCanvasWaveViewCacheEntry) * c->allocated);
-	c->data_size = 0;
-	c->start = 0;
-	c->end = 0;
-
-	return c;
-}
-
-void
-gnome_canvas_waveview_cache_destroy (GnomeCanvasWaveViewCache* cache)
-{
-	g_free (cache->data);
-	g_free (cache);
-}
-
-static void
-gnome_canvas_waveview_init (GnomeCanvasWaveView *waveview)
-{
-	waveview->x = 0.0;
-	waveview->y = 0.0;
-	waveview->cache = 0;
-	waveview->cache_updater = FALSE;
-	waveview->data_src = NULL;
-	waveview->channel = 0;
-	waveview->peak_function = NULL;
-	waveview->length_function = NULL;
-	waveview->sourcefile_length_function = NULL;
-	waveview->gain_curve_function = NULL;
-	waveview->gain_src = NULL;
-	waveview->rectified = FALSE;
-	waveview->logscaled = FALSE;
-	waveview->filled = TRUE;
-	waveview->zero_line = FALSE;
-	waveview->region_start = 0;
-	waveview->samples_per_unit = 1.0;
-	waveview->amplitude_above_axis = 1.0;
-	waveview->height = 100.0;
-	waveview->screen_width = gdk_screen_width ();
-	waveview->reload_cache_in_render = FALSE;
-
- 	waveview->wave_color = 0;
- 	waveview->clip_color = 0;
- 	waveview->zero_color = 0;
- 	waveview->fill_color = 0;
-}
-
-static void
-gnome_canvas_waveview_destroy (GtkObject *object)
-{
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (GNOME_IS_CANVAS_WAVEVIEW (object));
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-#define DEBUG_CACHE 0
-#undef CACHE_MEMMOVE_OPTIMIZATION
-
-/** @return cache index of start_sample within the cache */
-static guint32
-gnome_canvas_waveview_ensure_cache (GnomeCanvasWaveView *waveview, gulong start_sample, gulong end_sample)
-{
-	gulong required_cache_entries;
-	gulong rf1, rf2,rf3, required_frames;
-	gulong new_cache_start, new_cache_end;
-	gulong half_width;
-	gulong npeaks;
-	gulong offset;
-	gulong ostart;
-	gulong copied;
-	GnomeCanvasWaveViewCache *cache;
-	float* gain;
-#ifdef CACHE_MEMMOVE_OPTIMIZATION
-	gulong present_frames;
-	gulong present_entries;
-#endif
-
-	cache = waveview->cache;
-
-	start_sample = start_sample + waveview->region_start;
-	end_sample = end_sample + waveview->region_start;
-#if DEBUG_CACHE
-	// printf("waveview->region_start == %lu\n",waveview->region_start);
-	// c_stacktrace ();
-	printf ("\n\n=> 0x%x cache @ 0x%x range: %lu - %lu request: %lu - %lu (%lu frames)\n",
-		waveview, cache,
-		cache->start, cache->end,
-		start_sample, end_sample, end_sample - start_sample);
-#endif
-
-	if (cache->start <= start_sample && cache->end >= end_sample) {
-#if DEBUG_CACHE
-		// printf ("0x%x: cache hit for %lu-%lu (cache holds: %lu-%lu\n",
-		// waveview, start_sample, end_sample, cache->start, cache->end);
-#endif
-		goto out;
-	}
-
-	/* make sure the cache is at least twice as wide as the screen width, and put the start sample
-	   in the middle, ensuring that we cover the end_sample.
-	*/
-
-	/* Note the assumption that we have a 1:1 units:pixel ratio for the canvas. Its everywhere ... */
-
-	half_width = (gulong) floor ((waveview->screen_width * waveview->samples_per_unit)/2.0 + 0.5);
-
-	if (start_sample < half_width) {
-		new_cache_start = 0;
-	} else {
-		new_cache_start = start_sample - half_width;
-	}
-
-	/* figure out how many frames we want */
-
-	rf1 = end_sample - start_sample + 1;
-	rf2 = (gulong) floor ((waveview->screen_width * waveview->samples_per_unit * 2.0f));
-	required_frames = MAX(rf1,rf2);
-
-	/* but make sure it doesn't extend beyond the end of the source material */
-
-	rf3 = (gulong) (waveview->sourcefile_length_function (waveview->data_src, waveview->samples_per_unit)) + 1;
-	if (rf3 < new_cache_start) {
-		rf3 = 0;
-	} else {
-		rf3 -= new_cache_start;
-	}
-
-#if DEBUG_CACHE
-	fprintf (stderr, "AVAILABLE FRAMES = %lu of %lu, start = %lu, sstart = %lu, cstart = %lu\n",
-		 rf3, waveview->sourcefile_length_function (waveview->data_src, waveview->samples_per_unit),
-		 waveview->region_start, start_sample, new_cache_start);
-#endif
-
-	required_frames = MIN(required_frames,rf3);
-
-	new_cache_end = new_cache_start + required_frames - 1;
-
-	required_cache_entries = (gulong) floor (required_frames / waveview->samples_per_unit );
-
-#if DEBUG_CACHE
-	fprintf (stderr, "new cache = %lu - %lu\n", new_cache_start, new_cache_end);
-	fprintf(stderr,"required_cach_entries = %lu, samples_per_unit = %f req frames = %lu\n",
-		required_cache_entries,waveview->samples_per_unit, required_frames);
-#endif
-
-	if (required_cache_entries > cache->allocated) {
-		cache->data = g_realloc (cache->data, sizeof (GnomeCanvasWaveViewCacheEntry) * required_cache_entries);
-		cache->allocated = required_cache_entries;
-		// cache->start = 0;
-		// cache->end = 0;
-	}
-
-	ostart = new_cache_start;
-
-#ifdef CACHE_MEMMOVE_OPTIMIZATION
-
-	/* data is not entirely in the cache, so go fetch it, making sure to fill the cache */
-
-	/* some of the required cache entries are in the cache, but in the wrong
-	   locations. use memmove to fix this.
-	*/
-
-	if (cache->start < new_cache_start && new_cache_start < cache->end) {
-
-		/* case one: the common area is at the end of the existing cache. move it
-		   to the beginning of the cache, and set up to refill whatever remains.
-
-
-			   wv->cache_start                                        wv->cache_end
-			   |-------------------------------------------------------| cache
-			                                       |--------------------------------| requested
-			                                       <------------------->
-			                                             "present"
-			                                    new_cache_start                      new_cache_end
-		*/
-
-
-		present_frames = cache->end - new_cache_start;
-		present_entries = (gulong) floor (present_frames / waveview->samples_per_unit);
-
-#if DEBUG_CACHE
-		fprintf (stderr, "existing material at end of current cache, move to start of new cache\n"
-			 "\tcopy from %lu to start\n", cache->data_size - present_entries);
-#endif
-
-		memmove (&cache->data[0],
-			 &cache->data[cache->data_size - present_entries],
-			 present_entries * sizeof (GnomeCanvasWaveViewCacheEntry));
-
-#if DEBUG_CACHE
-		fprintf (stderr, "satisfied %lu of %lu frames, offset = %lu, will start at %lu (ptr = 0x%x)\n",
-			 present_frames, required_frames, present_entries, new_cache_start + present_entries,
-			 cache->data + present_entries);
-#endif
-
-		copied = present_entries;
-		offset = present_entries;
-		new_cache_start += present_frames;
-		required_frames -= present_frames;
-
-	} else if (new_cache_end > cache->start && new_cache_end < cache->end) {
-
-		/* case two: the common area lives at the beginning of the existing cache.
-
-                                            wv->cache_start                                      wv->cache_end
-			                     |-----------------------------------------------------|
-                              |--------------------------------|
-                                             <----------------->
-					        "present"
-
-                             new_cache_start                      new_cache_end
-		*/
-
-		present_frames = new_cache_end - cache->start;
-		present_entries = (gulong) floor (present_frames / waveview->samples_per_unit);
-
-		memmove (&cache->data[cache->data_size - present_entries],
-			 &cache->data[0],
-			 present_entries * sizeof (GnomeCanvasWaveViewCacheEntry));
-
-#if DEBUG_CACHE
-		fprintf (stderr, "existing material at start of current cache, move to start of end cache\n");
-#endif
-
-#if DEBUG_CACHE
-		fprintf (stderr, "satisfied %lu of %lu frames, offset = %lu, will start at %lu (ptr = 0x%x)\n",
-			 present_entries, required_frames, present_entries, new_cache_start + present_entries,
-			 cache->data + present_entries);
-#endif
-
-		copied = present_entries;
-		offset = 0;
-		required_frames -= present_frames;
-
-
-	} else {
-		copied = 0;
-		offset = 0;
-
-	}
-
-#else
-	copied = 0;
-	offset = 0;
-
-#endif /* CACHE_MEMMOVE_OPTIMIZATION */
-
-//	fprintf(stderr,"length == %lu\n",waveview->length_function (waveview->data_src));
-//	required_frames = MIN (waveview->length_function (waveview->data_src) - new_cache_start, required_frames);
-
-	npeaks = (gulong) floor (required_frames / waveview->samples_per_unit);
-	required_frames = npeaks * waveview->samples_per_unit;
-
-#if DEBUG_CACHE
-
-
-	printf ("requesting %lu/%f to cover %lu-%lu at %f spu (request was %lu-%lu) into cache + %lu\n",
-		required_frames, required_frames/waveview->samples_per_unit, new_cache_start, new_cache_end,
-		waveview->samples_per_unit, start_sample, end_sample, offset);
-#endif
-
-#if DEBUG_CACHE
-//	printf ("cache holds %lu entries, requesting %lu to cover %lu-%lu (request was %lu-%lu)\n",
-//		cache->data_size, npeaks, new_cache_start, new_cache_end,
-//		start_sample, end_sample);
-#endif
-
-	if (required_frames) {
-		waveview->peak_function (waveview->data_src, npeaks, new_cache_start, required_frames, cache->data + offset, waveview->channel,waveview->samples_per_unit);
-
-		/* take into account any copied peaks */
-
-		npeaks += copied;
-	} else {
-		npeaks = copied;
-	}
-
-	if (npeaks < cache->allocated) {
-#if DEBUG_CACHE
-		fprintf (stderr, "zero fill cache for %lu at %lu\n", cache->allocated - npeaks, npeaks);
-#endif
-		memset (&cache->data[npeaks], 0, sizeof (GnomeCanvasWaveViewCacheEntry) * (cache->allocated - npeaks));
-		cache->data_size = npeaks;
-	} else {
-		cache->data_size = cache->allocated;
-	}
-
-	if (waveview->gain_curve_function) {
-		guint32 n;
-
-		gain = (float*) malloc (sizeof (float) * cache->data_size);
-
-		waveview->gain_curve_function (waveview->gain_src, new_cache_start, new_cache_end, gain, cache->data_size);
-
-		for (n = 0; n < cache->data_size; ++n) {
-			cache->data[n].min *= gain[n];
-			cache->data[n].max *= gain[n];
-		}
-
-		free (gain);
-
-	}
-
-	/* do optional log scaling.  this implementation is not particularly efficient */
-
-	if (waveview->logscaled) {
-		guint32 n;
-		GnomeCanvasWaveViewCacheEntry* buf = cache->data;
-
-		for (n = 0; n < cache->data_size; ++n) {
-
-			if (buf[n].max > 0.0f) {
-				buf[n].max = alt_log_meter(fast_coefficient_to_dB(buf[n].max));
-			} else if (buf[n].max < 0.0f) {
-				buf[n].max = -alt_log_meter(fast_coefficient_to_dB(-buf[n].max));
-			}
-
-			if (buf[n].min > 0.0f) {
-				buf[n].min = alt_log_meter(fast_coefficient_to_dB(buf[n].min));
-			} else if (buf[n].min < 0.0f) {
-				buf[n].min = -alt_log_meter(fast_coefficient_to_dB(-buf[n].min));
-			}
-		}
-	}
-
-	cache->start = ostart;
-	cache->end = new_cache_end;
-
-  out:
-#if DEBUG_CACHE
-	fprintf (stderr, "return cache index = %d\n",
-		 (guint32) floor ((((double) (start_sample - cache->start)) / waveview->samples_per_unit) + 0.5));
-#endif
-	return (guint32) floor ((((double) (start_sample - cache->start)) / waveview->samples_per_unit) + 0.5);
-
-}
-
-void
-gnome_canvas_waveview_set_data_src (GnomeCanvasWaveView *waveview, void *data_src)
-{
-
-	if (waveview->cache_updater) {
-		if (waveview->data_src == data_src) {
-			waveview->reload_cache_in_render = TRUE;
-			return;
-		}
-
-		waveview->cache->start  = 0;
-		waveview->cache->end = 0;
-	}
-
-	waveview->data_src = data_src;
-}
-
-void
-gnome_canvas_waveview_set_channel (GnomeCanvasWaveView *waveview, guint32 chan)
-{
-	if (waveview->channel == chan) {
-		return;
-	}
-
-	waveview->channel = chan;
-}
-
-static void
-gnome_canvas_waveview_reset_bounds (GnomeCanvasItem *item)
-
-{
-	double x1, x2, y1, y2;
-	ArtPoint i1, i2;
-	ArtPoint w1, w2;
-	int Ix1, Ix2, Iy1, Iy2;
-	double i2w[6];
-
-	gnome_canvas_waveview_bounds (item, &x1, &y1, &x2, &y2);
-
-	i1.x = x1;
-	i1.y = y1;
-	i2.x = x2;
-	i2.y = y2;
-
-	gnome_canvas_item_i2w_affine (item, i2w);
-	art_affine_point (&w1, &i1, i2w);
-	art_affine_point (&w2, &i2, i2w);
-
-	Ix1 = (int) rint(w1.x);
-	Ix2 = (int) rint(w2.x);
-	Iy1 = (int) rint(w1.y);
-	Iy2 = (int) rint(w2.y);
-
-	gnome_canvas_update_bbox (item, Ix1, Iy1, Ix2, Iy2);
-}
-
-/*
- * CANVAS CALLBACKS
- */
-
-static void
-gnome_canvas_waveview_set_property (GObject      *object,
-				    guint         prop_id,
-				    const GValue *value,
-				    GParamSpec   *pspec)
-
-{
-	(void) pspec;
-
-	GnomeCanvasItem *item;
-	GnomeCanvasWaveView *waveview;
-	int redraw = FALSE;
-	int calc_bounds = FALSE;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (GNOME_IS_CANVAS_WAVEVIEW (object));
-
-	item = GNOME_CANVAS_ITEM (object);
-	waveview = GNOME_CANVAS_WAVEVIEW (object);
-
-	void * ptr;
-	switch (prop_id) {
-	case PROP_DATA_SRC:
-		gnome_canvas_waveview_set_data_src (waveview, g_value_get_pointer(value));
-		redraw = TRUE;
-		break;
-
-	case PROP_CHANNEL:
-		gnome_canvas_waveview_set_channel (waveview, g_value_get_uint(value));
-		redraw = TRUE;
-		break;
-
-	case PROP_LENGTH_FUNCTION:
-		ptr = g_value_get_pointer(value);
-		waveview->length_function = POSIX_FUNC_PTR_CAST(waveview_length_function_t, ptr);
-		redraw = TRUE;
-		break;
-
-	case PROP_SOURCEFILE_LENGTH_FUNCTION:
-		ptr = g_value_get_pointer(value);
-		waveview->sourcefile_length_function = POSIX_FUNC_PTR_CAST(waveview_sourcefile_length_function_t, ptr);
-		redraw = TRUE;
-		break;
-
-	case PROP_PEAK_FUNCTION:
-		ptr = g_value_get_pointer(value);
-		waveview->peak_function = POSIX_FUNC_PTR_CAST(waveview_peak_function_t, ptr);
-		redraw = TRUE;
-		break;
-
-	case PROP_GAIN_FUNCTION:
-		ptr = g_value_get_pointer(value);
-		waveview->gain_curve_function = POSIX_FUNC_PTR_CAST(waveview_gain_curve_function_t, ptr);
-			 redraw = TRUE;
-		break;
-
-	case PROP_GAIN_SRC:
-		waveview->gain_src = g_value_get_pointer(value);
-		if (waveview->cache_updater) {
-			waveview->cache->start = 0;
-			waveview->cache->end = 0;
-		}
-		redraw = TRUE;
-		calc_bounds = TRUE;
-		break;
-
-	case PROP_CACHE:
-		waveview->cache = g_value_get_pointer(value);
-		redraw = TRUE;
-		break;
-
-
-	case PROP_CACHE_UPDATER:
-		waveview->cache_updater = g_value_get_boolean(value);
-		redraw = TRUE;
-		break;
-
-	case PROP_SAMPLES_PER_UNIT:
-		if ((waveview->samples_per_unit = g_value_get_double(value)) < 1.0) {
-			waveview->samples_per_unit = 1.0;
-		}
-		if (waveview->cache_updater) {
-			waveview->cache->start = 0;
-			waveview->cache->end = 0;
-		}
-		redraw = TRUE;
-		calc_bounds = TRUE;
-		break;
-
-	case PROP_AMPLITUDE_ABOVE_AXIS:
-		waveview->amplitude_above_axis = g_value_get_double(value);
-		redraw = TRUE;
-		break;
-
-	case PROP_X:
-		if (waveview->x != g_value_get_double (value)) {
-			waveview->x = g_value_get_double (value);
-			calc_bounds = TRUE;
-		}
-		break;
-
-	case PROP_Y:
-		if (waveview->y != g_value_get_double (value)) {
-			waveview->y = g_value_get_double (value);
-			calc_bounds = TRUE;
-		}
-		break;
-
-	case PROP_HEIGHT:
-		if (waveview->height != fabs (g_value_get_double (value))) {
-			waveview->height = fabs (g_value_get_double (value));
-			redraw = TRUE;
-		}
-		break;
-
-	case PROP_WAVE_COLOR:
-		if (waveview->wave_color != g_value_get_uint(value)) {
-			waveview->wave_color = g_value_get_uint(value);
-			redraw = TRUE;
-		}
-		break;
-
-	case PROP_CLIP_COLOR:
-		if (waveview->clip_color != g_value_get_uint(value)) {
-			waveview->clip_color = g_value_get_uint(value);
-			redraw = TRUE;
-		}
-		break;
-
-	case PROP_ZERO_COLOR:
-		if (waveview->zero_color != g_value_get_uint(value)) {
-			waveview->zero_color = g_value_get_uint(value);
-			redraw = TRUE;
-		}
-		break;
-
-	case PROP_FILL_COLOR:
-		if (waveview->fill_color != g_value_get_uint(value)) {
-			waveview->fill_color = g_value_get_uint(value);
-			redraw = TRUE;
-		}
-		break;
-
-	case PROP_FILLED:
-		if (waveview->filled != g_value_get_boolean(value)) {
-			waveview->filled = g_value_get_boolean(value);
-			redraw = TRUE;
-		}
-		break;
-
-	case PROP_RECTIFIED:
-		if (waveview->rectified != g_value_get_boolean(value)) {
-			waveview->rectified = g_value_get_boolean(value);
-			redraw = TRUE;
-		}
-		break;
-
-	case PROP_ZERO_LINE:
-		if (waveview->zero_line != g_value_get_boolean(value)) {
-			waveview->zero_line = g_value_get_boolean(value);
-			redraw = TRUE;
-		}
-		break;
-
-	case PROP_LOGSCALED:
-		if (waveview->logscaled != g_value_get_boolean(value)) {
-			waveview->logscaled = g_value_get_boolean(value);
-			if (waveview->cache_updater) {
-				waveview->cache->start = 0;
-				waveview->cache->end = 0;
-			}
-			redraw = TRUE;
-			calc_bounds = TRUE;
-		}
-		break;
-	case PROP_REGION_START:
-		waveview->region_start = g_value_get_uint(value);
-		redraw = TRUE;
-		calc_bounds = TRUE;
-		break;
-
-
-	default:
-		break;
-	}
-
-	if (calc_bounds) {
-		gnome_canvas_waveview_reset_bounds (item);
-	}
-
-	if (redraw) {
-		gnome_canvas_item_request_update (item);
-	}
-
-}
-
-static void
-gnome_canvas_waveview_get_property (
-		GObject      *object,
-		guint         prop_id,
-		GValue       *value,
-		GParamSpec   *pspec)
-{
-
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (GNOME_IS_CANVAS_WAVEVIEW (object));
-
-	GnomeCanvasWaveView *waveview = GNOME_CANVAS_WAVEVIEW (object);
-
-	switch (prop_id) {
-	case PROP_DATA_SRC:
-		g_value_set_pointer(value, waveview->data_src);
-		break;
-
-	case PROP_CHANNEL:
-		g_value_set_uint(value, waveview->channel);
-		break;
-
-	case PROP_LENGTH_FUNCTION:
-		g_value_set_pointer(value, POSIX_FUNC_PTR_CAST(void*, waveview->length_function));
-		break;
-
-	case PROP_SOURCEFILE_LENGTH_FUNCTION:
-		g_value_set_pointer(value, POSIX_FUNC_PTR_CAST(void*, waveview->sourcefile_length_function));
-		break;
-
-	case PROP_PEAK_FUNCTION:
-		g_value_set_pointer(value, POSIX_FUNC_PTR_CAST(void*, waveview->peak_function));
-		break;
-
-	case PROP_GAIN_FUNCTION:
-		g_value_set_pointer(value, POSIX_FUNC_PTR_CAST(void*, waveview->gain_curve_function));
-		break;
-
-	case PROP_GAIN_SRC:
-		g_value_set_pointer(value, waveview->gain_src);
-		break;
-
-	case PROP_CACHE:
-		g_value_set_pointer(value, waveview->cache);
-		break;
-
-	case PROP_CACHE_UPDATER:
-		g_value_set_boolean(value, waveview->cache_updater);
-		break;
-
-	case PROP_SAMPLES_PER_UNIT:
-		g_value_set_double(value, waveview->samples_per_unit);
-		break;
-
-	case PROP_AMPLITUDE_ABOVE_AXIS:
-		g_value_set_double(value, waveview->amplitude_above_axis);
-		break;
-
-	case PROP_X:
-		g_value_set_double (value, waveview->x);
-		break;
-
-	case PROP_Y:
-		g_value_set_double (value, waveview->y);
-		break;
-
-	case PROP_HEIGHT:
-		g_value_set_double (value, waveview->height);
-		break;
-
-	case PROP_WAVE_COLOR:
-		g_value_set_uint (value, waveview->wave_color);
-		break;
-
-	case PROP_CLIP_COLOR:
-		g_value_set_uint (value, waveview->clip_color);
-		break;
-
-	case PROP_ZERO_COLOR:
-		g_value_set_uint (value, waveview->zero_color);
-		break;
-
-	case PROP_FILL_COLOR:
-		g_value_set_uint (value, waveview->fill_color);
-		break;
-
-	case PROP_FILLED:
-		g_value_set_boolean (value, waveview->filled);
-		break;
-
-	case PROP_RECTIFIED:
-		g_value_set_boolean (value, waveview->rectified);
-		break;
-
-	case PROP_ZERO_LINE:
-		g_value_set_boolean (value, waveview->zero_line);
-		break;
-
-	case PROP_LOGSCALED:
-		g_value_set_boolean (value, waveview->logscaled);
-		break;
-
-	case PROP_REGION_START:
-		g_value_set_uint (value, waveview->region_start);
-		break;
-
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-gnome_canvas_waveview_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, int flags)
-{
-	GnomeCanvasWaveView *waveview;
-	double x, y;
-
-	waveview = GNOME_CANVAS_WAVEVIEW (item);
-
-//	check_cache (waveview, "start of update");
-
-	if (parent_class->update)
-		(* parent_class->update) (item, affine, clip_path, flags);
-
-	gnome_canvas_waveview_reset_bounds (item);
-
-	/* get the canvas coordinates of the view. Do NOT use affines
-	   for this, because they do not round to the integer units used
-	   by the canvas, resulting in subtle pixel-level errors later.
-	*/
-
-	x = waveview->x;
-	y = waveview->y;
-
-	gnome_canvas_item_i2w (item, &x, &y);
-	gnome_canvas_w2c (GNOME_CANVAS(item->canvas), x, y, &waveview->bbox_ulx, &waveview->bbox_uly);
-
-	waveview->samples = waveview->length_function (waveview->data_src);
-
-	x = waveview->x + (waveview->samples / waveview->samples_per_unit);
-	y = waveview->y + waveview->height;
-
-	gnome_canvas_item_i2w (item, &x, &y);
-	gnome_canvas_w2c (GNOME_CANVAS(item->canvas), x, y, &waveview->bbox_lrx, &waveview->bbox_lry);
-
-	/* cache the half-height and the end point in canvas units */
-
-	waveview->half_height = waveview->height / 2.0;
-
-	/* parse the color */
-
-	UINT_TO_RGBA (waveview->wave_color, &waveview->wave_r, &waveview->wave_g, &waveview->wave_b,
-		      &waveview->wave_a);
-	UINT_TO_RGBA (waveview->clip_color, &waveview->clip_r, &waveview->clip_g, &waveview->clip_b,
-		      &waveview->clip_a);
-	UINT_TO_RGBA (waveview->fill_color, &waveview->fill_r, &waveview->fill_g, &waveview->fill_b,
-		      &waveview->fill_a);
-
-//	check_cache (waveview, "end of update");
-}
-
-static void
-gnome_canvas_waveview_gradient_render (GnomeCanvasItem *item,
-				       GnomeCanvasBuf *buf)
-{
-	GnomeCanvasWaveView *waveview;
-	gulong s1, s2;
-	int clip_length = 0;
-	int pymin, pymax;
-	guint cache_index;
-	double half_height;
-	int x;
-	char rectify;
-
-	waveview = GNOME_CANVAS_WAVEVIEW (item);
-
-//	check_cache (waveview, "start of render");
-
-	if (parent_class->render) {
-		(*parent_class->render) (item, buf);
-	}
-
-	if (buf->is_bg) {
-		gnome_canvas_buf_ensure_buf (buf);
-		buf->is_bg = FALSE;
-	}
-
-	/* a "unit" means a pixel */
-
-	/* begin: render start x (units) */
-	int const begin = MAX (waveview->bbox_ulx, buf->rect.x0);
-
-	/* zbegin: start x for zero line (units) */
-	int const zbegin = (begin == waveview->bbox_ulx) ? (begin + 1) : begin;
-
-	/* end: render end x (units) */
-	int const end = (waveview->bbox_lrx >= 0) ? MIN (waveview->bbox_lrx,buf->rect.x1) : buf->rect.x1;
-
-	/* zend: end x for zero-line (units) */
-	int const zend = (end == waveview->bbox_lrx) ? (end - 1) : end;
-
-	if (begin == end) {
-		return;
-	}
-
-	/* s1: start sample
-	   s2: end sample
-	*/
-
-	s1 = floor ((begin - waveview->bbox_ulx) * waveview->samples_per_unit);
-
-	// fprintf (stderr, "0x%x begins at sample %f\n", waveview, waveview->bbox_ulx * waveview->samples_per_unit);
-
-	if (end == waveview->bbox_lrx) {
-		/* This avoids minor rounding errors when we have the
-		   entire region visible.
-		*/
-		s2 = waveview->samples;
-	} else {
-		s2 = s1 + floor ((end - begin) * waveview->samples_per_unit);
-	}
-
-#if 0
-	printf ("0x%x r (%d..%d)(%d..%d) bbox (%d..%d)(%d..%d)"
-		" b/e %d..%d s= %lu..%lu @ %f\n",
-		waveview,
-		buf->rect.x0,
-		buf->rect.x1,
-		buf->rect.y0,
-		buf->rect.y1,
-		waveview->bbox_ulx,
-		waveview->bbox_lrx,
-		waveview->bbox_uly,
-		waveview->bbox_lry,
-		begin, end, s1, s2,
-		waveview->samples_per_unit);
-#endif
-
-	/* now ensure that the cache is full and properly
-	   positioned.
-	*/
-
-//	check_cache (waveview, "pre-ensure");
-
-	if (waveview->cache_updater && waveview->reload_cache_in_render) {
-		waveview->cache->start = 0;
-		waveview->cache->end = 0;
-		waveview->reload_cache_in_render = FALSE;
-	}
-
-//	check_cache (waveview, "post-ensure");
-
-	/* don't rectify at single-sample zoom */
-	if (waveview->rectified && waveview->samples_per_unit > 1) {
-		rectify = TRUE;
-	}
-	else {
-		rectify = FALSE;
-	}
-
-	clip_length = MIN(5,(waveview->height/4));
-
-	/*
-	   Now draw each line, clipping it appropriately. The clipping
-	   is done by the macros PAINT_FOO().
-	*/
-
-	half_height = waveview->half_height;
-
-/* this makes it slightly easier to comprehend whats going on */
-#define origin half_height
-
-	if (waveview->filled && !rectify) {
-		int prev_pymin = 1;
-		int prev_pymax = 0;
-		int last_pymin = 1;
-		int last_pymax = 0;
-		int next_pymin, next_pymax;
-		double max, min;
-		int next_clip_max = 0;
-		int next_clip_min = 0;
-
-		int wave_middle = (int) rint ((item->y1 + origin) * item->canvas->pixels_per_unit);
-		int wave_top = (int) rint ((item->y1) * item->canvas->pixels_per_unit);
-
-		if (s1 < waveview->samples_per_unit) {
-			/* we haven't got a prev vars to compare with, so outline the whole line here */
-			prev_pymax = (int) rint ((item->y1 + origin) * item->canvas->pixels_per_unit);
-			prev_pymin = prev_pymax;
-		}
-		else {
-			s1 -= waveview->samples_per_unit;
-		}
-
-		if(end == waveview->bbox_lrx) {
-			/* we don't have the NEXT vars for the last sample */
-			last_pymax = (int) rint ((item->y1 + origin) * item->canvas->pixels_per_unit);
-			last_pymin = last_pymax;
-		}
-		else {
-			s2 += waveview->samples_per_unit;
-		}
-
-		cache_index = gnome_canvas_waveview_ensure_cache (waveview, s1, s2);
-
-		/*
-		 * Compute the variables outside the rendering rect
-		 */
-		if(prev_pymax != prev_pymin) {
-
-			prev_pymax = (int) rint ((item->y1 + origin - MIN(waveview->cache->data[cache_index].max, 1.0) * half_height) * item->canvas->pixels_per_unit);
-			prev_pymin = (int) rint ((item->y1 + origin - MAX(waveview->cache->data[cache_index].min, -1.0) * half_height) * item->canvas->pixels_per_unit);
-			++cache_index;
-		}
-		if(last_pymax != last_pymin) {
-			/* take the index of one sample right of what we render */
-			guint index = cache_index + (end - begin);
-
-			if (index >= waveview->cache->data_size) {
-
-				/* the data we want is off the end of the cache, which must mean its beyond
-				   the end of the region's source; hence the peak values are 0 */
-				last_pymax = (int) rint ((item->y1 + origin) * item->canvas->pixels_per_unit);
-				last_pymin = (int) rint ((item->y1 + origin) * item->canvas->pixels_per_unit);
-
-			} else {
-
-				last_pymax = (int) rint ((item->y1 + origin - MIN(waveview->cache->data[index].max, 1.0) * half_height) * item->canvas->pixels_per_unit);
-				last_pymin = (int) rint ((item->y1 + origin - MAX(waveview->cache->data[index].min, -1.0) * half_height) * item->canvas->pixels_per_unit);
-
-			}
-
-		}
-
-		/*
-		 * initialize NEXT* variables for the first run, duplicated in the loop for speed
-		 */
-		max = waveview->cache->data[cache_index].max;
-		min = waveview->cache->data[cache_index].min;
-
-		if (max >= 1.0) {
-			max = 1.0;
-			next_clip_max = 1;
-		}
-
-		if (min <= -1.0) {
-			min = -1.0;
-			next_clip_min = 1;
-		}
-
-		max *= half_height;
-		min *= half_height;
-
-		next_pymax = (int) rint ((item->y1 + origin - max) * item->canvas->pixels_per_unit);
-		next_pymin = (int) rint ((item->y1 + origin - min) * item->canvas->pixels_per_unit);
-
-		/*
-		 * And now the loop
-		 */
-		for(x = begin; x < end; ++x) {
-			int clip_max = next_clip_max;
-			int clip_min = next_clip_min;
-			int fill_max, fill_min;
-
-			pymax = next_pymax;
-			pymin = next_pymin;
-
-			/* compute next */
-			if(x == end - 1) {
-				/*next is now the last column, which is outside the rendering rect, and possibly outside the region*/
-				next_pymax = last_pymax;
-				next_pymin = last_pymin;
-			}
-			else {
-				++cache_index;
-
-				if (cache_index < waveview->cache->data_size) {
-					max = waveview->cache->data[cache_index].max;
-					min = waveview->cache->data[cache_index].min;
-				} else {
-					max = min = 0;
-				}
-
-				next_clip_max = 0;
-				next_clip_min = 0;
-
-				if (max >= 1.0) {
-					max = 1.0;
-					next_clip_max = 1;
-				}
-
-				if (min <= -1.0) {
-					min = -1.0;
-					next_clip_min = 1;
-				}
-
-				max *= half_height;
-				min *= half_height;
-
-				next_pymax = (int) rint ((item->y1 + origin - max) * item->canvas->pixels_per_unit);
-				next_pymin = (int) rint ((item->y1 + origin - min) * item->canvas->pixels_per_unit);
-			}
-
-			/* render */
-			if (pymax == pymin) {
-				PAINT_DOTA(buf, waveview->wave_r, waveview->wave_g, waveview->wave_b, waveview->wave_a, x, pymin);
-			} else {
-				if((prev_pymax < pymax && next_pymax < pymax) ||
-				   (prev_pymax == pymax && next_pymax == pymax)) {
-					fill_max = pymax + 1;
-					PAINT_DOTA(buf, waveview->wave_r, waveview->wave_g, waveview->wave_b, waveview->wave_a, x, pymax);
-				}
-				else {
-					fill_max = MAX(prev_pymax, next_pymax);
-					if(pymax == fill_max) {
-						PAINT_DOTA(buf, waveview->wave_r, waveview->wave_g, waveview->wave_b, waveview->wave_a, x, pymax);
-						++fill_max;
-					} else {
-						PAINT_VERTA_GR(buf, waveview->wave_r, waveview->wave_g, waveview->wave_b, waveview->wave_a, x, pymax, fill_max, wave_middle, wave_top);
-					}
-
-				}
-
-				if((prev_pymin > pymin && next_pymin > pymin) ||
-				   (prev_pymin == pymin && next_pymin == pymin)) {
-					fill_min = pymin - 1;
-					PAINT_DOTA(buf, waveview->wave_r, waveview->wave_g, waveview->wave_b, waveview->wave_a, x, pymin-1);
-				}
-				else {
-					fill_min = MIN(prev_pymin, next_pymin);
-					if(pymin == fill_min) {
-						PAINT_DOTA(buf, waveview->wave_r, waveview->wave_g, waveview->wave_b, waveview->wave_a, x, pymin);
-					}
-					else {
-						PAINT_VERTA_GR(buf, waveview->wave_r, waveview->wave_g, waveview->wave_b, waveview->wave_a, x, fill_min, pymin, wave_middle, wave_top);
-					}
-				}
-
-				if(fill_max < fill_min) {
-					PAINT_VERTA_GR(buf, waveview->fill_r, waveview->fill_g, waveview->fill_b, waveview->fill_a, x, fill_max, fill_min, wave_middle, wave_top);
-				}
-				else if(fill_max == fill_min) {
-					PAINT_DOTA(buf, waveview->fill_r, waveview->fill_g, waveview->fill_b, waveview->fill_a, x, fill_max);
-				}
-			}
-
-			if (clip_max) {
-				PAINT_VERTA(buf, waveview->clip_r, waveview->clip_g, waveview->clip_b, waveview->clip_a, x, pymax, pymax + clip_length);
-				PAINT_VERTA(buf, waveview->clip_r, waveview->clip_g, waveview->clip_b, waveview->clip_a >> 1, x + 1, pymax, pymax + (clip_length -1));
-				PAINT_VERTA(buf, waveview->clip_r, waveview->clip_g, waveview->clip_b, waveview->clip_a >> 1, x - 1, pymax, pymax + (clip_length - 1));
-
-			}
-
-			if (clip_min) {
-				PAINT_VERTA(buf, waveview->clip_r, waveview->clip_g, waveview->clip_b, waveview->clip_a , x, pymin - clip_length, pymin);
-				PAINT_VERTA(buf, waveview->clip_r, waveview->clip_g, waveview->clip_b, waveview->clip_a >> 1, x + 1, pymin - (clip_length - 1), pymin);
-				PAINT_VERTA(buf, waveview->clip_r, waveview->clip_g, waveview->clip_b, waveview->clip_a >> 1, x - 1, pymin - (clip_length - 1), pymin);
-			}
-
-			prev_pymax = pymax;
-			prev_pymin = pymin;
-		}
-
-	} else if (waveview->filled && rectify) {
-
-		int prev_pymax = -1;
-		int last_pymax = -1;
-		int next_pymax;
-		double max, min;
-		int next_clip_max = 0;
-		int next_clip_min = 0;
-
-		int wave_middle = (int) rint ((item->y1 + waveview->height) * item->canvas->pixels_per_unit);
-		int wave_top = (int) rint ((item->y1) * item->canvas->pixels_per_unit);
-
-		// for rectified, this stays constant throughout the loop
-		pymin = (int) rint ((item->y1 + waveview->height) * item->canvas->pixels_per_unit);
-
-		if(s1 < waveview->samples_per_unit) {
-			/* we haven't got a prev vars to compare with, so outline the whole line here */
-			prev_pymax = pymin;
-		}
-		else {
-			s1 -= waveview->samples_per_unit;
-		}
-
-		if(end == waveview->bbox_lrx) {
-			/* we don't have the NEXT vars for the last sample */
-			last_pymax = pymin;
-		}
-		else {
-			s2 += waveview->samples_per_unit;
-		}
-
-		cache_index = gnome_canvas_waveview_ensure_cache (waveview, s1, s2);
-
-		/*
-		 * Compute the variables outside the rendering rect
-		 */
-		if(prev_pymax < 0) {
-			max = MIN(waveview->cache->data[cache_index].max, 1.0);
-			min = MAX(waveview->cache->data[cache_index].min, -1.0);
-
-			if (fabs (min) > fabs (max)) {
-				max = fabs (min);
-			}
-
-			prev_pymax = (int) rint ((item->y1 + waveview->height - max * waveview->height) * item->canvas->pixels_per_unit);
-			++cache_index;
-		}
-		if(last_pymax < 0) {
-			/* take the index of one sample right of what we render */
-			int index = cache_index + (end - begin);
-
-			max = MIN(waveview->cache->data[index].max, 1.0);
-			min = MAX(waveview->cache->data[index].min, -1.0);
-
-			if (fabs (min) > fabs (max)) {
-				max = fabs (min);
-			}
-
-			last_pymax = (int) rint ((item->y1 + waveview->height - max * waveview->height) * item->canvas->pixels_per_unit);
-		}
-
-		/*
-		 * initialize NEXT* variables for the first run, duplicated in the loop for speed
-		 */
-		max = waveview->cache->data[cache_index].max;
-		min = waveview->cache->data[cache_index].min;
-
-		if (max >= 1.0) {
-			max = 1.0;
-			next_clip_max = 1;
-		}
-
-		if (min <= -1.0) {
-			min = -1.0;
-			next_clip_min = 1;
-		}
-
-		if (fabs (min) > fabs (max)) {
-			max = fabs (min);
-		}
-
-		next_pymax = (int) rint ((item->y1 + waveview->height - max * waveview->height) * item->canvas->pixels_per_unit);
-
-		/*
-		 * And now the loop
-		 */
-		for(x = begin; x < end; ++x) {
-			int clip_max = next_clip_max;
-			int clip_min = next_clip_min;
-			int fill_max;
-
-			pymax = next_pymax;
-
-			/* compute next */
-			if(x == end - 1) {
-				/*next is now the last column, which is outside the rendering rect, and possibly outside the region*/
-				next_pymax = last_pymax;
-			}
-			else {
-				++cache_index;
-
-				max = waveview->cache->data[cache_index].max;
-				min = waveview->cache->data[cache_index].min;
-
-				if (max >= 1.0) {
-					max = 1.0;
-					next_clip_max = 1;
-				}
-
-				if (min <= -1.0) {
-					min = -1.0;
-					next_clip_min = 1;
-				}
-
-				if (fabs (min) > fabs (max)) {
-					max = fabs (min);
-				}
-
-				next_pymax = (int) rint ((item->y1 + waveview->height - max * waveview->height) * item->canvas->pixels_per_unit);
-			}
-
-			/* render */
-			if (pymax == pymin) {
-				PAINT_DOTA(buf, waveview->wave_r, waveview->wave_g, waveview->wave_b, waveview->wave_a, x, pymin);
-			} else {
-				if((prev_pymax < pymax && next_pymax < pymax) ||
-				   (prev_pymax == pymax && next_pymax == pymax)) {
-					fill_max = pymax + 1;
-					PAINT_DOTA(buf, waveview->wave_r, waveview->wave_g, waveview->wave_b, waveview->wave_a, x, pymax);
-				}
-				else {
-					fill_max = MAX(prev_pymax, next_pymax);
-					if(pymax == fill_max) {
-						PAINT_DOTA(buf, waveview->wave_r, waveview->wave_g, waveview->wave_b, waveview->wave_a, x, pymax);
-						++fill_max;
-					}
-					else {
-						PAINT_VERTA_GR(buf, waveview->wave_r, waveview->wave_g, waveview->wave_b, waveview->wave_a, x, pymax, fill_max, wave_middle, wave_top);
-					}
-				}
-
-				if(fill_max < pymin) {
-					PAINT_VERTA(buf, waveview->fill_r, waveview->fill_g, waveview->fill_b, waveview->fill_a, x, fill_max, pymin);
-				}
-				else if(fill_max == pymin) {
-					PAINT_DOTA(buf, waveview->fill_r, waveview->fill_g, waveview->fill_b, waveview->fill_a, x, pymin);
-				}
-			}
-
-			if (clip_max) {
-				PAINT_VERTA(buf, waveview->clip_r, waveview->clip_g, waveview->clip_b, waveview->clip_a, x, pymax, pymax + clip_length);
-				PAINT_VERTA(buf, waveview->clip_r, waveview->clip_g, waveview->clip_b, waveview->clip_a >> 1, x + 1, pymax, pymax + (clip_length -1));
-				PAINT_VERTA(buf, waveview->clip_r, waveview->clip_g, waveview->clip_b, waveview->clip_a >> 1, x - 1, pymax, pymax + (clip_length - 1));
-			}
-
-			if (clip_min) {
-				PAINT_VERTA(buf, waveview->clip_r, waveview->clip_g, waveview->clip_b, waveview->clip_a , x, pymin - clip_length, pymin);
-				PAINT_VERTA(buf, waveview->clip_r, waveview->clip_g, waveview->clip_b, waveview->clip_a >> 1, x + 1, pymin - (clip_length - 1), pymin);
-				PAINT_VERTA(buf, waveview->clip_r, waveview->clip_g, waveview->clip_b, waveview->clip_a >> 1, x - 1, pymin - (clip_length - 1), pymin);
-			}
-
-			prev_pymax = pymax;
-		}
-	}
-	else {
-		cache_index = gnome_canvas_waveview_ensure_cache (waveview, s1, s2);
-
-		for (x = begin; x < end; x++) {
-
-			double max, min;
-			int clip_max, clip_min;
-
-			clip_max = 0;
-			clip_min = 0;
-
-			max = waveview->cache->data[cache_index].max;
-			min = waveview->cache->data[cache_index].min;
-
-			if (max >= 1.0) {
-				max = 1.0;
-				clip_max = 1;
-			}
-
-			if (min <= -1.0) {
-				min = -1.0;
-				clip_min = 1;
-			}
-
-			if (rectify) {
-
-				if (fabs (min) > fabs (max)) {
-					max = fabs (min);
-				}
-
-				max = max * waveview->height;
-
-				pymax = (int) rint ((item->y1 + waveview->height - max) * item->canvas->pixels_per_unit);
-				pymin = (int) rint ((item->y1 + waveview->height) * item->canvas->pixels_per_unit);
-
-			} else {
-
-				max = max * half_height;
-				min = min * half_height;
-
-				pymax = (int) rint ((item->y1 + origin - max) * item->canvas->pixels_per_unit);
-				pymin = (int) rint ((item->y1 + origin - min) * item->canvas->pixels_per_unit);
-			}
-
-			/* OK, now fill the RGB buffer at x=i with a line between pymin and pymax,
-			   or, if samples_per_unit == 1, then a dot at each location.
-			*/
-
-			if (pymax == pymin) {
-				PAINT_DOTA(buf, waveview->wave_r, waveview->wave_g, waveview->wave_b, waveview->wave_a, x, pymin);
-			} else {
-				PAINT_VERTA(buf, waveview->wave_r, waveview->wave_g, waveview->wave_b, waveview->wave_a, x, pymax, pymin);
-			}
-
-			/* show clipped waveforms with small red lines */
-
-			if (clip_max) {
-				PAINT_VERTA(buf, waveview->clip_r, waveview->clip_g, waveview->clip_b, waveview->clip_a, x, pymax, pymax+clip_length);
-			}
-
-			if (clip_min) {
-				PAINT_VERTA(buf, waveview->clip_r, waveview->clip_g, waveview->clip_b, waveview->clip_a, x, pymin-clip_length, pymin);
-			}
-
-			/* presto, we're done */
-
-			cache_index++;
-		}
-	}
-
-	if (!waveview->rectified && waveview->zero_line && waveview->height >= 100) {
-		// Paint zeroline.
-
-		unsigned char zero_r, zero_g, zero_b, zero_a;
-		UINT_TO_RGBA( waveview->zero_color, &zero_r, &zero_g, &zero_b, &zero_a);
-		int zeroline_y = (int) rint ((item->y1 + origin) * item->canvas->pixels_per_unit);
-		PAINT_HORIZA(buf, zero_r, zero_g, zero_b, zero_a, zbegin, zend, zeroline_y);
-	}
-#undef origin
-
-}
-
-static void
-gnome_canvas_waveview_flat_render (GnomeCanvasItem *item,
-				   GnomeCanvasBuf *buf)
-{
-	GnomeCanvasWaveView *waveview;
-	gulong s1, s2;
-	int clip_length = 0;
-	int pymin, pymax;
-	guint cache_index;
-	double half_height;
-	int x;
-	char rectify;
-
-	waveview = GNOME_CANVAS_WAVEVIEW (item);
-
-//	check_cache (waveview, "start of render");
-
-	if (parent_class->render) {
-		(*parent_class->render) (item, buf);
-	}
-
-	if (buf->is_bg) {
-		gnome_canvas_buf_ensure_buf (buf);
-		buf->is_bg = FALSE;
-	}
-
-	/* a "unit" means a pixel */
-
-	/* begin: render start x (units) */
-	int const begin = MAX (waveview->bbox_ulx, buf->rect.x0);
-
-	/* zbegin: start x for zero line (units) */
-	int const zbegin = (begin == waveview->bbox_ulx) ? (begin + 1) : begin;
-
-	/* end: render end x (units) */
-	int const end = (waveview->bbox_lrx >= 0) ? MIN (waveview->bbox_lrx,buf->rect.x1) : buf->rect.x1;
-
-	/* zend: end x for zero-line (units) */
-	int const zend = (end == waveview->bbox_lrx) ? (end - 1) : end;
-
-	if (begin == end) {
-		return;
-	}
-
-	/* s1: start sample
-	   s2: end sample
-	*/
-
-	s1 = floor ((begin - waveview->bbox_ulx) * waveview->samples_per_unit);
-
-	// fprintf (stderr, "0x%x begins at sample %f\n", waveview, waveview->bbox_ulx * waveview->samples_per_unit);
-
-	if (end == waveview->bbox_lrx) {
-		/* This avoids minor rounding errors when we have the
-		   entire region visible.
-		*/
-		s2 = waveview->samples;
-	} else {
-		s2 = s1 + floor ((end - begin) * waveview->samples_per_unit);
-	}
-
-#if 0
-	printf ("0x%x r (%d..%d)(%d..%d) bbox (%d..%d)(%d..%d)"
-		" b/e %d..%d s= %lu..%lu @ %f\n",
-		waveview,
-		buf->rect.x0,
-		buf->rect.x1,
-		buf->rect.y0,
-		buf->rect.y1,
-		waveview->bbox_ulx,
-		waveview->bbox_lrx,
-		waveview->bbox_uly,
-		waveview->bbox_lry,
-		begin, end, s1, s2,
-		waveview->samples_per_unit);
-#endif
-
-	/* now ensure that the cache is full and properly
-	   positioned.
-	*/
-
-//	check_cache (waveview, "pre-ensure");
-
-	if (waveview->cache_updater && waveview->reload_cache_in_render) {
-		waveview->cache->start = 0;
-		waveview->cache->end = 0;
-		waveview->reload_cache_in_render = FALSE;
-	}
-
-//	check_cache (waveview, "post-ensure");
-
-	/* don't rectify at single-sample zoom */
-	if (waveview->rectified && waveview->samples_per_unit > 1) {
-		rectify = TRUE;
-	}
-	else {
-		rectify = FALSE;
-	}
-
-	clip_length = MIN(5,(waveview->height/4));
-
-	/*
-	   Now draw each line, clipping it appropriately. The clipping
-	   is done by the macros PAINT_FOO().
-	*/
-
-	half_height = waveview->half_height;
-
-/* this makes it slightly easier to comprehend whats going on */
-#define origin half_height
-
-	if (waveview->filled && !rectify) {
-		int prev_pymin = 1;
-		int prev_pymax = 0;
-		int last_pymin = 1;
-		int last_pymax = 0;
-		int next_pymin, next_pymax;
-		double max, min;
-		int next_clip_max = 0;
-		int next_clip_min = 0;
-
-		if (s1 < waveview->samples_per_unit) {
-			/* we haven't got a prev vars to compare with, so outline the whole line here */
-			prev_pymax = (int) rint ((item->y1 + origin) * item->canvas->pixels_per_unit);
-			prev_pymin = prev_pymax;
-		}
-		else {
-			s1 -= waveview->samples_per_unit;
-		}
-
-		if(end == waveview->bbox_lrx) {
-			/* we don't have the NEXT vars for the last sample */
-			last_pymax = (int) rint ((item->y1 + origin) * item->canvas->pixels_per_unit);
-			last_pymin = last_pymax;
-		}
-		else {
-			s2 += waveview->samples_per_unit;
-		}
-
-		cache_index = gnome_canvas_waveview_ensure_cache (waveview, s1, s2);
-
-		/*
-		 * Compute the variables outside the rendering rect
-		 */
-		if(prev_pymax != prev_pymin) {
-
-			prev_pymax = (int) rint ((item->y1 + origin - MIN(waveview->cache->data[cache_index].max, 1.0) * half_height) * item->canvas->pixels_per_unit);
-			prev_pymin = (int) rint ((item->y1 + origin - MAX(waveview->cache->data[cache_index].min, -1.0) * half_height) * item->canvas->pixels_per_unit);
-			++cache_index;
-		}
-		if(last_pymax != last_pymin) {
-			/* take the index of one sample right of what we render */
-			guint index = cache_index + (end - begin);
-
-			if (index >= waveview->cache->data_size) {
-
-				/* the data we want is off the end of the cache, which must mean its beyond
-				   the end of the region's source; hence the peak values are 0 */
-				last_pymax = (int) rint ((item->y1 + origin) * item->canvas->pixels_per_unit);
-				last_pymin = (int) rint ((item->y1 + origin) * item->canvas->pixels_per_unit);
-
-			} else {
-
-				last_pymax = (int) rint ((item->y1 + origin - MIN(waveview->cache->data[index].max, 1.0) * half_height) * item->canvas->pixels_per_unit);
-				last_pymin = (int) rint ((item->y1 + origin - MAX(waveview->cache->data[index].min, -1.0) * half_height) * item->canvas->pixels_per_unit);
-
-			}
-
-		}
-
-		/*
-		 * initialize NEXT* variables for the first run, duplicated in the loop for speed
-		 */
-		max = waveview->cache->data[cache_index].max;
-		min = waveview->cache->data[cache_index].min;
-
-		if (max >= 1.0) {
-			max = 1.0;
-			next_clip_max = 1;
-		}
-
-		if (min <= -1.0) {
-			min = -1.0;
-			next_clip_min = 1;
-		}
-
-		max *= half_height;
-		min *= half_height;
-
-		next_pymax = (int) rint ((item->y1 + origin - max) * item->canvas->pixels_per_unit);
-		next_pymin = (int) rint ((item->y1 + origin - min) * item->canvas->pixels_per_unit);
-
-		/*
-		 * And now the loop
-		 */
-		for(x = begin; x < end; ++x) {
-			int clip_max = next_clip_max;
-			int clip_min = next_clip_min;
-			int fill_max, fill_min;
-
-			pymax = next_pymax;
-			pymin = next_pymin;
-
-			/* compute next */
-			if(x == end - 1) {
-				/*next is now the last column, which is outside the rendering rect, and possibly outside the region*/
-				next_pymax = last_pymax;
-				next_pymin = last_pymin;
-			}
-			else {
-				++cache_index;
-
-				if (cache_index < waveview->cache->data_size) {
-					max = waveview->cache->data[cache_index].max;
-					min = waveview->cache->data[cache_index].min;
-				} else {
-					max = min = 0;
-				}
-
-				next_clip_max = 0;
-				next_clip_min = 0;
-
-				if (max >= 1.0) {
-					max = 1.0;
-					next_clip_max = 1;
-				}
-
-				if (min <= -1.0) {
-					min = -1.0;
-					next_clip_min = 1;
-				}
-
-				max *= half_height;
-				min *= half_height;
-
-				next_pymax = (int) rint ((item->y1 + origin - max) * item->canvas->pixels_per_unit);
-				next_pymin = (int) rint ((item->y1 + origin - min) * item->canvas->pixels_per_unit);
-			}
-
-			/* render */
-			if (pymax == pymin) {
-				PAINT_DOTA(buf, waveview->wave_r, waveview->wave_g, waveview->wave_b, waveview->wave_a, x, pymin);
-			} else {
-				if((prev_pymax < pymax && next_pymax < pymax) ||
-				   (prev_pymax == pymax && next_pymax == pymax)) {
-					fill_max = pymax + 1;
-					PAINT_DOTA(buf, waveview->wave_r, waveview->wave_g, waveview->wave_b, waveview->wave_a, x, pymax);
-				}
-				else {
-					fill_max = MAX(prev_pymax, next_pymax);
-					if(pymax == fill_max) {
-						PAINT_DOTA(buf, waveview->wave_r, waveview->wave_g, waveview->wave_b, waveview->wave_a, x, pymax);
-						++fill_max;
-					}
-					else {
-						PAINT_VERTA(buf, waveview->wave_r, waveview->wave_g, waveview->wave_b, waveview->wave_a, x, pymax, fill_max);
-					}
-				}
-
-				if((prev_pymin > pymin && next_pymin > pymin) ||
-				   (prev_pymin == pymin && next_pymin == pymin)) {
-					fill_min = pymin - 1;
-					PAINT_DOTA(buf, waveview->wave_r, waveview->wave_g, waveview->wave_b, waveview->wave_a, x, pymin-1);
-				}
-				else {
-					fill_min = MIN(prev_pymin, next_pymin);
-					if(pymin == fill_min) {
-						PAINT_DOTA(buf, waveview->wave_r, waveview->wave_g, waveview->wave_b, waveview->wave_a, x, pymin);
-					}
-					else {
-						PAINT_VERTA(buf, waveview->wave_r, waveview->wave_g, waveview->wave_b, waveview->wave_a, x, fill_min, pymin);
-					}
-				}
-
-				if(fill_max < fill_min) {
-					PAINT_VERTA(buf, waveview->fill_r, waveview->fill_g, waveview->fill_b, waveview->fill_a, x, fill_max, fill_min);
-				}
-				else if(fill_max == fill_min) {
-					PAINT_DOTA(buf, waveview->fill_r, waveview->fill_g, waveview->fill_b, waveview->fill_a, x, fill_max);
-				}
-			}
-
-			if (clip_max) {
-				PAINT_VERTA(buf, waveview->clip_r, waveview->clip_g, waveview->clip_b, waveview->clip_a, x, pymax, pymax+clip_length);
-			}
-
-			if (clip_min) {
-				PAINT_VERTA(buf, waveview->clip_r, waveview->clip_g, waveview->clip_b, waveview->clip_a, x, pymin-clip_length, pymin);
-			}
-
-			prev_pymax = pymax;
-			prev_pymin = pymin;
-		}
-
-	} else if (waveview->filled && rectify) {
-
-		int prev_pymax = -1;
-		int last_pymax = -1;
-		int next_pymax;
-		double max, min;
-		int next_clip_max = 0;
-		int next_clip_min = 0;
-
-		// for rectified, this stays constant throughout the loop
-		pymin = (int) rint ((item->y1 + waveview->height) * item->canvas->pixels_per_unit);
-
-		if(s1 < waveview->samples_per_unit) {
-			/* we haven't got a prev vars to compare with, so outline the whole line here */
-			prev_pymax = pymin;
-		}
-		else {
-			s1 -= waveview->samples_per_unit;
-		}
-
-		if(end == waveview->bbox_lrx) {
-			/* we don't have the NEXT vars for the last sample */
-			last_pymax = pymin;
-		}
-		else {
-			s2 += waveview->samples_per_unit;
-		}
-
-		cache_index = gnome_canvas_waveview_ensure_cache (waveview, s1, s2);
-
-		/*
-		 * Compute the variables outside the rendering rect
-		 */
-		if(prev_pymax < 0) {
-			max = MIN(waveview->cache->data[cache_index].max, 1.0);
-			min = MAX(waveview->cache->data[cache_index].min, -1.0);
-
-			if (fabs (min) > fabs (max)) {
-				max = fabs (min);
-			}
-
-			prev_pymax = (int) rint ((item->y1 + waveview->height - max * waveview->height) * item->canvas->pixels_per_unit);
-			++cache_index;
-		}
-		if(last_pymax < 0) {
-			/* take the index of one sample right of what we render */
-			int index = cache_index + (end - begin);
-
-			max = MIN(waveview->cache->data[index].max, 1.0);
-			min = MAX(waveview->cache->data[index].min, -1.0);
-
-			if (fabs (min) > fabs (max)) {
-				max = fabs (min);
-			}
-
-			last_pymax = (int) rint ((item->y1 + waveview->height - max * waveview->height) * item->canvas->pixels_per_unit);
-		}
-
-		/*
-		 * initialize NEXT* variables for the first run, duplicated in the loop for speed
-		 */
-		max = waveview->cache->data[cache_index].max;
-		min = waveview->cache->data[cache_index].min;
-
-		if (max >= 1.0) {
-			max = 1.0;
-			next_clip_max = 1;
-		}
-
-		if (min <= -1.0) {
-			min = -1.0;
-			next_clip_min = 1;
-		}
-
-		if (fabs (min) > fabs (max)) {
-			max = fabs (min);
-		}
-
-		next_pymax = (int) rint ((item->y1 + waveview->height - max * waveview->height) * item->canvas->pixels_per_unit);
-
-		/*
-		 * And now the loop
-		 */
-		for(x = begin; x < end; ++x) {
-			int clip_max = next_clip_max;
-			int clip_min = next_clip_min;
-			int fill_max;
-
-			pymax = next_pymax;
-
-			/* compute next */
-			if(x == end - 1) {
-				/*next is now the last column, which is outside the rendering rect, and possibly outside the region*/
-				next_pymax = last_pymax;
-			}
-			else {
-				++cache_index;
-
-				max = waveview->cache->data[cache_index].max;
-				min = waveview->cache->data[cache_index].min;
-
-				if (max >= 1.0) {
-					max = 1.0;
-					next_clip_max = 1;
-				}
-
-				if (min <= -1.0) {
-					min = -1.0;
-					next_clip_min = 1;
-				}
-
-				if (fabs (min) > fabs (max)) {
-					max = fabs (min);
-				}
-
-				next_pymax = (int) rint ((item->y1 + waveview->height - max * waveview->height) * item->canvas->pixels_per_unit);
-			}
-
-			/* render */
-			if (pymax == pymin) {
-				PAINT_DOTA(buf, waveview->wave_r, waveview->wave_g, waveview->wave_b, waveview->wave_a, x, pymin);
-			} else {
-				if((prev_pymax < pymax && next_pymax < pymax) ||
-				   (prev_pymax == pymax && next_pymax == pymax)) {
-					fill_max = pymax + 1;
-					PAINT_DOTA(buf, waveview->wave_r, waveview->wave_g, waveview->wave_b, waveview->wave_a, x, pymax);
-				}
-				else {
-					fill_max = MAX(prev_pymax, next_pymax);
-					if(pymax == fill_max) {
-						PAINT_DOTA(buf, waveview->wave_r, waveview->wave_g, waveview->wave_b, waveview->wave_a, x, pymax);
-						++fill_max;
-					}
-					else {
-						PAINT_VERTA(buf, waveview->wave_r, waveview->wave_g, waveview->wave_b, waveview->wave_a, x, pymax, fill_max);
-					}
-				}
-
-				if(fill_max < pymin) {
-					PAINT_VERTA(buf, waveview->fill_r, waveview->fill_g, waveview->fill_b, waveview->fill_a, x, fill_max, pymin);
-				}
-				else if(fill_max == pymin) {
-					PAINT_DOTA(buf, waveview->fill_r, waveview->fill_g, waveview->fill_b, waveview->fill_a, x, pymin);
-				}
-			}
-
-			if (clip_max) {
-				PAINT_VERTA(buf, waveview->clip_r, waveview->clip_g, waveview->clip_b, waveview->clip_a, x, pymax, pymax+clip_length);
-			}
-
-			if (clip_min) {
-				PAINT_VERTA(buf, waveview->clip_r, waveview->clip_g, waveview->clip_b, waveview->clip_a, x, pymin-clip_length, pymin);
-			}
-
-			prev_pymax = pymax;
-		}
-	}
-	else {
-		cache_index = gnome_canvas_waveview_ensure_cache (waveview, s1, s2);
-
-		for (x = begin; x < end; x++) {
-
-			double max, min;
-			int clip_max, clip_min;
-
-			clip_max = 0;
-			clip_min = 0;
-
-			max = waveview->cache->data[cache_index].max;
-			min = waveview->cache->data[cache_index].min;
-
-			if (max >= 1.0) {
-				max = 1.0;
-				clip_max = 1;
-			}
-
-			if (min <= -1.0) {
-				min = -1.0;
-				clip_min = 1;
-			}
-
-			if (rectify) {
-
-				if (fabs (min) > fabs (max)) {
-					max = fabs (min);
-				}
-
-				max = max * waveview->height;
-
-				pymax = (int) rint ((item->y1 + waveview->height - max) * item->canvas->pixels_per_unit);
-				pymin = (int) rint ((item->y1 + waveview->height) * item->canvas->pixels_per_unit);
-
-			} else {
-
-				max = max * half_height;
-				min = min * half_height;
-
-				pymax = (int) rint ((item->y1 + origin - max) * item->canvas->pixels_per_unit);
-				pymin = (int) rint ((item->y1 + origin - min) * item->canvas->pixels_per_unit);
-			}
-
-			/* OK, now fill the RGB buffer at x=i with a line between pymin and pymax,
-			   or, if samples_per_unit == 1, then a dot at each location.
-			*/
-
-			if (pymax == pymin) {
-				PAINT_DOTA(buf, waveview->wave_r, waveview->wave_g, waveview->wave_b, waveview->wave_a, x, pymin);
-			} else {
-				PAINT_VERTA(buf, waveview->wave_r, waveview->wave_g, waveview->wave_b, waveview->wave_a, x, pymax, pymin);
-			}
-
-			/* show clipped waveforms with small red lines */
-
-			if (clip_max) {
-				PAINT_VERTA(buf, waveview->clip_r, waveview->clip_g, waveview->clip_b, waveview->clip_a, x, pymax, pymax+clip_length);
-			}
-
-			if (clip_min) {
-				PAINT_VERTA(buf, waveview->clip_r, waveview->clip_g, waveview->clip_b, waveview->clip_a, x, pymin-clip_length, pymin);
-			}
-
-			/* presto, we're done */
-
-			cache_index++;
-		}
-	}
-
-	if (!waveview->rectified && waveview->zero_line && waveview->height >= 100) {
-		// Paint zeroline.
-
-		unsigned char zero_r, zero_g, zero_b, zero_a;
-		UINT_TO_RGBA( waveview->zero_color, &zero_r, &zero_g, &zero_b, &zero_a);
-		int zeroline_y = (int) rint ((item->y1 + origin) * item->canvas->pixels_per_unit);
-		PAINT_HORIZA(buf, zero_r, zero_g, zero_b, zero_a, zbegin, zend, zeroline_y);
-	}
-#undef origin
-}
-
-static void
-gnome_canvas_waveview_render (GnomeCanvasItem *item,
-			      GnomeCanvasBuf *buf)
-{
-	if (_gradient_rendering) {
-		gnome_canvas_waveview_gradient_render (item, buf);
-	} else {
-		gnome_canvas_waveview_flat_render (item, buf);
-	}
-}
-
-static void
-gnome_canvas_waveview_draw (GnomeCanvasItem *item,
-			    GdkDrawable *drawable,
-			    int x, int y,
-			    int width, int height)
-{
-	GnomeCanvasWaveView *waveview;
-	cairo_t* cr;
-	gulong s1, s2;
-	int cache_index;
-	gboolean rectify;
-	double origin;
-	double xoff;
-	double yoff = 0.0;
-	double ulx;
-	double uly;
-	double lrx;
-	double lry;
-
-	waveview = GNOME_CANVAS_WAVEVIEW (item);
-
-	/* compute intersection of Drawable area and waveview,
-	   in canvas coordinate space
-	*/
-
-	if (x > waveview->bbox_ulx) {
-		ulx = x;
-	} else {
-		ulx = waveview->bbox_ulx;
-	}
-
-	if (y > waveview->bbox_uly) {
-		uly = y;
-	} else {
-		uly = waveview->bbox_uly;
-	}
-
-	if (x + width > waveview->bbox_lrx) {
-		lrx = waveview->bbox_lrx;
-	} else {
-		lrx = x + width;
-	}
-
-	if (y + height > waveview->bbox_lry) {
-		lry = waveview->bbox_lry;
-	} else {
-		lry = y + height;
-	}
-
-	/* figure out which samples we need for the resulting intersection */
-
-	s1 = floor ((ulx - waveview->bbox_ulx) * waveview->samples_per_unit) ;
-
-	if (lrx == waveview->bbox_lrx) {
-		/* This avoids minor rounding errors when we have the
-		   entire region visible.
-		*/
-		s2 = waveview->samples;
-	} else {
-		s2 = s1 + floor ((lrx - ulx) * waveview->samples_per_unit);
-	}
-
-	/* translate back to buffer coordinate space */
-
-	ulx -= x;
-	uly -= y;
-	lrx -= x;
-	lry -= y;
-
-	/* don't rectify at single-sample zoom */
-	if(waveview->rectified && waveview->samples_per_unit > 1.0) {
-		rectify = TRUE;
-	} else {
-		rectify = FALSE;
-	}
-
-	cr = gdk_cairo_create (drawable);
-	cairo_set_line_width (cr, 0.5);
-
-	origin = waveview->bbox_uly - y + waveview->half_height;
-
-	cairo_rectangle (cr, ulx, uly, lrx - ulx, lry - uly);
-	cairo_clip (cr);
-
-	if (waveview->cache_updater && waveview->reload_cache_in_render) {
-		waveview->cache->start = 0;
-		waveview->cache->end = 0;
-		waveview->reload_cache_in_render = FALSE;
-	}
-
-	cache_index = gnome_canvas_waveview_ensure_cache (waveview, s1, s2);
-
-#if 0
-	printf ("%p r (%d,%d)(%d,%d)[%d x %d] bbox (%d,%d)(%d,%d)[%d x %d]"
-		" draw (%.1f,%.1f)(%.1f,%.1f)[%.1f x %.1f] s= %lu..%lu\n",
-		waveview,
-		x, y,
-		x + width,
-		y + height,
-		width,
-		height,
-		waveview->bbox_ulx,
-		waveview->bbox_uly,
-		waveview->bbox_lrx,
-		waveview->bbox_lry,
-		waveview->bbox_lrx - waveview->bbox_ulx,
-		waveview->bbox_lry - waveview->bbox_uly,
-		ulx, uly,
-		lrx, lry,
-		lrx - ulx,
-		lry - uly,
-		s1, s2);
-#endif
-
-	/* draw the top half */
-
-	for (xoff = ulx; xoff < lrx; xoff++) {
-		double max, min;
-
-		max = waveview->cache->data[cache_index].max;
-		min = waveview->cache->data[cache_index].min;
-
-		if (min <= -1.0) {
-			min = -1.0;
-		}
-
-		if (max >= 1.0) {
-			max = 1.0;
-		}
-
-		if (rectify) {
-			if (fabs (min) > fabs (max)) {
-				max = fabs (min);
-			}
-		}
-
-		yoff = origin - (waveview->half_height * max) + 0.5;
-
-		if (xoff == ulx) {
-			/* first point */
-			cairo_move_to (cr, xoff+0.5, yoff);
-		} else {
-			cairo_line_to (cr, xoff+0.5, yoff);
-		}
-
-		cache_index++;
-	}
-
-	/* from the final top point, move out of the clip zone */
-
-	cairo_line_to (cr, xoff + 10, yoff);
-
-	/* now draw the bottom half */
-
-	for (--xoff, --cache_index; xoff >= ulx; --xoff) {
-		double min;
-
-		min = waveview->cache->data[cache_index].min;
-
-		if (min <= -1.0) {
-			min = -1.0;
-		}
-
-		yoff = origin - (waveview->half_height * min) + 0.5;
-
-		cairo_line_to (cr, xoff+0.5, yoff);
-		cache_index--;
-	}
-
-	/* from the final lower point, move out of the clip zone */
-
-	cairo_line_to (cr, xoff - 10, yoff);
-
-	/* close path to fill */
-
-	cairo_close_path (cr);
-
-	/* fill and stroke */
-
-	cairo_set_source_rgba (cr,
-			       (waveview->fill_r/255.0),
-			       (waveview->fill_g/255.0),
-			       (waveview->fill_b/255.0),
-			       (waveview->fill_a/255.0));
-	cairo_fill_preserve (cr);
-	cairo_set_source_rgba (cr,
-			       (waveview->wave_r/255.0),
-			       (waveview->wave_g/255.0),
-			       (waveview->wave_b/255.0),
-			       (waveview->wave_a/255.0));
-	cairo_stroke (cr);
-
-	cairo_destroy (cr);
-}
-
-#if 0
-		if (clip_max || clip_min) {
-			cairo_set_source_rgba (cr, waveview->clip_r, waveview->clip_g, waveview->clip_b, waveview->clip_a);
-		}
-
-		if (clip_max) {
-			cairo_move_to (cr, xoff, yoff1);
-			cairo_line_to (cr, xoff, yoff1 + clip_length);
-			cairo_stroke (cr);
-		}
-
-		if (clip_min) {
-			cairo_move_to (cr, xoff, yoff2);
-			cairo_line_to (cr, xoff, yoff2 - clip_length);
-			cairo_stroke (cr);
-		}
-
-#endif
-
-static void
-gnome_canvas_waveview_bounds (GnomeCanvasItem *item, double *x1, double *y1, double *x2, double *y2)
-{
-	GnomeCanvasWaveView *waveview = GNOME_CANVAS_WAVEVIEW (item);
-
-	*x1 = waveview->x;
-	*y1 = waveview->y;
-
-	*x2 = ceil (*x1 + (waveview->length_function (waveview->data_src) / waveview->samples_per_unit));
-	*y2 = *y1 + waveview->height;
-
-#if 0
-	x = 0; y = 0;
-	gnome_canvas_item_i2w (item, &x, &y);
-	gnome_canvas_w2c_d (GNOME_CANVAS(item->canvas), x, y, &a, &b);
-	x = *x2;
-	y = *y2;
-	gnome_canvas_item_i2w (item, &x, &y);
-	gnome_canvas_w2c_d (GNOME_CANVAS(item->canvas), x, y, &c, &d);
-	printf ("item bounds now (%g,%g),(%g,%g)\n", a, b, c, d);
-#endif
-
-}
-
-static double
-gnome_canvas_waveview_point (GnomeCanvasItem *item, double x, double y, int cx, int cy, GnomeCanvasItem **actual_item)
-{
-	(void) item;
-	(void) x;
-	(void) y;
-	(void) cx;
-	(void) cy;
-	(void) actual_item;
-
-	/* XXX for now, point is never inside the wave
-	GnomeCanvasWaveView *waveview;
-	double x1, y1, x2, y2;
-	double dx, dy;
-	*/
-
-	return DBL_MAX;
-
-#if 0
-	waveview = GNOME_CANVAS_WAVEVIEW (item);
-
-	*actual_item = item;
-
-	/* Find the bounds for the rectangle plus its outline width */
-
-	gnome_canvas_waveview_bounds (item, &x1, &y1, &x2, &y2);
-
-	/* Is point inside rectangle */
-
-	if ((x >= x1) && (y >= y1) && (x <= x2) && (y <= y2)) {
-		return 0.0;
-	}
-
-	/* Point is outside rectangle */
-
-	if (x < x1)
-		dx = x1 - x;
-	else if (x > x2)
-		dx = x - x2;
-	else
-		dx = 0.0;
-
-	if (y < y1)
-		dy = y1 - y;
-	else if (y > y2)
-		dy = y - y2;
-	else
-		dy = 0.0;
-
-	return sqrt (dx * dx + dy * dy);
-#endif
-}
-
diff --git a/gtk2_ardour/canvas-waveview.h b/gtk2_ardour/canvas-waveview.h
deleted file mode 100644
index cd640bcb9d..0000000000
--- a/gtk2_ardour/canvas-waveview.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/* libgnomecanvas/gnome-canvas-waveview.h: GnomeCanvas item for displaying wave data
- *
- * Copyright (C) 2001 Paul Davis <pbd@op.net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- */
-
-#ifndef __GNOME_CANVAS_WAVEVIEW_H__
-#define __GNOME_CANVAS_WAVEVIEW_H__
-
-#include <stdint.h>
-
-#include <libgnomecanvas/libgnomecanvas.h>
-
-G_BEGIN_DECLS
-
-/* Wave viewer item for canvas.
- */
-
-#define GNOME_TYPE_CANVAS_WAVEVIEW            (gnome_canvas_waveview_get_type ())
-#define GNOME_CANVAS_WAVEVIEW(obj)            (GTK_CHECK_CAST ((obj), GNOME_TYPE_CANVAS_WAVEVIEW, GnomeCanvasWaveView))
-#define GNOME_CANVAS_WAVEVIEW_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_CANVAS_WAVEVIEW, GnomeCanvasWaveViewClass))
-#define GNOME_IS_CANVAS_WAVEVIEW(obj)         (GTK_CHECK_TYPE ((obj), GNOME_TYPE_CANVAS_WAVEVIEW))
-#define GNOME_IS_CANVAS_WAVEVIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_CANVAS_WAVEVIEW))
-#define GNOME_CANVAS_WAVEVIEW_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), GNOME_TYPE_CANVAS_WAVEVIEW, GnomeCanvasWaveViewClass))
-
-typedef struct _GnomeCanvasWaveView            GnomeCanvasWaveView;
-typedef struct _GnomeCanvasWaveViewClass       GnomeCanvasWaveViewClass;
-typedef struct _GnomeCanvasWaveViewChannelInfo GnomeCanvasWaveViewChannelInfo;
-typedef struct _GnomeCanvasWaveViewCacheEntry  GnomeCanvasWaveViewCacheEntry;
-typedef struct _GnomeCanvasWaveViewCache       GnomeCanvasWaveViewCache;
-
-/* XXX this needs to be synced with ardour/source.h PeakData */
-
-struct _GnomeCanvasWaveViewCacheEntry
-{
-	float  min;
-	float  max;
-};
-
-struct _GnomeCanvasWaveViewCache
-{
-	GnomeCanvasWaveViewCacheEntry* data;
-	guint32                       allocated;
-	guint64                       data_size;
-	gulong                        start;
-	gulong                        end;
-};
-
-GnomeCanvasWaveViewCache* gnome_canvas_waveview_cache_new (void);
-void                    gnome_canvas_waveview_cache_destroy (GnomeCanvasWaveViewCache*);
-
-void gnome_canvas_waveview_set_gradient_waveforms (int);
-
-typedef  gulong (*waveview_length_function_t)(void*);
-typedef  gulong (*waveview_sourcefile_length_function_t)(void*, double);
-typedef  void (*waveview_gain_curve_function_t)(void *arg, double start, double end, float* vector, gint64 veclen);
-typedef  void (*waveview_peak_function_t)(void*,gulong,gulong,gulong,gpointer,guint32,double);
-
-struct _GnomeCanvasWaveView
-{
-	GnomeCanvasItem item;
-
-	GnomeCanvasWaveViewCache *cache;
-	gboolean                cache_updater;
-	gint                    screen_width;
-
-	void *data_src;
-	guint32 channel;
-	waveview_peak_function_t peak_function;
-	waveview_length_function_t length_function;
-	waveview_sourcefile_length_function_t sourcefile_length_function;
-	waveview_gain_curve_function_t gain_curve_function;
-	void *gain_src;
-
-	/** x-axis: samples per canvas unit. */
-	double samples_per_unit;
-
-	/** y-axis: amplitude_above_axis.
-	 *
-	 * the default is that an (scaled, normalized -1.0 ... +1.0) amplitude of 1.0
-	 * corresponds to the top of the area assigned to the waveview.
-	 *
-	 * larger values will expand the vertical scale, cutting off the peaks/troughs.
-	 * smaller values will decrease the vertical scale, moving peaks/troughs toward
-	 * the middle of the area assigned to the waveview.
-	 */
-	double amplitude_above_axis;
-
-	double x;
-	double y;
-	double height;
-	double half_height;
-	uint32_t wave_color;
-	uint32_t clip_color;
-	uint32_t zero_color;
-	uint32_t fill_color;
-
-	char filled;
-	char rectified;
-	char zero_line;
-	char logscaled;
-
-	/* These are updated by the update() routine
-	   to optimize the render() routine, which may
-	   be called several times after a single update().
-	*/
-
-	int32_t bbox_ulx;
-	int32_t bbox_uly;
-	int32_t bbox_lrx;
-	int32_t bbox_lry;
-	unsigned char wave_r, wave_g, wave_b, wave_a;
-	unsigned char clip_r, clip_g, clip_b, clip_a;
-	unsigned char fill_r, fill_g, fill_b, fill_a;
-	uint32_t samples;
-	uint32_t region_start;
-	int32_t reload_cache_in_render;
-};
-
-struct _GnomeCanvasWaveViewClass {
-	GnomeCanvasItemClass parent_class;
-};
-
-GType gnome_canvas_waveview_get_type (void) G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif /* __GNOME_CANVAS_WAVEVIEW_H__ */