sys/v4l2/: Cleanup error messages and unify header comments

Original commit message from CVS:
* sys/v4l2/gstv4l2.c:
* sys/v4l2/gstv4l2colorbalance.c:
* sys/v4l2/gstv4l2colorbalance.h:
* sys/v4l2/gstv4l2object.c:
* sys/v4l2/gstv4l2object.h:
* sys/v4l2/gstv4l2src.c:
* sys/v4l2/gstv4l2src.h:
* sys/v4l2/gstv4l2tuner.c:
* sys/v4l2/gstv4l2tuner.h:
* sys/v4l2/gstv4l2xoverlay.c: (gst_v4l2_xoverlay_open):
* sys/v4l2/gstv4l2xoverlay.h:
* sys/v4l2/v4l2_calls.c: (gst_v4l2_get_capabilities),
(gst_v4l2_open):
* sys/v4l2/v4l2_calls.h:
* sys/v4l2/v4l2src_calls.c: (gst_v4l2src_queue_frame),
(gst_v4l2src_capture_init):
* sys/v4l2/v4l2src_calls.h:
Cleanup error messages and unify header comments

diff --git a/sys/v4l2/gstv4l2.c b/sys/v4l2/gstv4l2.c
index 0e7474e796a2240a879e943af966cb21b911ce29..db205e67161bf9d42977b8da78e9e7753f158821 100644 (file)
--- a/sys/v4l2/gstv4l2.c
+++ b/sys/v4l2/gstv4l2.c
@@ -1,9 +1,9 @@
 /* GStreamer
- *
- * gstv4l2.c: plugin for v4l2 elements
  *
  * Copyright (C) 2001-2002 Ronald Bultje <rbultje@ronald.bitfreak.net>
- * Copyright (C) 2006 Edgard Lima <edgard.lima@indt.org.br>
+ *               2006 Edgard Lima <edgard.lima@indt.org.br>
+ *
+ * gstv4l2.c: plugin for v4l2 elements
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public

diff --git a/sys/v4l2/gstv4l2colorbalance.c b/sys/v4l2/gstv4l2colorbalance.c
index d8bfd35effdd2d4f3bfde0a144d2c561e79b70d8..26c68f494be90145430fa9d199d531da703bd353 100644 (file)
--- a/sys/v4l2/gstv4l2colorbalance.c
+++ b/sys/v4l2/gstv4l2colorbalance.c
@@ -1,6 +1,7 @@
-/* GStreamer Color Balance interface implementation
+/* GStreamer
+ *
  * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
- * Copyright (C) 2006 Edgard Lima <edgard.lima@indt.org.br>
+ *               2006 Edgard Lima <edgard.lima@indt.org.br>
  *
  * gstv4l2colorbalance.c: color balance interface implementation for V4L2
  *

diff --git a/sys/v4l2/gstv4l2colorbalance.h b/sys/v4l2/gstv4l2colorbalance.h
index 761360faf7d920baf5b2bee4ad104f191a5ce0b1..193c6a4ac1aa76042fdf0f16ce36f3206b633835 100644 (file)
--- a/sys/v4l2/gstv4l2colorbalance.h
+++ b/sys/v4l2/gstv4l2colorbalance.h
@@ -1,6 +1,7 @@
-/* G-Streamer generic V4L2 element - Color Balance interface implementation
+/* GStreamer
+ *
  * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
- * Copyright (C) 2006 Edgard Lima <edgard.lima@indt.org.br>
+ *               2006 Edgard Lima <edgard.lima@indt.org.br>
  *
  * gstv4l2colorbalance.h: color balance interface implementation for V4L2
  *

diff --git a/sys/v4l2/gstv4l2object.c b/sys/v4l2/gstv4l2object.c
index 148ca399fe56941f9755f8133f5e01113622c5f3..ee4027ca1449a210443503c43ba02d05668911cd 100644 (file)
--- a/sys/v4l2/gstv4l2object.c
+++ b/sys/v4l2/gstv4l2object.c
@@ -1,7 +1,9 @@
-/*
- * GStreamer gstv4l2object.c: base class for V4L2 elements
+/* GStreamer
+ *
  * Copyright (C) 2001-2002 Ronald Bultje <rbultje@ronald.bitfreak.net>
- * Copyright (C) 2006 Edgard Lima <edgard.lima@indt.org.br>
+ *               2006 Edgard Lima <edgard.lima@indt.org.br>
+ *
+ * gstv4l2object.c: base class for V4L2 elements
  *
  * This library is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Library General Public License as published

diff --git a/sys/v4l2/gstv4l2object.h b/sys/v4l2/gstv4l2object.h
index 599a728926413104d63088ceee7ad8310e66cbf5..54d799d4b82988fd9ede30b8cc2202293ba8975e 100644 (file)
--- a/sys/v4l2/gstv4l2object.h
+++ b/sys/v4l2/gstv4l2object.h
@@ -1,9 +1,9 @@
 /* GStreamer
- *
- * gstv4l2object.h: base class for V4L2 elements
  *
  * Copyright (C) 2001-2002 Ronald Bultje <rbultje@ronald.bitfreak.net>
- * Copyright (C) 2006 Edgard Lima <edgard.lima@indt.org.br>
+ *               2006 Edgard Lima <edgard.lima@indt.org.br>
+ *
+ * gstv4l2object.h: base class for V4L2 elements
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public

diff --git a/sys/v4l2/gstv4l2src.c b/sys/v4l2/gstv4l2src.c
index ff83b0faed732dd4de99231ebf995373a59a1caf..17b679a330fdc6b43b0f03017806ba92d8cce27b 100644 (file)
--- a/sys/v4l2/gstv4l2src.c
+++ b/sys/v4l2/gstv4l2src.c
@@ -1,9 +1,9 @@
 /* GStreamer
- *
- * gstv4l2src.c: BT8x8/V4L2 source element
  *
  * Copyright (C) 2001-2002 Ronald Bultje <rbultje@ronald.bitfreak.net>
- * Copyright (C) 2006 Edgard Lima <edgard.lima@indt.org.br>
+ *               2006 Edgard Lima <edgard.lima@indt.org.br>
+ *
+ * gstv4l2src.c: BT8x8/V4L2 source element
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public

diff --git a/sys/v4l2/gstv4l2src.h b/sys/v4l2/gstv4l2src.h
index c20ee22c3bb9e9e362fbc025945f0e90633e52c5..af6de21ec7cc2b010c135f65e59d0bcdc6e39cf2 100644 (file)
--- a/sys/v4l2/gstv4l2src.h
+++ b/sys/v4l2/gstv4l2src.h
@@ -1,9 +1,9 @@
 /* GStreamer
- *
- * gstv4l2src.h: BT8x8/V4L2 video source element
  *
  * Copyright (C) 2001-2002 Ronald Bultje <rbultje@ronald.bitfreak.net>
- * Copyright (C) 2006 Edgard Lima <edgard.lima@indt.org.br>
+ *               2006 Edgard Lima <edgard.lima@indt.org.br>
+ *
+ * gstv4l2src.h: BT8x8/V4L2 source element
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public

diff --git a/sys/v4l2/gstv4l2tuner.c b/sys/v4l2/gstv4l2tuner.c
index d0a9a1f40f22f2ab2a72a24e29a506ca877f08b0..3ec73a23f4e213de73362f37758d74a53e28a520 100644 (file)
--- a/sys/v4l2/gstv4l2tuner.c
+++ b/sys/v4l2/gstv4l2tuner.c
@@ -1,6 +1,7 @@
-/* GStreamer Tuner interface implementation
+/* GStreamer
+ *
  * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
- * Copyright (C) 2006 Edgard Lima <edgard.lima@indt.org.br>
+ *               2006 Edgard Lima <edgard.lima@indt.org.br>
  *
  * gstv4l2tuner.c: tuner interface implementation for V4L2
  *

diff --git a/sys/v4l2/gstv4l2tuner.h b/sys/v4l2/gstv4l2tuner.h
index 523eea35caf5a033e5c17aeb4d67cba34a3447d8..1021b08cb732cfb556adb66436ca241bd15124c3 100644 (file)
--- a/sys/v4l2/gstv4l2tuner.h
+++ b/sys/v4l2/gstv4l2tuner.h
@@ -1,6 +1,7 @@
-/* G-Streamer generic V4L2 element - Tuner interface implementation
+/* GStreamer
+ *
  * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
- * Copyright (C) 2006 Edgard Lima <edgard.lima@indt.org.br>
+ *               2006 Edgard Lima <edgard.lima@indt.org.br>
  *
  * gstv4l2tuner.h: tuner interface implementation for V4L2
  *

diff --git a/sys/v4l2/gstv4l2xoverlay.c b/sys/v4l2/gstv4l2xoverlay.c
index 402e6ef13eb192cadef2f41fed36404e8df936d8..be50ba34efd07d928e928c7146c6684f84162530 100644 (file)
--- a/sys/v4l2/gstv4l2xoverlay.c
+++ b/sys/v4l2/gstv4l2xoverlay.c
@@ -1,6 +1,7 @@
-/* GStreamer X-based overlay interface implementation
+/* GStreamer
+ *
  * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
- * Copyright (C) 2006 Edgard Lima <edgard.lima@indt.org.br>
+ *               2006 Edgard Lima <edgard.lima@indt.org.br>
  *
  * gstv4l2xoverlay.c: X-based overlay interface implementation for V4L2
  *
@@ -98,8 +99,8 @@ gst_v4l2_xoverlay_open (GstV4l2Object * v4l2object)
   }
   if (fstat (v4l2object->video_fd, &s) < 0) {
     GST_ELEMENT_ERROR (v4l2object->element, RESOURCE, NOT_FOUND,
-        (_("Cannot identify '%s': %d, %s\n"), v4l2object->videodev, errno,
-            strerror (errno)), (NULL));
+        (_("Cannot identify device '%s': %s\n"), v4l2object->videodev,
+            g_strerror (errno)), GST_ERROR_SYSTEM);
     XCloseDisplay (dpy);
     return;
   }

diff --git a/sys/v4l2/gstv4l2xoverlay.h b/sys/v4l2/gstv4l2xoverlay.h
index d8add592d195c033d51a91212bc3c3a67cbc4cf5..e832d19dbdf713e281e468d1c6fbb80397e6bd84 100644 (file)
--- a/sys/v4l2/gstv4l2xoverlay.h
+++ b/sys/v4l2/gstv4l2xoverlay.h
@@ -1,6 +1,7 @@
-/* G-Streamer generic V4L2 element - X overlay interface implementation
+/* GStreamer
+ *
  * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
- * Copyright (C) 2006 Edgard Lima <edgard.lima@indt.org.br>
+ *               2006 Edgard Lima <edgard.lima@indt.org.br>
  *
  * gstv4l2xoverlay.h: tv mixer interface implementation for V4L2
  *

diff --git a/sys/v4l2/v4l2_calls.c b/sys/v4l2/v4l2_calls.c
index c74e5be0f2b7fd48fdbcb30bb837ed6fbbc72eac..c919369739470074dda540a65be30301174988df 100644 (file)
--- a/sys/v4l2/v4l2_calls.c
+++ b/sys/v4l2/v4l2_calls.c
@@ -1,6 +1,9 @@
-/* G-Streamer generic V4L2 element - generic V4L2 calls handling
+/* GStreamer
+ *
  * Copyright (C) 2002 Ronald Bultje <rbultje@ronald.bitfreak.net>
- * Copyright (C) 2006 Edgard Lima <edgard.lima@indt.org.br>
+ *               2006 Edgard Lima <edgard.lima@indt.org.br>
+ *
+ * v4l2_calls.c - generic V4L2 calls handling
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -55,7 +58,7 @@ gst_v4l2_get_capabilities (GstV4l2Object * v4l2object)
 
   if (ioctl (v4l2object->video_fd, VIDIOC_QUERYCAP, &(v4l2object->vcap)) < 0) {
     GST_ELEMENT_ERROR (v4l2object->element, RESOURCE, SETTINGS,
-        (_("Error getting capabilities '%s': %d, %s. It isn't a v4l2 driver. Check if it is a v4l1 driver\n"), v4l2object->videodev, errno, strerror (errno)), GST_ERROR_SYSTEM);
+        (_("Error getting capabilities for device '%s': %s. It isn't a v4l2 driver. Check if it is a v4l1 driver\n"), v4l2object->videodev, g_strerror (errno)), GST_ERROR_SYSTEM);
     return FALSE;
   }
 
@@ -365,14 +368,14 @@ gst_v4l2_open (GstV4l2Object * v4l2object)
   /* check if it is a device */
   if (-1 == stat (v4l2object->videodev, &st)) {
     GST_ELEMENT_ERROR (v4l2object->element, RESOURCE, NOT_FOUND,
-        (_("Cannot identify '%s': %d, %s\n"),
-            v4l2object->videodev, errno, strerror (errno)), GST_ERROR_SYSTEM);
+        (_("Cannot identify device '%s': %s\n"), v4l2object->videodev,
+            g_strerror (errno)), GST_ERROR_SYSTEM);
     goto error;
   }
   if (!S_ISCHR (st.st_mode)) {
     GST_ELEMENT_ERROR (v4l2object->element, RESOURCE, NOT_FOUND,
-        (_("It isn't a device '%s': %d, %s\n"),
-            v4l2object->videodev, errno, strerror (errno)), GST_ERROR_SYSTEM);
+        (_("This isn't a device '%s': %s\n"), v4l2object->videodev,
+            g_strerror (errno)), GST_ERROR_SYSTEM);
     goto error;
   }
 

diff --git a/sys/v4l2/v4l2_calls.h b/sys/v4l2/v4l2_calls.h
index 36075c6f61d9c17d9217a4c86138ff152e918634..f9f9ed200ff352af0f80ebb4c7fcf00f879fad28 100644 (file)
--- a/sys/v4l2/v4l2_calls.h
+++ b/sys/v4l2/v4l2_calls.h
@@ -1,6 +1,9 @@
-/* G-Streamer generic V4L2 element - generic V4L2 calls handling
+/* GStreamer
+ *
  * Copyright (C) 2002 Ronald Bultje <rbultje@ronald.bitfreak.net>
- * Copyright (C) 2006 Edgard Lima <edgard.lima@indt.org.br>
+ *               2006 Edgard Lima <edgard.lima@indt.org.br>
+ *
+ * v4l2_calls.h - generic V4L2 calls handling
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public

diff --git a/sys/v4l2/v4l2src_calls.c b/sys/v4l2/v4l2src_calls.c
index 3cfd0b08aae749a65e4a4315d7e123a5ee769bd2..9e9724dd169e5230f9a24425171ad70f93780d24 100644 (file)
--- a/sys/v4l2/v4l2src_calls.c
+++ b/sys/v4l2/v4l2src_calls.c
@@ -1,6 +1,9 @@
-/* G-Streamer Video4linux2 video-capture plugin - system calls
+/* GStreamer
+ *
  * Copyright (C) 2002 Ronald Bultje <rbultje@ronald.bitfreak.net>
- * Copyright (C) 2006 Edgard Lima <edgard.lima@indt.org.br>
+ *               2006 Edgard Lima <edgard.lima@indt.org.br>
+ *
+ * v4l2src.c - system calls
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -124,7 +127,7 @@ gst_v4l2src_queue_frame (GstV4l2Src * v4l2src, guint i)
   if (ioctl (v4l2src->v4l2object->video_fd, VIDIOC_QBUF,
           &v4l2src->pool->buffers[i].buffer) < 0) {
     GST_ELEMENT_ERROR (v4l2src, RESOURCE, WRITE,
-        (_("Could not write to device \"%s\"."),
+        (_("Could not write to device '%s'."),
             v4l2src->v4l2object->videodev),
         ("Error queueing buffer %u on device %s", i, g_strerror (errno)));
     return FALSE;
@@ -352,7 +355,7 @@ gst_v4l2src_capture_init (GstV4l2Src * v4l2src)
     if (ioctl (v4l2src->v4l2object->video_fd, VIDIOC_REQBUFS,
             &v4l2src->breq) < 0) {
       GST_ELEMENT_ERROR (v4l2src, RESOURCE, READ,
-          (_("Could not get buffers from device \"%s\"."),
+          (_("Could not get buffers from device '%s'."),
               v4l2src->v4l2object->videodev),
           ("error requesting %d buffers: %s",
               v4l2src->breq.count, g_strerror (errno)));
@@ -364,7 +367,7 @@ gst_v4l2src_capture_init (GstV4l2Src * v4l2src)
     GST_INFO_OBJECT (v4l2src, "using fallback read method");
   } else {
     GST_ELEMENT_ERROR (v4l2src, RESOURCE, READ,
-        (_("the driver of device \"%s\" is broken."),
+        (_("the driver of device '%s' is broken."),
             v4l2src->v4l2object->videodev),
         ("no supported read capability from %s",
             v4l2src->v4l2object->videodev));
@@ -381,7 +384,7 @@ gst_v4l2src_capture_init (GstV4l2Src * v4l2src)
   if (v4l2src->breq.memory > 0) {
     if (v4l2src->breq.count < GST_V4L2_MIN_BUFFERS) {
       GST_ELEMENT_ERROR (v4l2src, RESOURCE, READ,
-          (_("Could not get enough buffers from device \"%s\"."),
+          (_("Could not get enough buffers from device '%s'."),
               v4l2src->v4l2object->videodev),
           ("we received %d, we want at least %d",
               v4l2src->breq.count, GST_V4L2_MIN_BUFFERS));

diff --git a/sys/v4l2/v4l2src_calls.h b/sys/v4l2/v4l2src_calls.h
index 6cb637b3270b10eef8dc7d24c286a4c8b64a9c6e..437c45f52e57ca9a0687a133c6b0c0586190062e 100644 (file)
--- a/sys/v4l2/v4l2src_calls.h
+++ b/sys/v4l2/v4l2src_calls.h
@@ -1,6 +1,9 @@
-/* G-Streamer Video4linux2 video-capture plugin - system calls
+/* GStreamer
+ *
  * Copyright (C) 2002 Ronald Bultje <rbultje@ronald.bitfreak.net>
- * Copyright (C) 2006 Edgard Lima <edgard.lima@indt.org.br>
+ *               2006 Edgard Lima <edgard.lima@indt.org.br>
+ *
+ * v4l2src.h - system calls
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public