summaryrefslogtreecommitdiffstats
path: root/sys/oss
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2004-02-02 17:23:33 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2004-02-02 17:23:33 +0000
commit79bc3ebfa12cd6913654b168ad8d1591fa46097c (patch)
treeda9a78ba712c51bc62830d695291f736e8551b02 /sys/oss
parenta47dc77f1899c53c28ad4f1c0c72d4b47488cae3 (diff)
change NULL to (NULL) for GST_ELEMENT_ERROR
Original commit message from CVS: change NULL to (NULL) for GST_ELEMENT_ERROR Make sure errors end with "."
Diffstat (limited to 'sys/oss')
-rw-r--r--sys/oss/gstosselement.c18
-rw-r--r--sys/oss/gstosssink.c2
-rw-r--r--sys/oss/gstosssrc.c6
3 files changed, 16 insertions, 10 deletions
diff --git a/sys/oss/gstosselement.c b/sys/oss/gstosselement.c
index e044ba92..9ef57338 100644
--- a/sys/oss/gstosselement.c
+++ b/sys/oss/gstosselement.c
@@ -699,31 +699,37 @@ gst_osselement_open_audio (GstOssElement *oss)
switch (errno) {
case EBUSY:
GST_ELEMENT_ERROR (oss, RESOURCE, BUSY,
- (_("OSS device \"%s\" is already in use by another program"), oss->device), NULL);
+ (_("OSS device \"%s\" is already in use by another program."), oss->device),
+ (NULL));
break;
case EACCES:
case ETXTBSY:
if (mode == GST_OSSELEMENT_WRITE)
GST_ELEMENT_ERROR (oss, RESOURCE, OPEN_WRITE,
- (_("Could not access device \"%s\", check its permissions"), oss->device), GST_ERROR_SYSTEM);
+ (_("Could not access device \"%s\", check its permissions."), oss->device),
+ GST_ERROR_SYSTEM);
else
GST_ELEMENT_ERROR (oss, RESOURCE, OPEN_READ,
- (_("Could not access device \"%s\", check its permissions"), oss->device), GST_ERROR_SYSTEM);
+ (_("Could not access device \"%s\", check its permissions."), oss->device),
+ GST_ERROR_SYSTEM);
break;
case ENXIO:
case ENODEV:
case ENOENT:
GST_ELEMENT_ERROR (oss, RESOURCE, NOT_FOUND,
- (_("Device \"%s\" does not exist"), oss->device), GST_ERROR_SYSTEM);
+ (_("Device \"%s\" does not exist."), oss->device),
+ GST_ERROR_SYSTEM);
break;
default:
/* FIXME: strerror is not threadsafe */
if (mode == GST_OSSELEMENT_WRITE)
GST_ELEMENT_ERROR (oss, RESOURCE, OPEN_WRITE,
- (_("Could not open device \"%s\" for writing"), oss->device), GST_ERROR_SYSTEM);
+ (_("Could not open device \"%s\" for writing."), oss->device),
+ GST_ERROR_SYSTEM);
else
GST_ELEMENT_ERROR (oss, RESOURCE, OPEN_READ,
- (_("Could not open device \"%s\" for reading"), oss->device), GST_ERROR_SYSTEM);
+ (_("Could not open device \"%s\" for reading."), oss->device),
+ GST_ERROR_SYSTEM);
break;
}
return FALSE;
diff --git a/sys/oss/gstosssink.c b/sys/oss/gstosssink.c
index ebb92ca1..54ad6829 100644
--- a/sys/oss/gstosssink.c
+++ b/sys/oss/gstosssink.c
@@ -350,7 +350,7 @@ gst_osssink_chain (GstPad *pad, GstData *_data)
if (!GST_OSSELEMENT (osssink)->bps) {
gst_buffer_unref (buf);
- GST_ELEMENT_ERROR (osssink, CORE, NEGOTIATION, NULL, ("format wasn't negotiated before chain function"));
+ GST_ELEMENT_ERROR (osssink, CORE, NEGOTIATION, (NULL), ("format wasn't negotiated before chain function"));
return;
}
diff --git a/sys/oss/gstosssrc.c b/sys/oss/gstosssrc.c
index c927605f..4bdcb0d2 100644
--- a/sys/oss/gstosssrc.c
+++ b/sys/oss/gstosssrc.c
@@ -305,13 +305,13 @@ gst_osssrc_get (GstPad *pad)
/* nothing was negotiated, we can decide on a format */
if (!gst_osssrc_negotiate (pad)) {
gst_buffer_unref (buf);
- GST_ELEMENT_ERROR (src, CORE, NEGOTIATION, NULL, NULL);
+ GST_ELEMENT_ERROR (src, CORE, NEGOTIATION, (NULL), (NULL));
return GST_DATA (gst_event_new (GST_EVENT_INTERRUPT));
}
}
if (GST_OSSELEMENT (src)->bps == 0) {
gst_buffer_unref (buf);
- GST_ELEMENT_ERROR (src, CORE, NEGOTIATION, NULL,
+ GST_ELEMENT_ERROR (src, CORE, NEGOTIATION, (NULL),
("format wasn't negotiated before chain function"));
return GST_DATA (gst_event_new (GST_EVENT_INTERRUPT));
}
@@ -320,7 +320,7 @@ gst_osssrc_get (GstPad *pad)
src->buffersize);
if (readbytes < 0) {
gst_buffer_unref (buf);
- GST_ELEMENT_ERROR (src, RESOURCE, READ, NULL, GST_ERROR_SYSTEM);
+ GST_ELEMENT_ERROR (src, RESOURCE, READ, (NULL), GST_ERROR_SYSTEM);
return GST_DATA (gst_event_new (GST_EVENT_INTERRUPT));
}