[gst-cvs] CVS: gstreamer/gst gobject2gtk.h,1.16,1.17 gstbin.c,1.89,1.90 gstelement.c,1.74,1.75 gstpad.c,1.105,1.106

Joshua Pritikin jpritikin at users.sourceforge.net
Thu Sep 13 13:14:04 PDT 2001


Update of /cvsroot/gstreamer/gstreamer/gst
In directory usw-pr-cvs1:/tmp/cvs-serv26451/gst

Modified Files:
	gobject2gtk.h gstbin.c gstelement.c gstpad.c 
Log Message:
backport wtay's marshal fixes from the EVENT1 branch


Index: gobject2gtk.h
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/gst/gobject2gtk.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- gobject2gtk.h	2001/09/12 22:02:43	1.16
+++ gobject2gtk.h	2001/09/13 20:13:51	1.17
@@ -77,6 +77,9 @@
 #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

Index: gstbin.c
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/gst/gstbin.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- gstbin.c	2001/09/10 20:11:22	1.89
+++ gstbin.c	2001/09/13 20:13:51	1.90
@@ -109,7 +109,7 @@
   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;

Index: gstelement.c
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/gst/gstelement.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- gstelement.c	2001/09/13 20:12:17	1.74
+++ gstelement.c	2001/09/13 20:13:51	1.75
@@ -108,22 +108,22 @@
   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,

Index: gstpad.c
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/gst/gstpad.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- gstpad.c	2001/09/13 20:12:17	1.105
+++ gstpad.c	2001/09/13 20:13:51	1.106
@@ -1631,7 +1631,7 @@
   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);
 
 





More information about the Gstreamer-commits mailing list