From 1212c95e552987282b8a0d502739787debab428a Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Fri, 9 Jun 2006 19:54:53 +0000 Subject: [PATCH] tweak ivr git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@1589 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/mod/applications/mod_rss/mod_rss.c | 27 +++++++++++++++----------- src/switch_ivr.c | 2 ++ 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/src/mod/applications/mod_rss/mod_rss.c b/src/mod/applications/mod_rss/mod_rss.c index 4f49cba6d9..27b4c59b7e 100644 --- a/src/mod/applications/mod_rss/mod_rss.c +++ b/src/mod/applications/mod_rss/mod_rss.c @@ -131,7 +131,6 @@ static void rss_function(switch_core_session_t *session, char *data) { switch_channel_t *channel; switch_status_t status; - switch_frame_t *read_frame; const char *err = NULL; struct dtmf_buffer dtb = {0}; switch_xml_t xml = NULL, item, xchannel = NULL; @@ -186,13 +185,6 @@ static void rss_function(switch_core_session_t *session, char *data) switch_channel_answer(channel); - for (dtb.index = 0; dtb.index < 10; dtb.index++) { - if ((status = switch_core_session_read_frame(session, &read_frame, -1, 0)) != SWITCH_STATUS_SUCCESS) { - switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); - goto done; - } - } - if (!switch_strlen_zero(data)) { if ((mydata = switch_core_session_strdup(session, data))) { @@ -312,9 +304,21 @@ static void rss_function(switch_core_session_t *session, char *data) } i = atoi(cmd) - 1; - - if (i >= 0 && i <= feed_index) { + + if (i > -1 && i < feed_index) { filename = feed_list[i]; + } else { + status = switch_ivr_speak_text_handle(session, + &sh, + &speech_codec, + timerp, + NULL, + "I'm sorry. That is an Invalid Selection. ", + NULL, + 0); + if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) { + goto finished; + } } } @@ -323,6 +327,7 @@ static void rss_function(switch_core_session_t *session, char *data) } + if (!(xml = switch_xml_parse_file(filename))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", filename); goto finished; @@ -571,7 +576,7 @@ static void rss_function(switch_core_session_t *session, char *data) switch_core_timer_destroy(&timer); } - done: + switch_xml_free(xml); switch_core_session_reset(session); diff --git a/src/switch_ivr.c b/src/switch_ivr.c index 44bf1baa98..902a441115 100644 --- a/src/switch_ivr.c +++ b/src/switch_ivr.c @@ -534,7 +534,9 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_speak_text_handle(switch_core_session len = samples * 2; flags = 0; + switch_sleep(200000); switch_core_speech_feed_tts(sh, text, &flags); + write_frame.rate = sh->rate; memset(write_frame.data, 0, len);