mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-06 12:36:58 +00:00
Fix timeout issue when utterance is longer then timeout itself.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53601 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -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)
|
static int speech_background(struct ast_channel *chan, void *data)
|
||||||
{
|
{
|
||||||
unsigned int timeout = 0;
|
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_module_user *u = NULL;
|
||||||
struct ast_speech *speech = find_speech(chan);
|
struct ast_speech *speech = find_speech(chan);
|
||||||
struct ast_frame *f = NULL;
|
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) {
|
if (ast_test_flag(speech, AST_SPEECH_QUIET) && chan->stream != NULL) {
|
||||||
ast_stopstream(chan);
|
ast_stopstream(chan);
|
||||||
ast_clear_flag(speech, AST_SPEECH_QUIET);
|
ast_clear_flag(speech, AST_SPEECH_QUIET);
|
||||||
|
quieted = 1;
|
||||||
}
|
}
|
||||||
/* Check state so we can see what to do */
|
/* Check state so we can see what to do */
|
||||||
switch (speech->state) {
|
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 audio playback has stopped do a check for timeout purposes */
|
||||||
if (chan->streamid == -1 && chan->timingfunc == NULL)
|
if (chan->streamid == -1 && chan->timingfunc == NULL)
|
||||||
ast_stopstream(chan);
|
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);
|
time(&start);
|
||||||
started = 1;
|
started = 1;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user