diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-08-31 13:32:11 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-08-31 13:32:11 +0000 |
| commit | efb40d0fe59817d10d6bcf2d545ae4ac0a887553 (patch) | |
| tree | 8b96ade1ef4f07a1645bf7bdbfc34fcaa2b725db /channels/chan_oss.c | |
| parent | 116b73cebbd211cbbeaaba949acc84178cf24784 (diff) | |
Merge NetBSD and Courtesty tone with modifications (bug #2329)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3686 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_oss.c')
| -rwxr-xr-x | channels/chan_oss.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/channels/chan_oss.c b/channels/chan_oss.c index abf399ad1..a74a9d847 100755 --- a/channels/chan_oss.c +++ b/channels/chan_oss.c @@ -47,7 +47,7 @@ #include "answer.h" /* Which device to use */ -#ifdef __OpenBSD__ +#if defined( __OpenBSD__ ) || defined( __NetBSD__ ) #define DEV_DSP "/dev/audio" #else #define DEV_DSP "/dev/dsp" @@ -375,7 +375,7 @@ static int soundcard_setoutput(int force) return 0; readmode = 0; if (force || time_has_passed()) { - ioctl(sounddev, SNDCTL_DSP_RESET); + ioctl(sounddev, SNDCTL_DSP_RESET, 0); /* Keep the same fd reserved by closing the sound device and copying stdin at the same time. */ /* dup2(0, sound); */ @@ -405,7 +405,7 @@ static int soundcard_setinput(int force) return 0; readmode = -1; if (force || time_has_passed()) { - ioctl(sounddev, SNDCTL_DSP_RESET); + ioctl(sounddev, SNDCTL_DSP_RESET, 0); close(sounddev); /* dup2(0, sound); */ fd = open(DEV_DSP, O_RDONLY | O_NONBLOCK); |