kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add Phrase Macro support to ivr menu. 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4293 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Mike Murdock 2007-02-15 21:59:59 +00:00
parent 700c115632
commit a918bea9cf
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/switch_ivr.h
View File

@ -511,6 +511,7 @@ typedef enum {
SWITCH_IVR_ACTION_EXECAPP, /* Execute an application. */ SWITCH_IVR_ACTION_EXECAPP, /* Execute an application. */
SWITCH_IVR_ACTION_PLAYSOUND, /* Play a sound. */ SWITCH_IVR_ACTION_PLAYSOUND, /* Play a sound. */
SWITCH_IVR_ACTION_SAYTEXT, /* say text. */ SWITCH_IVR_ACTION_SAYTEXT, /* say text. */
SWITCH_IVR_ACTION_SAYPHRASE, /* say a phrase macro. */
SWITCH_IVR_ACTION_BACK, /* Go back 1 menu. */ SWITCH_IVR_ACTION_BACK, /* Go back 1 menu. */
SWITCH_IVR_ACTION_TOMAIN, /* Go back to the top level menu. */ SWITCH_IVR_ACTION_TOMAIN, /* Go back to the top level menu. */
SWITCH_IVR_ACTION_TRANSFER, /* Transfer caller to another ext. */ SWITCH_IVR_ACTION_TRANSFER, /* Transfer caller to another ext. */
@ -547,6 +548,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_menu_init(switch_ivr_menu_t **new_men
const char *invalid_sound, const char *invalid_sound,
const char *tts_engine, const char *tts_engine,
const char *tts_voice, const char *tts_voice,
const char *phrase_lang,
int timeout, int timeout,
int max_failures, int max_failures,
switch_memory_pool_t *pool); switch_memory_pool_t *pool);

29
src/switch_ivr.c
View File

@ -3971,6 +3971,7 @@ struct switch_ivr_menu {
char *exit_sound; char *exit_sound;
char *tts_engine; char *tts_engine;
char *tts_voice; char *tts_voice;
char *phrase_lang;
char *buf; char *buf;
char *ptr; char *ptr;
int max_failures; int max_failures;
@ -4022,6 +4023,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_menu_init(switch_ivr_menu_t **new_men
const char *exit_sound, const char *exit_sound,
const char *tts_engine, const char *tts_engine,
const char *tts_voice, const char *tts_voice,
const char *phrase_lang,
int timeout, int timeout,
int max_failures, int max_failures,
switch_memory_pool_t *pool) switch_memory_pool_t *pool)
@ -4075,6 +4077,10 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_menu_init(switch_ivr_menu_t **new_men
menu->tts_voice = switch_core_strdup(menu->pool, tts_voice); menu->tts_voice = switch_core_strdup(menu->pool, tts_voice);
} }
if (!switch_strlen_zero(phrase_lang)) {
menu->phrase_lang = switch_core_strdup(menu->pool, phrase_lang);
}
menu->max_failures = max_failures; menu->max_failures = max_failures;
menu->timeout = timeout; menu->timeout = timeout;
@ -4185,11 +4191,18 @@ static switch_status_t play_or_say(switch_core_session_t *session, switch_ivr_me
if (*sound == '/' || *sound == '\\') { if (*sound == '/' || *sound == '\\') {
status = switch_ivr_play_file(session, NULL, sound, &args); status = switch_ivr_play_file(session, NULL, sound, &args);
} else { } else {
if (menu->tts_engine && menu->tts_voice) { if (strlen(sound) > 4 && strncmp(sound, "say:", 4) == 0) {
status = switch_ivr_speak_text(session, menu->tts_engine, menu->tts_voice, 0, sound, &args); if (menu->tts_engine && menu->tts_voice) {
} status = switch_ivr_speak_text(session, menu->tts_engine, menu->tts_voice, 0, sound+4, &args);
else { } else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No TTS engine to play sound\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No TTS engine to play sound\n");
}
} else {
if (strlen(sound) > 7 && strncmp(sound, "phrase:", 7) == 0) {
status = switch_ivr_phrase_macro(session, sound+7, "", menu->phrase_lang, &args);
} else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "play_or_say: no player for [%s]. Use say: or phrase:\n", sound);
}
} }
} }
@ -4286,6 +4299,9 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_menu_execute(switch_core_session_t *s
case SWITCH_IVR_ACTION_SAYTEXT: case SWITCH_IVR_ACTION_SAYTEXT:
status = switch_ivr_speak_text(session, menu->tts_engine, menu->tts_voice, 0, aptr, NULL); status = switch_ivr_speak_text(session, menu->tts_engine, menu->tts_voice, 0, aptr, NULL);
break; break;
case SWITCH_IVR_ACTION_SAYPHRASE:
status = switch_ivr_phrase_macro(session, aptr, "", menu->phrase_lang, NULL);
break;
case SWITCH_IVR_ACTION_TRANSFER: case SWITCH_IVR_ACTION_TRANSFER:
switch_ivr_session_transfer(session, aptr, NULL, NULL); switch_ivr_session_transfer(session, aptr, NULL, NULL);
running = 0; running = 0;
@ -4469,6 +4485,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_menu_stack_xml_init(switch_ivr_menu_x
{"menu-exec-api", SWITCH_IVR_ACTION_EXECAPP}, {"menu-exec-api", SWITCH_IVR_ACTION_EXECAPP},
{"menu-play-sound", SWITCH_IVR_ACTION_PLAYSOUND}, {"menu-play-sound", SWITCH_IVR_ACTION_PLAYSOUND},
{"menu-say-text", SWITCH_IVR_ACTION_SAYTEXT}, {"menu-say-text", SWITCH_IVR_ACTION_SAYTEXT},
{"menu-say-phrase", SWITCH_IVR_ACTION_SAYPHRASE},
{"menu-back", SWITCH_IVR_ACTION_BACK}, {"menu-back", SWITCH_IVR_ACTION_BACK},
{"menu-top", SWITCH_IVR_ACTION_TOMAIN}, {"menu-top", SWITCH_IVR_ACTION_TOMAIN},
{"menu-call-transfer", SWITCH_IVR_ACTION_TRANSFER}, {"menu-call-transfer", SWITCH_IVR_ACTION_TRANSFER},
@ -4505,6 +4522,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_menu_stack_xml_build(switch_ivr_menu_
const char *exit_sound = switch_xml_attr(xml_menu,"exit-sound"); // if the attr doesn't exist, return NULL const char *exit_sound = switch_xml_attr(xml_menu,"exit-sound"); // if the attr doesn't exist, return NULL
const char *tts_engine = switch_xml_attr(xml_menu,"tts-engine"); // if the attr doesn't exist, return NULL const char *tts_engine = switch_xml_attr(xml_menu,"tts-engine"); // if the attr doesn't exist, return NULL
const char *tts_voice = switch_xml_attr(xml_menu,"tts-voice"); // if the attr doesn't exist, return NULL const char *tts_voice = switch_xml_attr(xml_menu,"tts-voice"); // if the attr doesn't exist, return NULL
const char *phrase_lang = switch_xml_attr(xml_menu,"phrase_lang"); // if the attr doesn't exist, return NULL
const char *timeout = switch_xml_attr_soft(xml_menu,"timeout"); // if the attr doesn't exist, return "" const char *timeout = switch_xml_attr_soft(xml_menu,"timeout"); // if the attr doesn't exist, return ""
const char *max_failures = switch_xml_attr_soft(xml_menu,"max-failures"); // if the attr doesn't exist, return "" const char *max_failures = switch_xml_attr_soft(xml_menu,"max-failures"); // if the attr doesn't exist, return ""
switch_ivr_menu_t *menu = NULL; switch_ivr_menu_t *menu = NULL;
@ -4519,6 +4537,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_menu_stack_xml_build(switch_ivr_menu_
exit_sound, exit_sound,
tts_engine, tts_engine,
tts_voice, tts_voice,
phrase_lang,
atoi(timeout)*1000, atoi(timeout)*1000,
atoi(max_failures), atoi(max_failures),
xml_menu_ctx->pool xml_menu_ctx->pool