[svn-commits] file: branch 1.4 r79334 - in /branches/1.4: apps/ include/asterisk/ res/

[SVN commits to the Digium repositories]

Author: file
Date: Mon Aug 13 16:57:20 2007
New Revision: 79334

URL: http://svn.digium.com/view/asterisk?view=rev&rev=79334
Log:
Instead of accepting a single DTMF character accept a full string.

Modified:
    branches/1.4/apps/app_speech_utils.c
    branches/1.4/include/asterisk/speech.h
    branches/1.4/res/res_speech.c

Modified: branches/1.4/apps/app_speech_utils.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/apps/app_speech_utils.c?view=diff&rev=79334&r1=79333&r2=79334
==============================================================================
--- branches/1.4/apps/app_speech_utils.c (original)
+++ branches/1.4/apps/app_speech_utils.c Mon Aug 13 16:57:20 2007
@@ -722,7 +722,6 @@
                         /* Free the frame we received */
                         switch (f->frametype) {
                         case AST_FRAME_DTMF:
-				ast_speech_dtmf(speech, f->subclass);
 				if (dtmf_terminator != '\0' && f->subclass == dtmf_terminator) {
 					done = 1;
 				} else {
@@ -762,6 +761,7 @@
 		/* We sort of make a results entry */
 		speech->results = ast_calloc(1, sizeof(*speech->results));
 		if (speech->results != NULL) {
+			ast_speech_dtmf(speech, dtmf);
 			speech->results->score = 1000;
 			speech->results->text = strdup(dtmf);
 			speech->results->grammar = strdup("dtmf");

Modified: branches/1.4/include/asterisk/speech.h
URL: http://svn.digium.com/view/asterisk/branches/1.4/include/asterisk/speech.h?view=diff&rev=79334&r1=79333&r2=79334
==============================================================================
--- branches/1.4/include/asterisk/speech.h (original)
+++ branches/1.4/include/asterisk/speech.h Mon Aug 13 16:57:20 2007
@@ -84,7 +84,7 @@
 	/*! Write audio to the speech engine */
 	int (*write)(struct ast_speech *speech, void *data, int len);
 	/*! 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 */
 	int (*start)(struct ast_speech *speech);
 	/*! Change an engine specific setting */
@@ -133,7 +133,7 @@
 /*! \brief Write audio to the speech engine */
 int ast_speech_write(struct ast_speech *speech, void *data, int len);
 /*! \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 */
 int ast_speech_change(struct ast_speech *speech, char *name, const char *value);
 /*! \brief Change the type of results we want */

Modified: branches/1.4/res/res_speech.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/res/res_speech.c?view=diff&rev=79334&r1=79333&r2=79334
==============================================================================
--- branches/1.4/res/res_speech.c (original)
+++ branches/1.4/res/res_speech.c Mon Aug 13 16:57:20 2007
@@ -194,7 +194,7 @@
 }
 
 /*! \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;