[asterisk-commits] file: branch 1.4 r115944 - /branches/1.4/channels/chan_alsa.c

[SVN commits to the Asterisk project]

Author: file
Date: Tue May 13 15:28:23 2008
New Revision: 115944

URL: http://svn.digium.com/view/asterisk?view=rev&rev=115944
Log:
Use the right flag to open the audio in non-blocking.
(closes issue #12616)
Reported by: nicklewisdigiumuser

Modified:
    branches/1.4/channels/chan_alsa.c

Modified: branches/1.4/channels/chan_alsa.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/chan_alsa.c?view=diff&rev=115944&r1=115943&r2=115944
==============================================================================
--- branches/1.4/channels/chan_alsa.c (original)
+++ branches/1.4/channels/chan_alsa.c Tue May 13 15:28:23 2008
@@ -105,7 +105,6 @@
 static snd_pcm_format_t format = SND_PCM_FORMAT_S16_BE;
 #endif
 
-/* static int block = O_NONBLOCK; */
 static char indevname[50] = ALSA_INDEV;
 static char outdevname[50] = ALSA_OUTDEV;
 
@@ -360,7 +359,7 @@
 	/* unsigned int per_max = 8; */
 	snd_pcm_uframes_t start_threshold, stop_threshold;
 
-	err = snd_pcm_open(&handle, dev, stream, O_NONBLOCK);
+	err = snd_pcm_open(&handle, dev, stream, SND_PCM_NONBLOCK);
 	if (err < 0) {
 		ast_log(LOG_ERROR, "snd_pcm_open failed: %s\n", snd_strerror(err));
 		return NULL;