Merged revisions 53601 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Thu, 8 Feb 2007 17:56:53 +0000 (17:56 +0000)
committerJoshua Colp <jcolp@digium.com>
Thu, 8 Feb 2007 17:56:53 +0000 (17:56 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r53601 | file | 2007-02-08 12:54:32 -0500 (Thu, 08 Feb 2007) | 2 lines

Fix timeout issue when utterance is longer then timeout itself.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@53602 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_speech_utils.c

index 211cca5..dc80dd9 100644 (file)
@@ -505,7 +505,7 @@ static int speech_streamfile(struct ast_channel *chan, const char *filename, con
 static int speech_background(struct ast_channel *chan, void *data)
 {
         unsigned int timeout = 0;
-        int res = 0, done = 0, argc = 0, started = 0;
+        int res = 0, done = 0, argc = 0, started = 0, quieted = 0;
         struct ast_module_user *u = NULL;
         struct ast_speech *speech = find_speech(chan);
         struct ast_frame *f = NULL;
@@ -602,6 +602,7 @@ static int speech_background(struct ast_channel *chan, void *data)
                 if (ast_test_flag(speech, AST_SPEECH_QUIET) && chan->stream != NULL) {
                         ast_stopstream(chan);
                        ast_clear_flag(speech, AST_SPEECH_QUIET);
+                       quieted = 1;
                 }
                 /* Check state so we can see what to do */
                 switch (speech->state) {
@@ -609,7 +610,7 @@ static int speech_background(struct ast_channel *chan, void *data)
                         /* If audio playback has stopped do a check for timeout purposes */
                         if (chan->streamid == -1 && chan->timingfunc == NULL)
                                 ast_stopstream(chan);
-                        if (chan->stream == NULL && timeout > 0 && started == 0 && !filename_tmp) {
+                        if (!quieted && chan->stream == NULL && timeout > 0 && started == 0 && !filename_tmp) {
                                time(&start);
                                started = 1;
                         }