+2007-12-07 Tim-Philipp Müller <tim at centricular dot net>
+
+ * sys/oss/gstossaudio.c: (plugin_init):
+ * sys/oss/gstosssink.c: (gst_oss_sink_open):
+ * sys/oss/gstosssrc.c: (gst_oss_src_open):
+ Post decent (and translated) error message when we can't
+ open the audio device for some reason.
+
2007-12-07 Jan Schmidt <jan.schmidt@sun.com>
* sys/oss/gstosssink.c:
#include "gstosssrc.h"
GST_DEBUG_CATEGORY (oss_debug);
+#define GST_CAT_DEFAULT oss_debug
static gboolean
plugin_init (GstPlugin * plugin)
GST_DEBUG_CATEGORY_INIT (oss_debug, "oss", 0, "OSS elements");
#ifdef ENABLE_NLS
- setlocale (LC_ALL, "");
+ GST_DEBUG ("binding text domain %s to locale dir %s", GETTEXT_PACKAGE,
+ LOCALEDIR);
bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
#endif /* ENABLE_NLS */
#include "common.h"
#include "gstosssink.h"
+#include <gst/gst-i18n-plugin.h>
+
GST_DEBUG_CATEGORY_EXTERN (oss_debug);
#define GST_CAT_DEFAULT oss_debug
switch (errno) {
case EBUSY:
goto busy;
+ case EACCES:
+ goto no_permission;
default:
goto open_failed;
}
/* ERRORS */
busy:
{
- GST_ELEMENT_ERROR (oss, RESOURCE, BUSY, (NULL), (NULL));
+ GST_ELEMENT_ERROR (oss, RESOURCE, BUSY,
+ (_("Could not open audio device for playback. "
+ "Device is being used by another application.")), (NULL));
+ return FALSE;
+ }
+no_permission:
+ {
+ GST_ELEMENT_ERROR (oss, RESOURCE, OPEN_WRITE,
+ (_("Could not open audio device for playback."
+ "You don't have permission to open the device.")),
+ GST_ERROR_SYSTEM);
return FALSE;
}
open_failed:
{
- GST_ELEMENT_ERROR (oss, RESOURCE, OPEN_WRITE, (NULL), GST_ERROR_SYSTEM);
+ GST_ELEMENT_ERROR (oss, RESOURCE, OPEN_WRITE,
+ (_("Could not open audio device for playback.")), GST_ERROR_SYSTEM);
return FALSE;
}
}
#include "gstosssrc.h"
#include "common.h"
+#include <gst/gst-i18n-plugin.h>
+
GST_DEBUG_CATEGORY_EXTERN (oss_debug);
#define GST_CAT_DEFAULT oss_debug
mode |= O_NONBLOCK;
oss->fd = open (oss->device, mode, 0);
- if (oss->fd == -1)
- goto open_failed;
+ if (oss->fd == -1) {
+ switch (errno) {
+ case EACCES:
+ goto no_permission;
+ default:
+ goto open_failed;
+ }
+ }
if (!oss->mixer) {
oss->mixer = gst_ossmixer_new ("/dev/mixer", GST_OSS_MIXER_CAPTURE);
}
return TRUE;
+no_permission:
+ {
+ GST_ELEMENT_ERROR (oss, RESOURCE, OPEN_READ,
+ (_("Could not open audio device for recording."
+ "You don't have permission to open the device.")),
+ GST_ERROR_SYSTEM);
+ return FALSE;
+ }
open_failed:
{
GST_ELEMENT_ERROR (oss, RESOURCE, OPEN_READ,
+ (_("Could not open audio device for recording.")),
("Unable to open device %s for recording: %s",
- oss->device, g_strerror (errno)), (NULL));
+ oss->device, g_strerror (errno)));
return FALSE;
}
}