kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-24 14:56:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 63654 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r63654 | mattf | 2007-05-09 12:25:21 -0500 (Wed, 09 May 2007) | 10 lines

Merged revisions 63653 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r63653 | mattf | 2007-05-09 12:20:20 -0500 (Wed, 09 May 2007) | 2 lines

Make sure we only create a DSP if it's requested on SUB_REAL

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@63655 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Fredrickson
2007-05-09 17:35:54 +00:00
parent 7e10164e20
commit e2ca869abd
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
channels/chan_zap.c
View File

@@ -5580,6 +5580,7 @@ static struct ast_channel *zt_new(struct zt_pvt *i, int state, int startpbx, int
i->subs[index].linear = 0; i->subs[index].linear = 0;
zt_setlinear(i->subs[index].zfd, i->subs[index].linear); zt_setlinear(i->subs[index].zfd, i->subs[index].linear);
features = 0; features = 0;
if (index == SUB_REAL) {
if (i->busydetect && CANBUSYDETECT(i)) if (i->busydetect && CANBUSYDETECT(i))
features |= DSP_FEATURE_BUSY_DETECT; features |= DSP_FEATURE_BUSY_DETECT;
if ((i->callprogress & 1) && CANPROGRESSDETECT(i)) if ((i->callprogress & 1) && CANPROGRESSDETECT(i))
@@ -5600,6 +5601,7 @@ static struct ast_channel *zt_new(struct zt_pvt *i, int state, int startpbx, int
features |= DSP_FEATURE_DTMF_DETECT; features |= DSP_FEATURE_DTMF_DETECT;
} }
#endif #endif
}
if (features) { if (features) {
if (i->dsp) { if (i->dsp) {
if (option_debug) if (option_debug)