diff options
| author | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2004-03-13 05:38:13 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2004-03-13 05:38:13 +0000 |
| commit | ab224e62dcce8cc5375963aa0cf339191feba977 (patch) | |
| tree | 435d695718f89d6d6f928ead7e9d0cb31ffea88e | |
| parent | 3447d073b8243912b912e8a9915bc03668dfe640 (diff) | |
Don't block during probing...
Original commit message from CVS:
* ext/alsa/gstalsa.c: (gst_alsa_class_probe_devices):
* sys/oss/gstosselement.c: (gst_osselement_class_probe_devices):
Don't block during probing...
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | sys/oss/gstosselement.c | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,9 @@ +2004-03-13 Ronald Bultje <rbultje@ronald.bitfreak.net> + + * ext/alsa/gstalsa.c: (gst_alsa_class_probe_devices): + * sys/oss/gstosselement.c: (gst_osselement_class_probe_devices): + Don't block during probing... + 2004-03-12 Ronald Bultje <rbultje@ronald.bitfreak.net> * ext/alsa/gstalsa.c: (gst_alsa_get_type), (gst_alsa_class_init), diff --git a/sys/oss/gstosselement.c b/sys/oss/gstosselement.c index 637ea427..7dfac627 100644 --- a/sys/oss/gstosselement.c +++ b/sys/oss/gstosselement.c @@ -296,7 +296,7 @@ gst_osselement_class_probe_devices (GstOssElementClass *klass, * we don't need a mixer anyway (says OSS)... If we are a * mixer element, we use the mixer anyway. */ if ((fd = open (mixer ? mixer : - dsp, openmode)) > 0 || errno == EBUSY) { + dsp, openmode | O_NONBLOCK)) > 0 || errno == EBUSY) { GstOssDeviceCombination *combi; if (fd > 0) |