diff options
| author | Joshua Colp <jcolp@digium.com> | 2007-07-25 22:18:56 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2007-07-25 22:18:56 +0000 |
| commit | 1c783e8cfbd321fa82da35c3fcd9d7b9df861d5b (patch) | |
| tree | 99ebf54cdd76e0dbb2ef8afb6593c07eb55f9f1d /apps/app_speech_utils.c | |
| parent | 546c742106fae0c1edf997339035dbf822c74ed1 (diff) | |
Merged revisions 77176 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r77176 | file | 2007-07-25 19:16:10 -0300 (Wed, 25 Jul 2007) | 4 lines
(closes issue #10303)
Reported by: jtodd
Add SPEECH_DTMF_TERMINATOR variable so the user can specify the digit to terminate a DTMF string with. If none is specified then no terminator will be used.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@77182 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_speech_utils.c')
| -rw-r--r-- | apps/app_speech_utils.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/apps/app_speech_utils.c b/apps/app_speech_utils.c index fe77b7f52..113ff6bdd 100644 --- a/apps/app_speech_utils.c +++ b/apps/app_speech_utils.c @@ -495,7 +495,7 @@ static int speech_background(struct ast_channel *chan, void *data) char dtmf[AST_MAX_EXTENSION] = ""; time_t start, current; struct ast_datastore *datastore = NULL; - char *argv[2], *args = NULL, *filename_tmp = NULL, *filename = NULL, tmp[2] = ""; + char *argv[2], *args = NULL, *filename_tmp = NULL, *filename = NULL, tmp[2] = "", dtmf_terminator = '#'; const char *tmp2 = NULL; args = ast_strdupa(data); @@ -530,6 +530,14 @@ static int speech_background(struct ast_channel *chan, void *data) if ((tmp2 = pbx_builtin_getvar_helper(chan, "SPEECH_DTMF_MAXLEN")) && !ast_strlen_zero(tmp2)) max_dtmf_len = atoi(tmp2); + /* See if a terminator is specified */ + if ((tmp2 = pbx_builtin_getvar_helper(chan, "SPEECH_DTMF_TERMINATOR"))) { + if (ast_strlen_zero(tmp2)) + dtmf_terminator = '\0'; + else + dtmf_terminator = tmp2[0]; + } + /* Before we go into waiting for stuff... make sure the structure is ready, if not - start it again */ if (speech->state == AST_SPEECH_STATE_NOT_READY || speech->state == AST_SPEECH_STATE_DONE) { ast_speech_change_state(speech, AST_SPEECH_STATE_NOT_READY); @@ -651,7 +659,7 @@ static int speech_background(struct ast_channel *chan, void *data) /* Free the frame we received */ switch (f->frametype) { case AST_FRAME_DTMF: - if (f->subclass == '#') { + if (dtmf_terminator != '\0' && f->subclass == dtmf_terminator) { done = 1; } else { if (chan->stream != NULL) { |