Commit f71358e5 authored by Ronald S. Bultje's avatar Ronald S. Bultje
Browse files

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...
parent 1be2b9f2
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> 2004-03-12 Ronald Bultje <rbultje@ronald.bitfreak.net>
* ext/alsa/gstalsa.c: (gst_alsa_get_type), (gst_alsa_class_init), * ext/alsa/gstalsa.c: (gst_alsa_get_type), (gst_alsa_class_init),
......
...@@ -348,7 +348,8 @@ gst_alsa_class_probe_devices (GstAlsaClass *klass, ...@@ -348,7 +348,8 @@ gst_alsa_class_probe_devices (GstAlsaClass *klass,
for (num = 0; num < MAX_DEVICES; num++) { for (num = 0; num < MAX_DEVICES; num++) {
dev = g_strdup_printf ("hw:%d", 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); klass->devices = g_list_append (klass->devices, dev);
snd_pcm_close (pcm); snd_pcm_close (pcm);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment