diff options
author | Jason Parker <jparker@digium.com> | 2008-03-19 22:25:34 +0000 |
---|---|---|
committer | Jason Parker <jparker@digium.com> | 2008-03-19 22:25:34 +0000 |
commit | 9e3603dac9c84cbd6204ccc58c081fbc4fd3034a (patch) | |
tree | 92d567411c45399c63a2504af296191c91956bb0 /main/dsp.c | |
parent | 8d4276578a1e9b60f55647165b4e361647f6af3b (diff) |
Rename DSP_FEATURE_DTMF_DETECT, because we are *NOT* only detecting DTMF digits.
This was very misleading.
Early cleanup for issue #11968
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@110161 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/dsp.c')
-rw-r--r-- | main/dsp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/main/dsp.c b/main/dsp.c index 92d9a5725..8e16567a4 100644 --- a/main/dsp.c +++ b/main/dsp.c @@ -814,9 +814,9 @@ static int __ast_dsp_digitdetect(struct ast_dsp *dsp, short *s, int len, int *wr { int res = 0; - if ((dsp->features & DSP_FEATURE_DTMF_DETECT) && (dsp->digitmode & DSP_DIGITMODE_MF)) + if ((dsp->features & DSP_FEATURE_DIGIT_DETECT) && (dsp->digitmode & DSP_DIGITMODE_MF)) res = mf_detect(&dsp->digit_state, s, len, dsp->digitmode & DSP_DIGITMODE_RELAXDTMF, writeback); - else if (dsp->features & DSP_FEATURE_DTMF_DETECT) + else if (dsp->features & DSP_FEATURE_DIGIT_DETECT) res = dtmf_detect(&dsp->digit_state, s, len, dsp->digitmode & DSP_DIGITMODE_RELAXDTMF, writeback); if ((dsp->features & DSP_FEATURE_FAX_DETECT) && (dsp->faxmode & DSP_FAXMODE_DETECT_CNG)) { @@ -1278,7 +1278,7 @@ struct ast_frame *ast_dsp_process(struct ast_channel *chan, struct ast_dsp *dsp, ast_debug(1, "Requesting Hangup because the busy tone was detected on channel %s\n", chan->name); return &dsp->f; } - if (((dsp->features & DSP_FEATURE_DTMF_DETECT) || (dsp->features & DSP_FEATURE_FAX_DETECT))) { + if (((dsp->features & DSP_FEATURE_DIGIT_DETECT) || (dsp->features & DSP_FEATURE_FAX_DETECT))) { digit = __ast_dsp_digitdetect(dsp, shortdata, len, &writeback); #if 0 if (digit) |