[svn-commits] file: branch 1.6.0 r115946 - in /branches/1.6.0: ./ channels/chan_alsa.c

[SVN commits to the Digium repositories]

Author: file
Date: Tue May 13 15:30:21 2008
New Revision: 115946

URL: http://svn.digium.com/view/asterisk?view=rev&rev=115946
Log:
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

........

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

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_alsa.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_alsa.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_alsa.c?view=diff&rev=115946&r1=115945&r2=115946
==============================================================================
--- branches/1.6.0/channels/chan_alsa.c (original)
+++ branches/1.6.0/channels/chan_alsa.c Tue May 13 15:30:21 2008
@@ -89,7 +89,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;
 
@@ -170,7 +169,7 @@
 	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;