mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-26 11:41:09 +00:00
backport wtay's marshal fixes from the EVENT1 branch
Original commit message from CVS: backport wtay's marshal fixes from the EVENT1 branch
This commit is contained in:
parent
4b88028280
commit
064447edc8
4 changed files with 9 additions and 6 deletions
|
@ -77,6 +77,9 @@ typedef struct _GObjectClass GObjectClass;
|
|||
#define gst_marshal_VOID__VOID gtk_marshal_NONE__NONE
|
||||
#define gst_marshal_VOID__BOOLEAN gtk_marshal_NONE__BOOL
|
||||
#define gst_marshal_VOID__POINTER gtk_marshal_NONE__POINTER
|
||||
#define gst_marshal_VOID__OBJECT gtk_marshal_NONE__POINTER
|
||||
#define gst_marshal_VOID__OBJECT_POINTER gtk_marshal_NONE__POINTER_POINTER
|
||||
#define gst_marshal_VOID__INT_INT gtk_marshal_NONE__INT_INT
|
||||
|
||||
/* General macros */
|
||||
#ifdef __cplusplus
|
||||
|
|
|
@ -109,7 +109,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,
|
||||
gst_marshal_VOID__OBJECT_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;
|
||||
|
|
|
@ -108,22 +108,22 @@ gst_element_class_init (GstElementClass *klass)
|
|||
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,
|
||||
gst_marshal_VOID__OBJECT_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,
|
||||
gst_marshal_VOID__OBJECT_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,
|
||||
gst_marshal_VOID__OBJECT_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,
|
||||
gst_marshal_VOID__OBJECT_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,
|
||||
|
|
|
@ -1631,7 +1631,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,
|
||||
gst_marshal_VOID__OBJECT_POINTER, G_TYPE_NONE, 1,
|
||||
gst_marshal_VOID__OBJECT, G_TYPE_NONE, 1,
|
||||
GST_TYPE_PAD);
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue