diff options
| author | Carl Hetherington <carl@carlh.net> | 2009-05-15 21:36:37 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2009-05-15 21:36:37 +0000 |
| commit | f4e6f8fec5c4ed705b2f0124666d632c392dbbc3 (patch) | |
| tree | a1e6eebe6fb9e76c7ad33d8ba8d8341553625bf2 /gtk2_ardour/canvas-waveview.c | |
| parent | c9d0a19c8fb70a03f5972bf28f8aece007f77ed8 (diff) | |
Fix some warnings.
git-svn-id: svn://localhost/ardour2/branches/3.0@5081 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/canvas-waveview.c')
| -rw-r--r-- | gtk2_ardour/canvas-waveview.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gtk2_ardour/canvas-waveview.c b/gtk2_ardour/canvas-waveview.c index 8b2a7c8af7..fdcdcd8745 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); } @@ -1091,7 +1091,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; @@ -1235,7 +1235,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) { @@ -1611,7 +1611,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 |