X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fcanvas-waveview.h;h=3d7b02946d572f0696a4d4328e175d15a47fe2b0;hb=deb2033a346d5a4638b9ee4e8eba66cd1b9a54e4;hp=75281f69ebb5d80752e000361e0e445c29dc388d;hpb=79986643c0c904f6574bb5323e2233a43a9e622e;p=ardour.git

diff --git a/gtk2_ardour/canvas-waveview.h b/gtk2_ardour/canvas-waveview.h
index 75281f69eb..3d7b02946d 100644
--- a/gtk2_ardour/canvas-waveview.h
+++ b/gtk2_ardour/canvas-waveview.h
@@ -56,7 +56,7 @@ struct _GnomeCanvasWaveViewCache
 {
     GnomeCanvasWaveViewCacheEntry* data;
     gint32                       allocated;
-    gint32                       data_size;
+    gint64                       data_size;
     gulong                       start;
     gulong                       end;
 };    
@@ -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. */
@@ -99,9 +99,15 @@ struct _GnomeCanvasWaveView
     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().
@@ -112,6 +118,8 @@ struct _GnomeCanvasWaveView
     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;