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...
This commit is contained in:
Ronald S. Bultje 2004-03-13 05:38:13 +00:00
parent 1be2b9f2bd
commit f71358e5bd
2 changed files with 8 additions and 1 deletions

View file

@ -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),

View file

@ -348,7 +348,8 @@ gst_alsa_class_probe_devices (GstAlsaClass *klass,
for (num = 0; num < MAX_DEVICES; num++) {
dev = g_strdup_printf ("hw:%d", num);
if (!(res = snd_pcm_open (&pcm, dev, 0, 0))) {
if (!(res = snd_pcm_open (&pcm, dev, 0, SND_PCM_NONBLOCK)) ||
res == -EBUSY) {
klass->devices = g_list_append (klass->devices, dev);
snd_pcm_close (pcm);