summaryrefslogtreecommitdiff
path: root/gtk2_ardour/canvas-waveview.c
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2010-03-01 23:54:40 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2010-03-01 23:54:40 +0000
commitf0e16a09f76390732215d5f8086c216af6a6715e (patch)
tree136073a00b336d5f409f27220d2d1571a1f155e0 /gtk2_ardour/canvas-waveview.c
parent482f21f9dd6b92ce2747ff822fe5d753806427c0 (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.c')
-rw-r--r--gtk2_ardour/canvas-waveview.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/gtk2_ardour/canvas-waveview.c b/gtk2_ardour/canvas-waveview.c
index f3a3117622..c1383f087b 100644
--- a/gtk2_ardour/canvas-waveview.c
+++ b/gtk2_ardour/canvas-waveview.c
@@ -763,26 +763,22 @@ gnome_canvas_waveview_set_property (GObject *object,
break;
case PROP_LENGTH_FUNCTION:
- waveview->length_function = (gulong (*)(void*)) g_value_get_pointer(value);
+ waveview->length_function = (waveview_length_function_t) g_value_get_pointer(value);
redraw = TRUE;
break;
case PROP_SOURCEFILE_LENGTH_FUNCTION:
- waveview->sourcefile_length_function = (gulong (*)(void*,double)) g_value_get_pointer(value);
+ waveview->sourcefile_length_function = (waveview_sourcefile_length_function_t) g_value_get_pointer(value);
redraw = TRUE;
break;
case PROP_PEAK_FUNCTION:
- waveview->peak_function =
- (void (*)(void*,gulong,gulong,gulong,gpointer,guint32,double))
- g_value_get_pointer(value);
+ waveview->peak_function = (waveview_peak_function_t) g_value_get_pointer(value);
redraw = TRUE;
break;
case PROP_GAIN_FUNCTION:
- waveview->gain_curve_function =
- (void (*)(void *arg, double start, double end, float* vector, gint64 veclen))
- g_value_get_pointer(value);
+ waveview->gain_curve_function = (waveview_gain_curve_function_t) g_value_get_pointer(value);
redraw = TRUE;
break;