kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-05-04 04:16:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge NetBSD and Courtesty tone with modifications (bug #2329)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3686 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-08-31 13:32:11 +00:00
parent 6749f1b8b5
commit 2a108b9b06
12 changed files with 52 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
channels/chan_oss.c
View File

@@ -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);