diff options
| author | mattf <mattf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-05-09 17:20:20 +0000 |
|---|---|---|
| committer | mattf <mattf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-05-09 17:20:20 +0000 |
| commit | 3d23ec83e345e67bac8a297897b8a262fa33b637 (patch) | |
| tree | bf7357708386f929a5fd7ad900e0f199a2dc3090 /channels | |
| parent | 3e69f93c83c5252012e0579e75623c2620fef6ad (diff) | |
Make sure we only create a DSP if it's requested on SUB_REAL
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@63653 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_zap.c | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c index 3dea1aa5d..4d8d91440 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -5191,28 +5191,30 @@ static struct ast_channel *zt_new(struct zt_pvt *i, int state, int startpbx, int i->subs[index].linear = 0; zt_setlinear(i->subs[index].zfd, i->subs[index].linear); features = 0; - if (i->busydetect && CANBUSYDETECT(i)) { - features |= DSP_FEATURE_BUSY_DETECT; - } - if ((i->callprogress & 1) && CANPROGRESSDETECT(i)) { - features |= DSP_FEATURE_CALL_PROGRESS; - } - if ((!i->outgoing && (i->callprogress & 4)) || - (i->outgoing && (i->callprogress & 2))) { - features |= DSP_FEATURE_FAX_DETECT; - } + if (index == SUB_REAL) { + if (i->busydetect && CANBUSYDETECT(i)) { + features |= DSP_FEATURE_BUSY_DETECT; + } + if ((i->callprogress & 1) && CANPROGRESSDETECT(i)) { + features |= DSP_FEATURE_CALL_PROGRESS; + } + if ((!i->outgoing && (i->callprogress & 4)) || + (i->outgoing && (i->callprogress & 2))) { + features |= DSP_FEATURE_FAX_DETECT; + } #ifdef ZT_TONEDETECT - x = ZT_TONEDETECT_ON | ZT_TONEDETECT_MUTE; - if (ioctl(i->subs[index].zfd, ZT_TONEDETECT, &x)) { + x = ZT_TONEDETECT_ON | ZT_TONEDETECT_MUTE; + if (ioctl(i->subs[index].zfd, ZT_TONEDETECT, &x)) { #endif - i->hardwaredtmf = 0; - features |= DSP_FEATURE_DTMF_DETECT; + i->hardwaredtmf = 0; + features |= DSP_FEATURE_DTMF_DETECT; #ifdef ZT_TONEDETECT - } else if (NEED_MFDETECT(i)) { - i->hardwaredtmf = 1; - features |= DSP_FEATURE_DTMF_DETECT; - } + } else if (NEED_MFDETECT(i)) { + i->hardwaredtmf = 1; + features |= DSP_FEATURE_DTMF_DETECT; + } #endif + } if (features) { if (i->dsp) { ast_log(LOG_DEBUG, "Already have a dsp on %s?\n", tmp->name); |