From ab224e62dcce8cc5375963aa0cf339191feba977 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Sat, 13 Mar 2004 05:38:13 +0000 Subject: [PATCH] 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... --- ChangeLog | 6 ++++++ sys/oss/gstosselement.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 674ca71c23..a9847c1fbb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-03-13 Ronald Bultje + + * 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 * 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 637ea42761..7dfac6279c 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)