diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-03-01 23:54:40 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-03-01 23:54:40 +0000 |
| commit | f0e16a09f76390732215d5f8086c216af6a6715e (patch) | |
| tree | 136073a00b336d5f409f27220d2d1571a1f155e0 /gtk2_ardour/canvas-waveview.h | |
| parent | 482f21f9dd6b92ce2747ff822fe5d753806427c0 (diff) | |
try (unsuccessfully) to fix gcc complaints about function-pointer/object-pointer mixing (its much deeper than this change suggests)
git-svn-id: svn://localhost/ardour2/branches/3.0@6715 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/canvas-waveview.h')
| -rw-r--r-- | gtk2_ardour/canvas-waveview.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/gtk2_ardour/canvas-waveview.h b/gtk2_ardour/canvas-waveview.h index 89c193a440..f04a4b38c2 100644 --- a/gtk2_ardour/canvas-waveview.h +++ b/gtk2_ardour/canvas-waveview.h @@ -64,6 +64,11 @@ struct _GnomeCanvasWaveViewCache GnomeCanvasWaveViewCache* gnome_canvas_waveview_cache_new (); void gnome_canvas_waveview_cache_destroy (GnomeCanvasWaveViewCache*); +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; @@ -74,10 +79,10 @@ struct _GnomeCanvasWaveView void *data_src; guint32 channel; - 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, gint64 veclen); + 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. */ |