diff options
| author | Mark Spencer <markster@digium.com> | 2005-11-05 22:30:31 +0000 |
|---|---|---|
| committer | Mark Spencer <markster@digium.com> | 2005-11-05 22:30:31 +0000 |
| commit | 994b9db081c7351eb8f046d93e61013e9ccfa817 (patch) | |
| tree | 77e42f77c871bb0309104d971c60e3d9c3153dfa /channels | |
| parent | da0d0f975a4d002d0345b8560057dbf800dea0d0 (diff) | |
Handle DTMF properly when combined with other events
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6964 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
| -rwxr-xr-x | channels/chan_zap.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c index 4d9073416..dd0dcb64a 100755 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -2937,7 +2937,10 @@ static void disable_dtmf_detect(struct zt_pvt *p) val = 0; ioctl(p->subs[SUB_REAL].zfd, ZT_TONEDETECT, &val); #endif - + if (!p->hardwaredtmf && p->dsp) { + p->dsp_features &= ~DSP_FEATURE_DTMF_DETECT; + ast_dsp_set_features(p->dsp, p->dsp_features); + } } static void enable_dtmf_detect(struct zt_pvt *p) @@ -2952,6 +2955,10 @@ static void enable_dtmf_detect(struct zt_pvt *p) val = ZT_TONEDETECT_ON | ZT_TONEDETECT_MUTE; ioctl(p->subs[SUB_REAL].zfd, ZT_TONEDETECT, &val); #endif + if (!p->hardwaredtmf && p->dsp) { + p->dsp_features |= DSP_FEATURE_DTMF_DETECT; + ast_dsp_set_features(p->dsp, p->dsp_features); + } } static enum ast_bridge_result zt_bridge(struct ast_channel *c0, struct ast_channel *c1, int flags, struct ast_frame **fo, struct ast_channel **rc, int timeoutms) @@ -3198,7 +3205,7 @@ static enum ast_bridge_result zt_bridge(struct ast_channel *c0, struct ast_chann if (f->frametype == AST_FRAME_DTMF) { if ((who == c0) && p0->pulsedial) { ast_write(c1, f); - } else if (p1->pulsedial) { + } else if ((who == c1) && p1->pulsedial) { ast_write(c0, f); } else { *fo = f; |