kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-24 13:50:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 79334 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r79334 | file | 2007-08-13 18:57:20 -0300 (Mon, 13 Aug 2007) | 2 lines

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

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79335 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2007-08-13 21:59:15 +00:00
parent c41121cdbb
commit 94b1dda1fa
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/app_speech_utils.c
View File

@@ -662,7 +662,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 {
@@ -702,6 +701,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 = ast_strdup(dtmf); speech->results->text = ast_strdup(dtmf);
speech->results->grammar = ast_strdup("dtmf"); speech->results->grammar = ast_strdup("dtmf");

4
include/asterisk/speech.h
View File

@@ -88,7 +88,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 */
@@ -137,7 +137,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 */

2
res/res_speech.c
View File

@@ -154,7 +154,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;