add optional module param to lang stuff

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5924 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/switch_ivr_play_say.c b/src/switch_ivr_play_say.c
index 485d4fa66a8f4298d315e2844103f39466243e34..ac4e7a936b1c523358c33aed64040f685fb42320 100644 (file)
--- a/src/switch_ivr_play_say.c
+++ b/src/switch_ivr_play_say.c
@@ -97,6 +97,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_phrase_macro(switch_core_session_t *s
        char *lname = NULL, *mname = NULL, hint_data[1024] = "", enc_hint[1024] = "";
        switch_status_t status = SWITCH_STATUS_GENERR;
        char *old_sound_prefix = NULL, *sound_path = NULL, *tts_engine = NULL, *tts_voice = NULL, *chan_lang = NULL;
+       const char *module_name = NULL;
        switch_channel_t *channel;
        uint8_t done = 0;
 
@@ -118,6 +119,8 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_phrase_macro(switch_core_session_t *s
                chan_lang = lang;
        }
 
+       module_name = chan_lang;
+
        if (!data) {
                data = "";
        }
@@ -142,6 +145,11 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_phrase_macro(switch_core_session_t *s
 
        while (language) {
                if ((lname = (char *) switch_xml_attr(language, "name")) && !strcasecmp(lname, chan_lang)) {
+                       const char *tmp;
+
+                       if ((tmp = switch_xml_attr(language, "module"))) {
+                               module_name = tmp;
+                       }
                        break;
                }
                language = language->next;
@@ -245,7 +253,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_phrase_macro(switch_core_session_t *s
                                                odata = expanded;
                                        }
 
-                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Handle %s:[%s] (%s)\n", func, odata, chan_lang);
+                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Handle %s:[%s] (%s:%s)\n", func, odata, chan_lang, module_name);
 
                                        if (!strcasecmp(func, "play-file")) {
                                                status = switch_ivr_play_file(session, NULL, odata, args);
@@ -256,13 +264,13 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_phrase_macro(switch_core_session_t *s
 
                                        } else if (!strcasecmp(func, "say")) {
                                                switch_say_interface_t *si;
-                                               if ((si = switch_loadable_module_get_say_interface(chan_lang))) {
+                                               if ((si = switch_loadable_module_get_say_interface(module_name))) {
                                                        char *say_type = (char *) switch_xml_attr_soft(action, "type");
                                                        char *say_method = (char *) switch_xml_attr_soft(action, "method");
 
                                                        status = si->say_function(session, odata, get_say_type_by_name(say_type), get_say_method_by_name(say_method), args);
                                                } else {
-                                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid SAY Interface [%s]!\n", chan_lang);
+                                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid SAY Interface [%s]!\n", module_name);
                                                }
                                        } else if (!strcasecmp(func, "speak-text")) {
                                                char *my_tts_engine = (char *) switch_xml_attr(action, "tts-engine");