kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-19 11:42:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle DTMF properly when combined with other events

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6964 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2005-11-05 22:30:31 +00:00
parent da0d0f975a
commit 994b9db081
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
channels/chan_zap.c
View File

@@ -2937,7 +2937,10 @@ static void disable_dtmf_detect(struct zt_pvt *p)
val = 0; val = 0;
ioctl(p->subs[SUB_REAL].zfd, ZT_TONEDETECT, &val); ioctl(p->subs[SUB_REAL].zfd, ZT_TONEDETECT, &val);
#endif #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) 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; val = ZT_TONEDETECT_ON | ZT_TONEDETECT_MUTE;
ioctl(p->subs[SUB_REAL].zfd, ZT_TONEDETECT, &val); ioctl(p->subs[SUB_REAL].zfd, ZT_TONEDETECT, &val);
#endif #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) 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 (f->frametype == AST_FRAME_DTMF) {
if ((who == c0) && p0->pulsedial) { if ((who == c0) && p0->pulsedial) {
ast_write(c1, f); ast_write(c1, f);
} else if (p1->pulsedial) { } else if ((who == c1) && p1->pulsedial) {
ast_write(c0, f); ast_write(c0, f);
} else { } else {
*fo = f; *fo = f;