aboutsummaryrefslogtreecommitdiffstats
path: root/channels/chan_alsa.c
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2008-05-14 14:44:20 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2008-05-14 14:44:20 +0000
commit0d0750b1b200901f2c49061aae1f5ade9953dde3 (patch)
tree6c8aba2263c629769b63b1a94c4c0ea3120f948a /channels/chan_alsa.c
parent82562a032ea5e706e5753d296b00331031a5c457 (diff)
parent192468bae9997f24dd33ec6309f9d56f8de86fc0 (diff)
Creating tag for the release of asterisk-1.6.0-beta9
git-svn-id: http://svn.digium.com/svn/asterisk/tags/1.6.0-beta9@116245 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_alsa.c')
-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 3e9199fce..27c372608 100644
--- a/channels/chan_alsa.c
+++ b/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;