X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fcanvas-waveview.h;h=520e9b3e1709b4afb25883bc8d050cec889cc0f4;hb=ae6dbb836cc1ab1bcbc21883f282361c43f10883;hp=6a7410546e80957f1ee014787f8dd07b2c58c230;hpb=45d3ec1437cf661533bc7750c623865def4424df;p=ardour.git

diff --git a/gtk2_ardour/canvas-waveview.h b/gtk2_ardour/canvas-waveview.h
index 6a7410546e..520e9b3e17 100644
--- a/gtk2_ardour/canvas-waveview.h
+++ b/gtk2_ardour/canvas-waveview.h
@@ -55,10 +55,10 @@ struct _GnomeCanvasWaveViewCacheEntry
 struct _GnomeCanvasWaveViewCache
 {
     GnomeCanvasWaveViewCacheEntry* data;
-    gint32                       allocated;
-    gint32                       data_size;
-    gulong                       start;
-    gulong                       end;
+    guint32                       allocated;
+    guint64                       data_size;
+    gulong                        start;
+    gulong                        end;
 };    
 
 GnomeCanvasWaveViewCache* gnome_canvas_waveview_cache_new ();
@@ -77,7 +77,7 @@ struct _GnomeCanvasWaveView
 	void (*peak_function)(void*,gulong,gulong,gulong,gpointer,guint32,double);
     gulong (*length_function)(void *);
     gulong (*sourcefile_length_function)(void*,double);
-    void (*gain_curve_function)(void *arg, double start, double end, float* vector, guint32 veclen);
+    void (*gain_curve_function)(void *arg, double start, double end, float* vector, gint64 veclen);
     void *gain_src;
 
     /** x-axis: samples per canvas unit. */
@@ -101,9 +101,12 @@ struct _GnomeCanvasWaveView
     uint32_t wave_color;
     uint32_t clip_color;
     uint32_t zero_color;
+    uint32_t fill_color;
 
+    char filled;
     char rectified;
-    char logscaled; 
+    char zero_line;
+    char logscaled;
 	
     /* These are updated by the update() routine
        to optimize the render() routine, which may
@@ -116,6 +119,7 @@ struct _GnomeCanvasWaveView
     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;