mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-26 19:51:11 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/: Revert POINTER->BOXED change in signal marshaller.

Browse source 
Original commit message from CVS:
* gst/gstmarshal.list:
* gst/gstpad.c: (gst_real_pad_class_init),
(_gst_real_pad_fixate_accumulator):
Revert POINTER->BOXED change in signal marshaller.
This commit is contained in:
David Schleef 2004-02-05 18:59:42 +00:00
parent 1c59991c3a
commit ec7cb937da
3 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2004-02-05 David Schleef <ds@schleef.org>
* gst/gstmarshal.list:
* gst/gstpad.c: (gst_real_pad_class_init),
(_gst_real_pad_fixate_accumulator):
Revert POINTER->BOXED change in signal marshaller.
2004-02-05 Thomas Vander Stichele <thomas (at) apestaart (dot) org> 2004-02-05 Thomas Vander Stichele <thomas (at) apestaart (dot) org>
* gstreamer.spec.in: * gstreamer.spec.in:

2
gst/gstmarshal.list
View file

@ -16,5 +16,3 @@ VOID:UINT,POINTER
BOOLEAN:VOID BOOLEAN:VOID
BOOLEAN:POINTER BOOLEAN:POINTER
POINTER:POINTER POINTER:POINTER
BOXED:BOXED
VOID:BOXED

12
gst/gstpad.c
View file

@ -183,8 +183,8 @@ gst_real_pad_class_init (GstRealPadClass *klass)
gst_real_pad_signals[REAL_CAPS_NEGO_FAILED] = gst_real_pad_signals[REAL_CAPS_NEGO_FAILED] =
g_signal_new ("caps_nego_failed", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, g_signal_new ("caps_nego_failed", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GstRealPadClass, caps_nego_failed), NULL, NULL, G_STRUCT_OFFSET (GstRealPadClass, caps_nego_failed), NULL, NULL,
gst_marshal_VOID__BOXED, G_TYPE_NONE, 1, gst_marshal_VOID__POINTER, G_TYPE_NONE, 1,
GST_TYPE_CAPS); G_TYPE_POINTER);
gst_real_pad_signals[REAL_LINKED] = gst_real_pad_signals[REAL_LINKED] =
g_signal_new ("linked", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, g_signal_new ("linked", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GstRealPadClass, linked), NULL, NULL, G_STRUCT_OFFSET (GstRealPadClass, linked), NULL, NULL,
@ -199,9 +199,11 @@ gst_real_pad_class_init (GstRealPadClass *klass)
g_signal_new ("fixate", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, g_signal_new ("fixate", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GstRealPadClass, appfixatefunc), G_STRUCT_OFFSET (GstRealPadClass, appfixatefunc),
_gst_real_pad_fixate_accumulator, NULL, _gst_real_pad_fixate_accumulator, NULL,
gst_marshal_BOXED__BOXED, GST_TYPE_CAPS, 1, gst_marshal_POINTER__POINTER, G_TYPE_POINTER, 1,
GST_TYPE_CAPS); G_TYPE_POINTER);
/* gtk_object_add_arg_type ("GstRealPad::active", G_TYPE_BOOLEAN, */
/* GTK_ARG_READWRITE, REAL_ARG_ACTIVE); */
g_object_class_install_property (G_OBJECT_CLASS (klass), REAL_ARG_ACTIVE, g_object_class_install_property (G_OBJECT_CLASS (klass), REAL_ARG_ACTIVE,
g_param_spec_boolean ("active", "Active", "Whether the pad is active.", g_param_spec_boolean ("active", "Active", "Whether the pad is active.",
TRUE, G_PARAM_READWRITE)); TRUE, G_PARAM_READWRITE));
@ -219,7 +221,7 @@ static gboolean
_gst_real_pad_fixate_accumulator (GSignalInvocationHint *ihint, _gst_real_pad_fixate_accumulator (GSignalInvocationHint *ihint,
GValue *return_accu, const GValue *handler_return, gpointer dummy) GValue *return_accu, const GValue *handler_return, gpointer dummy)
{ {
if (g_value_get_boxed (handler_return)) { if (g_value_get_pointer (handler_return)) {
g_value_copy (handler_return, return_accu); g_value_copy (handler_return, return_accu);
/* stop emission if something was returned */ /* stop emission if something was returned */
return FALSE; return FALSE;