]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Add a chan var conference_enter_sound to override conference enter-sound param on...
authorJoao Mesquita <jmesquita@freeswitch.org>
Wed, 22 Dec 2010 02:39:05 +0000 (23:39 -0300)
committerJoao Mesquita <jmesquita@freeswitch.org>
Wed, 22 Dec 2010 02:39:05 +0000 (23:39 -0300)
src/mod/applications/mod_conference/mod_conference.c

index cf8ae96da0c24421d9454626a6dbc693c1f27cdf..9c3ba0f6151cc1dc0aad8bfe30ba7d62f2d94792 100644 (file)
@@ -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);
+                               }
                        }
                }