diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-02-18 13:59:49 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-02-18 13:59:49 +0000 |
| commit | ce7a5e1c9fa3edf2d9cc66875505e402a0aaa6f6 (patch) | |
| tree | 8a798270cd892823c7eeef99c2f3cdd4bf657bb3 /gtk2_ardour/canvas-waveview.c | |
| parent | cdcc4d3720d8168a158f6a5a5f23e9ce981bc68c (diff) | |
the Properties & 64bit region commit
git-svn-id: svn://localhost/ardour2/branches/3.0@6695 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/canvas-waveview.c')
| -rw-r--r-- | gtk2_ardour/canvas-waveview.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/gtk2_ardour/canvas-waveview.c b/gtk2_ardour/canvas-waveview.c index cafc47b61f..f3a3117622 100644 --- a/gtk2_ardour/canvas-waveview.c +++ b/gtk2_ardour/canvas-waveview.c @@ -763,23 +763,27 @@ gnome_canvas_waveview_set_property (GObject *object, break; case PROP_LENGTH_FUNCTION: - waveview->length_function = g_value_get_pointer(value); + waveview->length_function = (gulong (*)(void*)) g_value_get_pointer(value); redraw = TRUE; break; case PROP_SOURCEFILE_LENGTH_FUNCTION: - waveview->sourcefile_length_function = g_value_get_pointer(value); + waveview->sourcefile_length_function = (gulong (*)(void*,double)) g_value_get_pointer(value); redraw = TRUE; break; case PROP_PEAK_FUNCTION: - waveview->peak_function = g_value_get_pointer(value); + waveview->peak_function = + (void (*)(void*,gulong,gulong,gulong,gpointer,guint32,double)) + g_value_get_pointer(value); redraw = TRUE; break; case PROP_GAIN_FUNCTION: - waveview->gain_curve_function = g_value_get_pointer(value); - redraw = TRUE; + waveview->gain_curve_function = + (void (*)(void *arg, double start, double end, float* vector, gint64 veclen)) + g_value_get_pointer(value); + redraw = TRUE; break; case PROP_GAIN_SRC: @@ -946,19 +950,19 @@ gnome_canvas_waveview_get_property ( break; case PROP_LENGTH_FUNCTION: - g_value_set_pointer(value, waveview->length_function); + g_value_set_pointer(value, (void*) waveview->length_function); break; case PROP_SOURCEFILE_LENGTH_FUNCTION: - g_value_set_pointer(value, waveview->sourcefile_length_function); + g_value_set_pointer(value, (void*) waveview->sourcefile_length_function); break; case PROP_PEAK_FUNCTION: - g_value_set_pointer(value, waveview->peak_function); + g_value_set_pointer(value, (void*) waveview->peak_function); break; case PROP_GAIN_FUNCTION: - g_value_set_pointer(value, waveview->gain_curve_function); + g_value_set_pointer(value, (void*) waveview->gain_curve_function); break; case PROP_GAIN_SRC: |