FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Applied patch from Martin Schlemmer for locking issue, see bug http://bugzilla.gnome.org/show_bug.cgi?id=102025

Browse Source 
Original commit message from CVS:
Applied patch from Martin Schlemmer for locking issue, see bug http://bugzilla.gnome.org/show_bug.cgi?id=102025
This commit is contained in:
Christian Schaller 2003-01-12 11:43:46 +00:00
parent 1bcd623c76
commit e250f197a5
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sys/oss/gstosscommon.c
View File

@ -281,9 +281,23 @@ gst_osscommon_open_audio (GstOssCommon *common, GstOssOpenMode mode, gchar **err
GST_INFO (GST_CAT_PLUGIN_INFO, "common: attempting to open sound device"); GST_INFO (GST_CAT_PLUGIN_INFO, "common: attempting to open sound device");
/* first try to open the sound card */ /* first try to open the sound card */
/* FIXME: this code is dubious, why do we need to open and close this ?*/ /* FIXME: This code is dubious, why do we need to open and close this ?
* For linux at least this causes the second open to never return
* if the device was already in use .. */
#ifndef __linux__
if (mode == GST_OSSCOMMON_WRITE) { if (mode == GST_OSSCOMMON_WRITE) {
#endif
common->fd = open (common->device, O_WRONLY | O_NONBLOCK); common->fd = open (common->device, O_WRONLY | O_NONBLOCK);
#ifdef __linux__
if (common->fd >= 0) {
/* remove the non-blocking flag */
if(fcntl (common->fd, F_SETFL, 0) < 0) {
*error = g_strdup_printf ("osscommon: Can't make filedescriptor blocking for %s",
common->device);
return FALSE;
}
}
#else
if (errno == EBUSY) { if (errno == EBUSY) {
g_warning ("osscommon: unable to open the sound device (in use ?)\n"); g_warning ("osscommon: unable to open the sound device (in use ?)\n");
} }
@ -297,9 +311,14 @@ gst_osscommon_open_audio (GstOssCommon *common, GstOssOpenMode mode, gchar **err
else { else {
common->fd = open (common->device, O_RDONLY); common->fd = open (common->device, O_RDONLY);
} }
#endif
if (common->fd < 0) { if (common->fd < 0) {
switch (errno) { switch (errno) {
case EBUSY:
*error = g_strdup_printf ("osscommon: Unable to open %s (in use ?)",
common->device);
break;
case EISDIR: case EISDIR:
*error = g_strdup_printf ("osscommon: Device %s is a directory", *error = g_strdup_printf ("osscommon: Device %s is a directory",
common->device); common->device);