X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fcanvas-waveview.c;h=aab781081d57d124d887cb227ddb3b80069f2a3a;hb=9153ef32975efb86cc1609d72a0ea1ebd149faab;hp=5563fe5a783b158d9a3973901d0b560a686ab1e2;hpb=c724b85839d8869a7b08470e11e42e741db46322;p=ardour.git

diff --git a/gtk2_ardour/canvas-waveview.c b/gtk2_ardour/canvas-waveview.c
index 5563fe5a78..aab781081d 100644
--- a/gtk2_ardour/canvas-waveview.c
+++ b/gtk2_ardour/canvas-waveview.c
@@ -110,7 +110,7 @@ static void gnome_canvas_waveview_set_data_src   (GnomeCanvasWaveView *,
 static void gnome_canvas_waveview_set_channel    (GnomeCanvasWaveView *,
 						   guint32);
 
-static gint32 gnome_canvas_waveview_ensure_cache (GnomeCanvasWaveView *waveview,
+static guint32 gnome_canvas_waveview_ensure_cache (GnomeCanvasWaveView *waveview,
 						   gulong               start_sample,
 						   gulong               end_sample);
 
@@ -393,7 +393,7 @@ gnome_canvas_waveview_destroy (GtkObject *object)
 #undef CACHE_MEMMOVE_OPTIMIZATION
 
 /** @return cache index of start_sample within the cache */
-static gint32
+static guint32
 gnome_canvas_waveview_ensure_cache (GnomeCanvasWaveView *waveview, gulong start_sample, gulong end_sample)
 {
 	gulong required_cache_entries;
@@ -665,9 +665,9 @@ gnome_canvas_waveview_ensure_cache (GnomeCanvasWaveView *waveview, gulong start_
   out:
 #if DEBUG_CACHE
 	fprintf (stderr, "return cache index = %d\n", 
-		 (gint32) floor ((((double) (start_sample - cache->start)) / waveview->samples_per_unit) + 0.5));
+		 (guint32) floor ((((double) (start_sample - cache->start)) / waveview->samples_per_unit) + 0.5));
 #endif
-	return (gint32) floor ((((double) (start_sample - cache->start)) / waveview->samples_per_unit) + 0.5);
+	return (guint32) floor ((((double) (start_sample - cache->start)) / waveview->samples_per_unit) + 0.5);
 
 }
 
@@ -738,6 +738,8 @@ gnome_canvas_waveview_set_property (GObject      *object,
 				    GParamSpec   *pspec)
 
 {
+	(void) pspec;
+	
 	GnomeCanvasItem *item;
 	GnomeCanvasWaveView *waveview;
 	int redraw = FALSE;
@@ -764,6 +766,7 @@ gnome_canvas_waveview_set_property (GObject      *object,
 		waveview->length_function = g_value_get_pointer(value);
 		redraw = TRUE;
 		break;
+
 	case PROP_SOURCEFILE_LENGTH_FUNCTION:
 		waveview->sourcefile_length_function = g_value_get_pointer(value);
 		redraw = TRUE;
@@ -1090,7 +1093,7 @@ gnome_canvas_waveview_render (GnomeCanvasItem *item,
 	gulong s1, s2;
 	int clip_length = 0;
 	int pymin, pymax;
-	int cache_index;
+	guint cache_index;
 	double half_height;
 	int x;
 	char rectify;
@@ -1234,7 +1237,7 @@ gnome_canvas_waveview_render (GnomeCanvasItem *item,
 		}
 		if(last_pymax != last_pymin) {
 			/* take the index of one sample right of what we render */
-			int index = cache_index + (end - begin);
+			guint index = cache_index + (end - begin);
 
 			if (index >= waveview->cache->data_size) {
 				
@@ -1610,7 +1613,7 @@ gnome_canvas_waveview_render (GnomeCanvasItem *item,
 		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, end, zeroline_y);
+		PAINT_HORIZA(buf, zero_r, zero_g, zero_b, zero_a, zbegin, zend, zeroline_y);
 	}
 #undef origin
 
@@ -1860,6 +1863,13 @@ gnome_canvas_waveview_bounds (GnomeCanvasItem *item, double *x1, double *y1, dou
 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;