kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-08-13 17:38:59 +00:00
Code Issues Projects Releases Wiki Activity

MODAPP-325 part 1

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@14981 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Brian West
2009-09-25 19:07:20 +00:00
parent a9936c09e8
commit 3bc20b3c43
9 changed files with 78 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/switch_ivr.c
View File

@@ -815,21 +815,23 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_park(switch_core_session_t *session,
return status;
}
SWITCH_DECLARE(switch_status_t) switch_ivr_collect_digits_callback(switch_core_session_t *session, switch_input_args_t *args, uint32_t timeout)
SWITCH_DECLARE(switch_status_t) switch_ivr_collect_digits_callback(switch_core_session_t *session, switch_input_args_t *args, uint32_t digit_timeout, uint32_t abs_timeout)
{
switch_channel_t *channel = switch_core_session_get_channel(session);
switch_status_t status = SWITCH_STATUS_SUCCESS;
switch_time_t started = 0;
uint32_t elapsed;
switch_time_t abs_started = 0, digit_started = 0;
uint32_t abs_elapsed = 0, digit_elapsed = 0;
if (!args || !args->input_callback) {
return SWITCH_STATUS_GENERR;
}
if (timeout) {
started = switch_micro_time_now();
if (abs_timeout) {
abs_started = switch_micro_time_now();
}
if (digit_timeout) {
digit_started = switch_micro_time_now();
}
while (switch_channel_ready(channel)) {
switch_frame_t *read_frame = NULL;
switch_event_t *event;
@@ -841,9 +843,17 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_collect_digits_callback(switch_core_s
break;
}
if (timeout) {
elapsed = (uint32_t) ((switch_micro_time_now() - started) / 1000);
if (elapsed >= timeout) {
if (abs_timeout) {
abs_elapsed = (uint32_t) ((switch_micro_time_now() - abs_started) / 1000);
if (abs_elapsed >= abs_timeout) {
status = SWITCH_STATUS_TIMEOUT;
break;
}
}
if (digit_timeout) {
digit_elapsed = (uint32_t) ((switch_micro_time_now() - digit_started) / 1000);
if (digit_elapsed >= digit_timeout) {
status = SWITCH_STATUS_TIMEOUT;
break;
}
}
@@ -855,6 +865,9 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_collect_digits_callback(switch_core_s
if (switch_channel_has_dtmf(channel)) {
switch_channel_dequeue_dtmf(channel, &dtmf);
status = args->input_callback(session, (void *) &dtmf, SWITCH_INPUT_TYPE_DTMF, args->buf, args->buflen);
if (digit_timeout) {
digit_started = switch_micro_time_now();
}
}
if (switch_core_session_dequeue_event(session, &event, SWITCH_FALSE) == SWITCH_STATUS_SUCCESS) {