summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--sys/oss/gstosselement.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 674ca71c..a9847c1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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)