mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-01 06:01:04 +00:00
Clean up some of the mess I made..
Original commit message from CVS: Clean up some of the mess I made..
This commit is contained in:
parent
c72c3f6596
commit
f3f3a8fe7d
4 changed files with 30 additions and 29 deletions
|
@ -50,33 +50,34 @@ typedef struct _GObjectClass GObjectClass;
|
|||
#define G_TYPE_PARAM GTK_TYPE_PARAM
|
||||
|
||||
// marshallers
|
||||
#define g_cclosure_marshal_VOID__VOID gtk_marshal_NONE__NONE
|
||||
#define g_cclosure_marshal_VOID__BOOLEAN gtk_marshal_NONE__BOOL
|
||||
#define g_cclosure_marshal_VOID__CHAR gtk_marshal_NONE__CHAR
|
||||
#define g_cclosure_marshal_VOID__UCHAR gtk_marshal_NONE__UCHAR
|
||||
#define g_cclosure_marshal_VOID__INT gtk_marshal_NONE__INT
|
||||
#define g_cclosure_marshal_VOID__UINT gtk_marshal_NONE__UINT
|
||||
#define g_cclosure_marshal_VOID__LONG gtk_marshal_NONE__LONG
|
||||
#define g_cclosure_marshal_VOID__ULONG gtk_marshal_NONE__ULONG
|
||||
#define g_cclosure_marshal_VOID__ENUM gtk_marshal_NONE__ENUM
|
||||
#define g_cclosure_marshal_VOID__FLAGS gtk_marshal_NONE__FLAGS
|
||||
#define g_cclosure_marshal_VOID__FLOAT gtk_marshal_NONE__FLOAT
|
||||
#define g_cclosure_marshal_VOID__DOUBLE gtk_marshal_NONE__DOUBLE
|
||||
#define g_cclosure_marshal_VOID__STRING gtk_marshal_NONE__STRING
|
||||
#define g_cclosure_marshal_VOID__PARAM gtk_marshal_NONE__PARAM
|
||||
#define g_cclosure_marshal_VOID__BOXED gtk_marshal_NONE__BOXED
|
||||
#define g_cclosure_marshal_VOID__POINTER gtk_marshal_NONE__POINTER
|
||||
#define g_cclosure_marshal_VOID__OBJECT gtk_marshal_NONE__OBJECT
|
||||
#define g_cclosure_marshal_STRING__OBJECT_POINTER gtk_marshal_STRING__OBJECT_POINTER
|
||||
#define g_cclosure_marshal_VOID__UINT_POINTER gtk_marshal_NONE__UINT_POINTER
|
||||
#define g_cclosure_marshal_VOID__VOID gtk_marshal_NONE__NONE
|
||||
#define g_cclosure_marshal_VOID__BOOLEAN gtk_marshal_NONE__BOOL
|
||||
#define g_cclosure_marshal_VOID__CHAR gtk_marshal_NONE__CHAR
|
||||
#define g_cclosure_marshal_VOID__UCHAR gtk_marshal_NONE__UCHAR
|
||||
#define g_cclosure_marshal_VOID__INT gtk_marshal_NONE__INT
|
||||
#define g_cclosure_marshal_VOID__UINT gtk_marshal_NONE__UINT
|
||||
#define g_cclosure_marshal_VOID__LONG gtk_marshal_NONE__LONG
|
||||
#define g_cclosure_marshal_VOID__ULONG gtk_marshal_NONE__ULONG
|
||||
#define g_cclosure_marshal_VOID__ENUM gtk_marshal_NONE__ENUM
|
||||
#define g_cclosure_marshal_VOID__FLAGS gtk_marshal_NONE__FLAGS
|
||||
#define g_cclosure_marshal_VOID__FLOAT gtk_marshal_NONE__FLOAT
|
||||
#define g_cclosure_marshal_VOID__DOUBLE gtk_marshal_NONE__DOUBLE
|
||||
#define g_cclosure_marshal_VOID__STRING gtk_marshal_NONE__STRING
|
||||
#define g_cclosure_marshal_VOID__PARAM gtk_marshal_NONE__PARAM
|
||||
#define g_cclosure_marshal_VOID__BOXED gtk_marshal_NONE__BOXED
|
||||
#define g_cclosure_marshal_VOID__POINTER gtk_marshal_NONE__POINTER
|
||||
#define g_cclosure_marshal_VOID__OBJECT gtk_marshal_NONE__OBJECT
|
||||
#define g_cclosure_marshal_STRING__OBJECT_POINTER gtk_marshal_STRING__POINTER_POINTER
|
||||
#define g_cclosure_marshal_VOID__UINT_POINTER gtk_marshal_NONE__UINT_POINTER
|
||||
|
||||
#define gst_marshal_VOID__OBJECT_POINTER gtk_marshal_NONE__POINTER
|
||||
#define gst_marshal_VOID__INT_INT gtk_marshal_NONE__INT_INT
|
||||
#define gst_marshal_VOID__INT gtk_marshal_NONE__INT
|
||||
#define gst_marshal_VOID__STRING gtk_marshal_NONE__STRING
|
||||
#define gst_marshal_VOID__VOID gtk_marshal_NONE__NONE
|
||||
#define gst_marshal_VOID__BOOLEAN gtk_marshal_NONE__BOOL
|
||||
#define gst_marshal_VOID__INT gtk_marshal_NONE__INT
|
||||
#define gst_marshal_VOID__STRING gtk_marshal_NONE__STRING
|
||||
#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