aboutsummaryrefslogtreecommitdiffstats
path: root/channels
diff options
context:
space:
mode:
authorfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2008-05-13 20:28:23 +0000
committerfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2008-05-13 20:28:23 +0000
commit9b672fb213eb8fa70d78b1cc2f0e1fd21b26fa29 (patch)
treebbcf77208680fe7164c17f06b77a3c1391394bda /channels
parent56011190f7df52e5fa2e6db68438b741d0e27ca0 (diff)
Use the right flag to open the audio in non-blocking.
(closes issue #12616) Reported by: nicklewisdigiumuser git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@115944 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_alsa.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c
index 9a416837b..d5817493f 100644
--- a/channels/chan_alsa.c
+++ b/channels/chan_alsa.c
@@ -105,7 +105,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;
@@ -360,7 +359,7 @@ static snd_pcm_t *alsa_card_init(char *dev, snd_pcm_stream_t stream)
/* 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;