From: Joao Mesquita Date: Wed, 22 Dec 2010 02:39:05 +0000 (-0300) Subject: Add a chan var conference_enter_sound to override conference enter-sound param on... X-Git-Tag: v1.2-rc1~223^2~8^2^2^2~6 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=651acc62f7ddcab09992ba9f98f66ae8303e7d93;p=thirdparty%2Ffreeswitch.git Add a chan var conference_enter_sound to override conference enter-sound param on the profile --- diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c index cf8ae96da0..9c3ba0f615 100644 --- a/src/mod/applications/mod_conference/mod_conference.c +++ b/src/mod/applications/mod_conference/mod_conference.c @@ -689,8 +689,14 @@ static switch_status_t conference_add_member(conference_obj_t *conference, confe } if (!switch_channel_test_app_flag_key("conf_silent", channel, CONF_SILENT_REQ) && !zstr(conference->enter_sound)) { - conference_play_file(conference, conference->enter_sound, CONF_DEFAULT_LEADIN, switch_core_session_get_channel(member->session), + if (!zstr(switch_channel_get_variable(channel, "conference_enter_sound"))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Playing file...%s\n", conference->name); + conference_play_file(conference, (char *)switch_channel_get_variable(channel, "conference_enter_sound"), CONF_DEFAULT_LEADIN, + switch_core_session_get_channel(member->session), switch_test_flag(conference, CFLAG_WAIT_MOD) ? 0 : 1); + } else { + conference_play_file(conference, conference->enter_sound, CONF_DEFAULT_LEADIN, switch_core_session_get_channel(member->session), switch_test_flag(conference, CFLAG_WAIT_MOD) ? 0 : 1); + } } }