[gst-cvs] CVS: gstreamer/gst gstelementfactory.c,1.46,1.47 gstpad.c,1.112,1.113

Thomas Vander Stichele thomasvs at users.sourceforge.net
Sun Sep 23 01:27:02 PDT 2001


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

Modified Files:
	gstelementfactory.c gstpad.c 
Log Message:
g_critical is a glib-2.0-ism, changed them to g_warning and added FIXME's


Index: gstelementfactory.c
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/gst/gstelementfactory.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- gstelementfactory.c	2001/09/14 22:16:47	1.46
+++ gstelementfactory.c	2001/09/23 08:26:10	1.47
@@ -196,8 +196,10 @@
   if (!factory->type)
     factory->type = type;
   else if (factory->type != type)
+/* FIXME: g_critical is glib-2.0, not glib-1.2
     g_critical ("`%s' requested type change (!)", name);
-
+*/
+    g_warning ("`%s' requested type change (!)", name);
   gst_object_set_name (GST_OBJECT (factory), name);
 
   return factory;
@@ -231,7 +233,10 @@
 
   if (factory->type == 0)
     {
+/* FIXME: g_critical is glib-2.0, not glib-1.2
       g_critical ("Factory for `%s' has no type",
+*/
+      g_warning ("Factory for `%s' has no type",
 		  gst_object_get_name (GST_OBJECT (factory)));
       return NULL;
     }

Index: gstpad.c
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/gst/gstpad.c,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -d -r1.112 -r1.113
--- gstpad.c	2001/09/17 23:56:30	1.112
+++ gstpad.c	2001/09/23 08:26:10	1.113
@@ -566,7 +566,10 @@
 		 GstPad *sinkpad)
 {
   if (!gst_pad_try_connect (srcpad, sinkpad))
+/* FIXME: g_critical is glib-2.0, not glib-1.2
     g_critical ("couldn't connect %s:%s and %s:%s",
+*/
+    g_warning ("couldn't connect %s:%s and %s:%s",
 		GST_DEBUG_PAD_NAME (srcpad),
 		GST_DEBUG_PAD_NAME (sinkpad));
 }
@@ -1476,7 +1479,10 @@
 
   if (!peer)
     {
+/* FIXME: g_critical is glib-2.0, not glib-1.2
       g_critical ("gst_pad_pull but %s:%s is unconnected", GST_DEBUG_PAD_NAME(pad));
+*/
+      g_warning ("gst_pad_pull but %s:%s is unconnected", GST_DEBUG_PAD_NAME(pad));
       return NULL;
     }
 





More information about the Gstreamer-commits mailing list