Merged revisions 115945 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
r115945 | file | 2008-05-13 17:29:27 -0300 (Tue, 13 May 2008) | 12 lines

Merged revisions 115944 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r115944 | file | 2008-05-13 17:28:23 -0300 (Tue, 13 May 2008) | 4 lines

Use the right flag to open the audio in non-blocking.
(closes issue #12616)
Reported by: nicklewisdigiumuser

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@115946 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_alsa.c

@@ -89,7 +89,6 @@ static snd_pcm_format_t format = SND_PCM_FORMAT_S16_LE;
 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;
 
@@ -170,7 +169,7 @@ static snd_pcm_t *alsa_card_init(char *dev, snd_pcm_stream_t stream)
 	unsigned int rate = DESIRED_RATE;
 	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;