Instead of accepting a single DTMF character accept a full string.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@79334 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2007-08-13 21:57:20 +00:00
parent f2de04d1d1
commit 924c88d3d0
3 changed files with 4 additions and 4 deletions

View File

@@ -722,7 +722,6 @@ static int speech_background(struct ast_channel *chan, void *data)
/* Free the frame we received */ /* Free the frame we received */
switch (f->frametype) { switch (f->frametype) {
case AST_FRAME_DTMF: case AST_FRAME_DTMF:
ast_speech_dtmf(speech, f->subclass);
if (dtmf_terminator != '\0' && f->subclass == dtmf_terminator) { if (dtmf_terminator != '\0' && f->subclass == dtmf_terminator) {
done = 1; done = 1;
} else { } else {
@@ -762,6 +761,7 @@ static int speech_background(struct ast_channel *chan, void *data)
/* We sort of make a results entry */ /* We sort of make a results entry */
speech->results = ast_calloc(1, sizeof(*speech->results)); speech->results = ast_calloc(1, sizeof(*speech->results));
if (speech->results != NULL) { if (speech->results != NULL) {
ast_speech_dtmf(speech, dtmf);
speech->results->score = 1000; speech->results->score = 1000;
speech->results->text = strdup(dtmf); speech->results->text = strdup(dtmf);
speech->results->grammar = strdup("dtmf"); speech->results->grammar = strdup("dtmf");

View File

@@ -84,7 +84,7 @@ struct ast_speech_engine {
/*! Write audio to the speech engine */ /*! Write audio to the speech engine */
int (*write)(struct ast_speech *speech, void *data, int len); int (*write)(struct ast_speech *speech, void *data, int len);
/*! Signal DTMF was received */ /*! Signal DTMF was received */
int (*dtmf)(struct ast_speech *speech, char dtmf); int (*dtmf)(struct ast_speech *speech, const char *dtmf);
/*! Prepare engine to accept audio */ /*! Prepare engine to accept audio */
int (*start)(struct ast_speech *speech); int (*start)(struct ast_speech *speech);
/*! Change an engine specific setting */ /*! Change an engine specific setting */
@@ -133,7 +133,7 @@ int ast_speech_destroy(struct ast_speech *speech);
/*! \brief Write audio to the speech engine */ /*! \brief Write audio to the speech engine */
int ast_speech_write(struct ast_speech *speech, void *data, int len); int ast_speech_write(struct ast_speech *speech, void *data, int len);
/*! \brief Signal to the engine that DTMF was received */ /*! \brief Signal to the engine that DTMF was received */
int ast_speech_dtmf(struct ast_speech *speech, char dtmf); int ast_speech_dtmf(struct ast_speech *speech, const char *dtmf);
/*! \brief Change an engine specific attribute */ /*! \brief Change an engine specific attribute */
int ast_speech_change(struct ast_speech *speech, char *name, const char *value); int ast_speech_change(struct ast_speech *speech, char *name, const char *value);
/*! \brief Change the type of results we want */ /*! \brief Change the type of results we want */

View File

@@ -194,7 +194,7 @@ int ast_speech_write(struct ast_speech *speech, void *data, int len)
} }
/*! \brief Signal to the engine that DTMF was received */ /*! \brief Signal to the engine that DTMF was received */
int ast_speech_dtmf(struct ast_speech *speech, char dtmf) int ast_speech_dtmf(struct ast_speech *speech, const char *dtmf)
{ {
int res = 0; int res = 0;