diff options
| -rwxr-xr-x | apps/app_record.c | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/apps/app_record.c b/apps/app_record.c index c5da8f910..1d1416ac2 100755 --- a/apps/app_record.c +++ b/apps/app_record.c @@ -78,9 +78,8 @@ static int record_exec(struct ast_channel *chan, void *data) int dspsilence = 0; int silence = 0; /* amount of silence to allow */ int gotsilence = 0; /* did we timeout for silence? */ - int maxduration = 0; /* max duration of recording */ + int maxduration = 0; /* max duration of recording in milliseconds */ int gottimeout = 0; /* did we timeout for maxduration exceeded? */ - time_t timeout = 0; int option_skip = 0; int option_noanswer = 0; int option_append = 0; @@ -131,7 +130,8 @@ static int record_exec(struct ast_channel *chan, void *data) if (maxstr) { if ((sscanf(maxstr, "%d", &i) == 1) && (i > -1)) - maxduration = i; + /* Convert duration to milliseconds */ + maxduration = i * 1000; else if (!ast_strlen_zero(maxstr)) ast_log(LOG_WARNING, "'%s' is not a valid maximum duration\n", maxstr); } @@ -218,13 +218,18 @@ static int record_exec(struct ast_channel *chan, void *data) if (s) { - if (maxduration > 0) - timeout = time(NULL) + (time_t)maxduration; + int waitres; + + if (maxduration <= 0) + maxduration = -1; - while (ast_waitfor(chan, -1) > -1) { - if (maxduration > 0 && time(NULL) > timeout) { - gottimeout = 1; - break; + while ((waitres = ast_waitfor(chan, maxduration)) > -1) { + if (maxduration > 0) { + if (waitres == 0) { + gottimeout = 1; + break; + } + maxduration = waitres; } f = ast_read(chan); |