[Freeswitch-trunk] [commit] r3822 - freeswitch/trunk/src/mod/applications/mod_rss

[Freeswitch SVN]

Author: mikej
Date: Sat Dec 23 21:24:16 2006
New Revision: 3822

Modified:
   freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c

Log:
update mod_rss to match new switch_ivr_speak_text_handle api.

Modified: freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c	(original)
+++ freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c	Sat Dec 23 21:24:16 2006
@@ -184,6 +184,7 @@
 	char buf[1024];
 	int32_t jumpto = -1;
 	uint32_t matches = 0;
+	switch_input_args_t args = {0};
 
 	channel = switch_core_session_get_channel(session);
     assert(channel != NULL);
@@ -324,14 +325,15 @@
 			snprintf(buf + len, sizeof(buf) - len, "<break time=\"2000ms\"/>");
 			len = (int32_t)strlen(buf);
 
+			args.input_callback = NULL;
+			args.buf = cmd;
+			args.buflen = sizeof(cmd);
 			status = switch_ivr_speak_text_handle(session,
 												  &sh,
 												  &speech_codec,
 												  timerp,
-												  NULL,
 												  buf,
-												  cmd,
-												  sizeof(cmd));
+												  &args);
 			if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) {
 				goto finished;
 			}
@@ -370,14 +372,15 @@
 			} else if (matches > 1) {
 				
 			} else {
+				args.input_callback = NULL;
+				args.buf = NULL;
+				args.buflen = 0;
 				status = switch_ivr_speak_text_handle(session,
 													  &sh,
 													  &speech_codec,
 													  timerp,
-													  NULL,
 													  "I'm sorry. That is an Invalid Selection. ",
-													  NULL,
-													  0);
+													  &args);
 				if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) {
 					goto finished;
 				}
@@ -492,14 +495,15 @@
 
 			snprintf(buf, sizeof(buf), ",<break time=\"500ms\"/>%s. %s. %s. local time: %s, Press 0 for options, 5 to change voice, or pound to return to the main menu. ", 
 					 title_txt, description_txt, rights_txt, date);
+			args.input_callback = NULL;
+			args.buf = cmd;
+			args.buflen = sizeof(cmd);
 			status = switch_ivr_speak_text_handle(session,
 												  &sh,
 												  &speech_codec,
 												  timerp,
-												  NULL,
 												  buf,
-												  cmd,
-												  sizeof(cmd));
+												  &args);
 			if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) {
 				goto finished;
 			}
@@ -591,14 +595,15 @@
 						}
 					}
 					switch_core_speech_flush_tts(&sh);
+					args.input_callback = on_dtmf;
+					args.buf = &dtb;
+					args.buflen = sizeof(dtb);
 					status = switch_ivr_speak_text_handle(session,
 														  &sh,
 														  &speech_codec,
 														  timerp,
-														  on_dtmf,
 														  buf,
-														  &dtb,
-														  sizeof(dtb));
+														  &args);
 					if (status == SWITCH_STATUS_BREAK) {
 						continue;
 					} else if (status != SWITCH_STATUS_SUCCESS) {
@@ -611,14 +616,15 @@
 					}
 					
 					if (entries[dtb.index].description_txt) {
+						args.input_callback = on_dtmf;
+						args.buf = &dtb;
+						args.buflen = sizeof(dtb);
 						status = switch_ivr_speak_text_handle(session,
 															  &sh,
 															  &speech_codec,
 															  timerp,
-															  on_dtmf,
 															  entries[dtb.index].description_txt,
-															  &dtb,
-															  sizeof(dtb));
+															  &args);
 					}
 					if (status == SWITCH_STATUS_BREAK) {
 						continue;