[gst-cvs] thomasvs gst-plugins: gst-plugins/ gst-plugins/sys/ximage/ gst-plugins/sys/xvimage/

[<tho...@fr...>]

CVS Root:       /home/cvs/gstreamer
Module:         gst-plugins
Changes by:     thomasvs
Date:           Mon Aug 09 2004  19:00:18 EST

Log message:
assign error codes

Modified files:
    .               : ChangeLog
    sys/ximage      : ximagesink.c
    sys/xvimage     : xvimagesink.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ChangeLog.diff?r1=1.973&r2=1.974
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/sys/ximage/ximagesink.c.diff?r1=1.98&r2=1.99
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/sys/xvimage/xvimagesink.c.diff?r1=1.84&r2=1.85

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /home/cvs/gstreamer/gst-plugins/ChangeLog,v
retrieving revision 1.973
retrieving revision 1.974
diff -u -d -r1.973 -r1.974
--- ChangeLog	6 Aug 2004 15:42:58 -0000	1.973
+++ ChangeLog	9 Aug 2004 09:00:05 -0000	1.974
@@ -1,3 +1,9 @@
+2004-08-09  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* sys/ximage/ximagesink.c:
+	* sys/xvimage/xvimagesink.c:
+	  assign all TOO_LAZY's to a real category.  Thanks to Warthy Warthog.
 2004-08-06  Wim Taymans  <wi...@fl...>
 
 	* gst/tcp/gstmultifdsink.c: (gst_multifdsink_class_init),
Index: ximagesink.c
RCS file: /home/cvs/gstreamer/gst-plugins/sys/ximage/ximagesink.c,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -d -r1.98 -r1.99
--- ximagesink.c	3 Aug 2004 14:09:26 -0000	1.98
+++ ximagesink.c	9 Aug 2004 09:00:05 -0000	1.99
@@ -746,7 +746,7 @@
   if (!xcontext->disp) {
     g_mutex_unlock (ximagesink->x_lock);
     g_free (xcontext);
-    GST_ELEMENT_ERROR (ximagesink, RESOURCE, TOO_LAZY, (NULL),
+    GST_ELEMENT_ERROR (ximagesink, RESOURCE, WRITE, (NULL),
         ("Could not open display"));
     return NULL;
   }
Index: xvimagesink.c
RCS file: /home/cvs/gstreamer/gst-plugins/sys/xvimage/xvimagesink.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- xvimagesink.c	3 Aug 2004 14:09:26 -0000	1.84
+++ xvimagesink.c	9 Aug 2004 09:00:05 -0000	1.85
@@ -684,7 +684,7 @@
   /* First let's check that XVideo extension is available */
   if (!XQueryExtension (xcontext->disp, "XVideo", &i, &i, &i)) {
-    GST_ELEMENT_ERROR (xvimagesink, RESOURCE, TOO_LAZY, (NULL),
+    GST_ELEMENT_ERROR (xvimagesink, RESOURCE, SETTINGS, (NULL),
         ("XVideo extension is not available"));
@@ -692,7 +692,7 @@
   /* Then we get adaptors list */
   if (Success != XvQueryAdaptors (xcontext->disp, xcontext->root,
           &nb_adaptors, &adaptors)) {
         ("Failed getting XV adaptors list"));
@@ -722,7 +722,7 @@
   XvFreeAdaptorInfo (adaptors);
   if (!xcontext->xv_port_id) {
+    GST_ELEMENT_ERROR (xvimagesink, RESOURCE, BUSY, (NULL),
         ("No port available"));
@@ -810,7 +810,7 @@
   if (gst_caps_is_empty (caps)) {
     gst_caps_free (caps);
     XvUngrabPort (xcontext->disp, xcontext->xv_port_id, 0);
+    GST_ELEMENT_ERROR (xvimagesink, STREAM, WRONG_TYPE, (NULL),
         ("No supported format found"));
@@ -899,7 +899,7 @@
     g_mutex_unlock (xvimagesink->x_lock);
+    GST_ELEMENT_ERROR (xvimagesink, RESOURCE, WRITE, (NULL),
@@ -929,7 +929,7 @@
     XCloseDisplay (xcontext->disp);
         ("Could not get pixel formats"));