From 8703d88ce7506b0a80c1183b32a8e0a7856cd9be Mon Sep 17 00:00:00 2001 From: "Joshua N. Pritikin" Date: Mon, 10 Sep 2001 19:00:42 +0000 Subject: [PATCH] Sync g_signal_new args with the marshaller (glib2 is very strict). Original commit message from CVS: Sync g_signal_new args with the marshaller (glib2 is very strict). --- gst/gstbin.c | 2 +- gst/gstelement.c | 14 +++++++------- gst/gstmarshal.list | 6 ++++++ gst/gstpad.c | 13 +++++++------ 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/gst/gstbin.c b/gst/gstbin.c index 3bd1c236cd..3714c46353 100644 --- a/gst/gstbin.c +++ b/gst/gstbin.c @@ -110,7 +110,7 @@ gst_bin_class_init (GstBinClass *klass) gst_bin_signals[OBJECT_ADDED] = g_signal_new ("object_added", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GstBinClass, object_added), NULL, NULL, - g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, + gst_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GST_TYPE_ELEMENT); klass->change_state_type = gst_bin_change_state_type; diff --git a/gst/gstelement.c b/gst/gstelement.c index 38c43d1006..2122a11fb7 100644 --- a/gst/gstelement.c +++ b/gst/gstelement.c @@ -103,37 +103,37 @@ gst_element_class_init (GstElementClass *klass) gst_element_signals[STATE_CHANGE] = g_signal_new ("state_change", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstElementClass, state_change), NULL, NULL, - g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, + gst_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT); gst_element_signals[NEW_PAD] = g_signal_new ("new_pad", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstElementClass, new_pad), NULL, NULL, - g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, + gst_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GST_TYPE_PAD); gst_element_signals[PAD_REMOVED] = g_signal_new ("pad_removed", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstElementClass, pad_removed), NULL, NULL, - g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, + gst_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GST_TYPE_PAD); gst_element_signals[NEW_GHOST_PAD] = g_signal_new ("new_ghost_pad", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstElementClass, new_ghost_pad), NULL, NULL, - g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, + gst_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GST_TYPE_PAD); gst_element_signals[GHOST_PAD_REMOVED] = g_signal_new ("ghost_pad_removed", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstElementClass, ghost_pad_removed), NULL, NULL, - g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, + gst_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GST_TYPE_PAD); gst_element_signals[ERROR] = g_signal_new ("error", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstElementClass, error), NULL, NULL, - g_cclosure_marshal_VOID__STRING, G_TYPE_NONE,1, + gst_marshal_VOID__STRING, G_TYPE_NONE,1, G_TYPE_STRING); gst_element_signals[EOS] = g_signal_new ("eos", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstElementClass,eos), NULL, NULL, - g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + gst_marshal_VOID__VOID, G_TYPE_NONE, 0); diff --git a/gst/gstmarshal.list b/gst/gstmarshal.list index 651b2c6f62..a7de23f2e7 100644 --- a/gst/gstmarshal.list +++ b/gst/gstmarshal.list @@ -1,2 +1,8 @@ +VOID:VOID +VOID:BOOLEAN +VOID:INT +VOID:STRING +VOID:POINTER +VOID:OBJECT VOID:OBJECT,POINTER VOID:INT,INT diff --git a/gst/gstpad.c b/gst/gstpad.c index bbc8c49d08..85811c8f3b 100644 --- a/gst/gstpad.c +++ b/gst/gstpad.c @@ -28,6 +28,7 @@ #include "gsttype.h" #include "gstbin.h" #include "gstscheduler.h" +#include "gstmarshal.h" /***** Start with the base GstPad class *****/ @@ -149,27 +150,27 @@ gst_real_pad_class_init (GstRealPadClass *klass) gst_real_pad_signals[REAL_SET_ACTIVE] = g_signal_new ("set_active", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstRealPadClass, set_active), NULL, NULL, - g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, + gst_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN); gst_real_pad_signals[REAL_CAPS_CHANGED] = g_signal_new ("caps_changed", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstRealPadClass, caps_changed), NULL, NULL, - g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, + gst_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); gst_real_pad_signals[REAL_CAPS_NEGO_FAILED] = 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_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, + gst_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); gst_real_pad_signals[REAL_CONNECTED] = g_signal_new ("connected", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstRealPadClass, connected), NULL, NULL, - g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, + gst_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); gst_real_pad_signals[REAL_DISCONNECTED] = g_signal_new ("disconnected", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstRealPadClass, disconnected), NULL, NULL, - g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, + gst_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); // gtk_object_add_arg_type ("GstRealPad::active", G_TYPE_BOOLEAN, @@ -1631,7 +1632,7 @@ gst_padtemplate_class_init (GstPadTemplateClass *klass) gst_padtemplate_signals[TEMPL_PAD_CREATED] = g_signal_new ("pad_created", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstPadTemplateClass, pad_created), NULL, NULL, - g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, + gst_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GST_TYPE_PAD);