From: Sebastian Dröge Date: Tue, 13 May 2008 13:04:24 +0000 (+0000) Subject: gst/playback/: Use correct marshallers. GstCaps are a boxed type and no GObject subclass. X-Git-Tag: RELEASE-0_10_20~98 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=05349cc35438ac8858ba44f0e12f08462e75fb77;p=platform%2Fupstream%2Fgst-plugins-base.git gst/playback/: Use correct marshallers. GstCaps are a boxed type and no GObject subclass. Original commit message from CVS: * gst/playback/gstdecodebin.c: (gst_decode_bin_class_init): * gst/playback/gstdecodebin2.c: (gst_decode_bin_class_init): * gst/playback/gstplay-marshal.list: * gst/playback/gsturidecodebin.c: (gst_uri_decode_bin_class_init): Use correct marshallers. GstCaps are a boxed type and no GObject subclass. --- diff --git a/ChangeLog b/ChangeLog index 87361ea6b..69bac44c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-05-13 Sebastian Dröge + + * gst/playback/gstdecodebin.c: (gst_decode_bin_class_init): + * gst/playback/gstdecodebin2.c: (gst_decode_bin_class_init): + * gst/playback/gstplay-marshal.list: + * gst/playback/gsturidecodebin.c: (gst_uri_decode_bin_class_init): + Use correct marshallers. GstCaps are a boxed type and no GObject + subclass. + 2008-05-13 Sebastian Dröge * win32/common/libgstrtsp.def: diff --git a/gst/playback/gstdecodebin.c b/gst/playback/gstdecodebin.c index 0fb712377..039babd0d 100644 --- a/gst/playback/gstdecodebin.c +++ b/gst/playback/gstdecodebin.c @@ -219,7 +219,7 @@ gst_decode_bin_class_init (GstDecodeBinClass * klass) gst_decode_bin_signals[SIGNAL_UNKNOWN_TYPE] = g_signal_new ("unknown-type", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstDecodeBinClass, unknown_type), - NULL, NULL, gst_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, + NULL, NULL, gst_marshal_VOID__OBJECT_BOXED, G_TYPE_NONE, 2, GST_TYPE_PAD, GST_TYPE_CAPS); gobject_klass->dispose = GST_DEBUG_FUNCPTR (gst_decode_bin_dispose); diff --git a/gst/playback/gstdecodebin2.c b/gst/playback/gstdecodebin2.c index 729cc0840..d871acc78 100644 --- a/gst/playback/gstdecodebin2.c +++ b/gst/playback/gstdecodebin2.c @@ -432,7 +432,7 @@ gst_decode_bin_class_init (GstDecodeBinClass * klass) gst_decode_bin_signals[SIGNAL_UNKNOWN_TYPE] = g_signal_new ("unknown-type", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstDecodeBinClass, unknown_type), - NULL, NULL, gst_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, + NULL, NULL, gst_marshal_VOID__OBJECT_BOXED, G_TYPE_NONE, 2, GST_TYPE_PAD, GST_TYPE_CAPS); /** @@ -452,7 +452,7 @@ gst_decode_bin_class_init (GstDecodeBinClass * klass) gst_decode_bin_signals[SIGNAL_AUTOPLUG_CONTINUE] = g_signal_new ("autoplug-continue", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstDecodeBinClass, autoplug_continue), - _gst_boolean_accumulator, NULL, gst_play_marshal_BOOLEAN__OBJECT_OBJECT, + _gst_boolean_accumulator, NULL, gst_play_marshal_BOOLEAN__OBJECT_BOXED, G_TYPE_BOOLEAN, 2, GST_TYPE_PAD, GST_TYPE_CAPS); /** @@ -478,7 +478,7 @@ gst_decode_bin_class_init (GstDecodeBinClass * klass) g_signal_new ("autoplug-factories", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstDecodeBinClass, autoplug_factories), _gst_array_accumulator, NULL, - gst_play_marshal_BOXED__OBJECT_OBJECT, G_TYPE_VALUE_ARRAY, 2, + gst_play_marshal_BOXED__OBJECT_BOXED, G_TYPE_VALUE_ARRAY, 2, GST_TYPE_PAD, GST_TYPE_CAPS); /** @@ -500,7 +500,7 @@ gst_decode_bin_class_init (GstDecodeBinClass * klass) gst_decode_bin_signals[SIGNAL_AUTOPLUG_SORT] = g_signal_new ("autoplug-sort", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstDecodeBinClass, autoplug_sort), - NULL, NULL, gst_play_marshal_BOXED__OBJECT_OBJECT_BOXED, + NULL, NULL, gst_play_marshal_BOXED__OBJECT_BOXED_BOXED, G_TYPE_VALUE_ARRAY, 3, GST_TYPE_PAD, GST_TYPE_CAPS, G_TYPE_VALUE_ARRAY); /** @@ -523,7 +523,7 @@ gst_decode_bin_class_init (GstDecodeBinClass * klass) g_signal_new ("autoplug-select", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstDecodeBinClass, autoplug_select), _gst_select_accumulator, NULL, - gst_play_marshal_ENUM__OBJECT_OBJECT_OBJECT, + gst_play_marshal_ENUM__OBJECT_BOXED_OBJECT, GST_TYPE_AUTOPLUG_SELECT_RESULT, 3, GST_TYPE_PAD, GST_TYPE_CAPS, GST_TYPE_ELEMENT_FACTORY); diff --git a/gst/playback/gstplay-marshal.list b/gst/playback/gstplay-marshal.list index 135e4ab9d..9858d3c29 100644 --- a/gst/playback/gstplay-marshal.list +++ b/gst/playback/gstplay-marshal.list @@ -1,9 +1,9 @@ -BOOLEAN:OBJECT,OBJECT +BOOLEAN:OBJECT,BOXED BOOLEAN:OBJECT,OBJECT,OBJECT -BOXED:OBJECT,OBJECT +BOXED:OBJECT,BOXED VOID:OBJECT,BOOLEAN ENUM:OBJECT,OBJECT,BOXED -ENUM:OBJECT,OBJECT,OBJECT -BOXED:OBJECT,OBJECT,BOXED +ENUM:OBJECT,BOXED,OBJECT +BOXED:OBJECT,BOXED,BOXED BOXED:INT OBJECT:BOXED diff --git a/gst/playback/gsturidecodebin.c b/gst/playback/gsturidecodebin.c index 608b4c8ac..590e302cb 100644 --- a/gst/playback/gsturidecodebin.c +++ b/gst/playback/gsturidecodebin.c @@ -296,7 +296,7 @@ gst_uri_decode_bin_class_init (GstURIDecodeBinClass * klass) gst_uri_decode_bin_signals[SIGNAL_UNKNOWN_TYPE] = g_signal_new ("unknown-type", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstURIDecodeBinClass, unknown_type), - NULL, NULL, gst_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, + NULL, NULL, gst_marshal_VOID__OBJECT_BOXED, G_TYPE_NONE, 2, GST_TYPE_PAD, GST_TYPE_CAPS); /** @@ -316,7 +316,7 @@ gst_uri_decode_bin_class_init (GstURIDecodeBinClass * klass) g_signal_new ("autoplug-continue", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstURIDecodeBinClass, autoplug_continue), _gst_boolean_accumulator, NULL, - gst_play_marshal_BOOLEAN__OBJECT_OBJECT, G_TYPE_BOOLEAN, 2, GST_TYPE_PAD, + gst_play_marshal_BOOLEAN__OBJECT_BOXED, G_TYPE_BOOLEAN, 2, GST_TYPE_PAD, GST_TYPE_CAPS); /** @@ -335,7 +335,7 @@ gst_uri_decode_bin_class_init (GstURIDecodeBinClass * klass) g_signal_new ("autoplug-factories", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstURIDecodeBinClass, autoplug_factories), _gst_array_accumulator, NULL, - gst_play_marshal_BOXED__OBJECT_OBJECT, G_TYPE_VALUE_ARRAY, 2, + gst_play_marshal_BOXED__OBJECT_BOXED, G_TYPE_VALUE_ARRAY, 2, GST_TYPE_PAD, GST_TYPE_CAPS); /** @@ -357,7 +357,7 @@ gst_uri_decode_bin_class_init (GstURIDecodeBinClass * klass) g_signal_new ("autoplug-select", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstURIDecodeBinClass, autoplug_select), _gst_select_accumulator, NULL, - gst_play_marshal_ENUM__OBJECT_OBJECT_OBJECT, + gst_play_marshal_ENUM__OBJECT_BOXED_OBJECT, GST_TYPE_AUTOPLUG_SELECT_RESULT, 3, GST_TYPE_PAD, GST_TYPE_CAPS, GST_TYPE_ELEMENT_FACTORY);