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

better sound prefix handling when using say: and allow say: on kick sounds. 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@10359 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2008-11-12 14:15:58 +00:00
parent ead52728e0
commit 98f74a5f99
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/mod/applications/mod_conference/mod_conference.c
View File

@ -2259,6 +2259,7 @@ static switch_status_t conference_play_file(conference_obj_t *conference, char *
switch_memory_pool_t *pool;
uint32_t count;
char *dfile = NULL, *expanded = NULL;
int say = 0;
switch_assert(conference != NULL);
@ -2279,13 +2280,17 @@ static switch_status_t conference_play_file(conference_obj_t *conference, char *
}
}
if (!async && !strncasecmp(file, "say:", 4)) {
if (!strncasecmp(file, "say:", 4)) {
say = 1;
}
if (!async && say) {
status = conference_say(conference, file + 4, leadin);
goto done;
}
if (!switch_is_file_path(file)) {
if (conference->sound_prefix) {
if (!say && conference->sound_prefix) {
if (!(dfile = switch_mprintf("%s%s%s", conference->sound_prefix, SWITCH_PATH_SEPARATOR, file))) {
goto done;
}
@ -4583,6 +4588,11 @@ SWITCH_STANDARD_APP(conference_function)
char *toplay = NULL;
char *dfile = NULL;
if (!strncasecmp(conference->kicked_sound, "say:", 4)) {
if (conference->tts_engine && conference->tts_voice) {
switch_ivr_speak_text(session, conference->tts_engine, conference->tts_voice, conference->kicked_sound + 4, NULL);
}
} else {
if (conference->sound_prefix) {
dfile = switch_mprintf("%s%s%s", conference->sound_prefix, SWITCH_PATH_SEPARATOR, conference->kicked_sound);
switch_assert(dfile);
@ -4594,6 +4604,7 @@ SWITCH_STANDARD_APP(conference_function)
switch_ivr_play_file(session, NULL, toplay, NULL);
switch_safe_free(dfile);
}
}
switch_core_session_reset(session, SWITCH_TRUE);