alsa: pass SND_PCM_NONBLOCK when opening device during unsuspend, the same way we...
authorLennart Poettering <lennart@poettering.net>
Wed, 9 Sep 2009 02:44:51 +0000 (04:44 +0200)
committerLennart Poettering <lennart@poettering.net>
Wed, 9 Sep 2009 02:44:51 +0000 (04:44 +0200)
src/modules/alsa/alsa-sink.c
src/modules/alsa/alsa-source.c

index c4ff10d..7fe7783 100644 (file)
@@ -950,7 +950,7 @@ static int unsuspend(struct userdata *u) {
     pa_log_info("Trying resume...");
 
     if ((err = snd_pcm_open(&u->pcm_handle, u->device_name, SND_PCM_STREAM_PLAYBACK,
-                            /*SND_PCM_NONBLOCK|*/
+                            SND_PCM_NONBLOCK|
                             SND_PCM_NO_AUTO_RESAMPLE|
                             SND_PCM_NO_AUTO_CHANNELS|
                             SND_PCM_NO_AUTO_FORMAT)) < 0) {
index 5f89d88..a7f2a01 100644 (file)
@@ -897,7 +897,7 @@ static int unsuspend(struct userdata *u) {
     pa_log_info("Trying resume...");
 
     if ((err = snd_pcm_open(&u->pcm_handle, u->device_name, SND_PCM_STREAM_CAPTURE,
-                            /*SND_PCM_NONBLOCK|*/
+                            SND_PCM_NONBLOCK|
                             SND_PCM_NO_AUTO_RESAMPLE|
                             SND_PCM_NO_AUTO_CHANNELS|
                             SND_PCM_NO_AUTO_FORMAT)) < 0) {