ben.carrasco/freeswitch
1
0 Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2026-10-30 23:24:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

FS-3124 Use the channel's sound_prefix if it's not set in the conference's config

Browse Source
This commit is contained in:
Mathieu Rene committed 2011-03-05 12:49:19 -05:00
1 parent 541a99153d
commit 0911ed7408
2 files changed
+15 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/mod/applications/mod_conference/mod_conference.c
+9 -1
View File
@@ -6423,6 +6423,7 @@ static conference_obj_t *conference_new(char *name, conf_xml_cfg_t cfg, switch_c
comfort_noise_level = 1400;
}
} else if (!strcasecmp(var, "sound-prefix") && !zstr(val)) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "override sound-prefix with: %s\n", val);
sound_prefix = val;
} else if (!strcasecmp(var, "max-members") && !zstr(val)) {
errno = 0; /* sanity first */
@@ -6527,8 +6528,15 @@ static conference_obj_t *conference_new(char *name, conf_xml_cfg_t cfg, switch_c
set_cflags(conference_flags, &conference->flags);
}
if (sound_prefix) {
if (!zstr(sound_prefix)) {
conference->sound_prefix = switch_core_strdup(conference->pool, sound_prefix);
} else {
const char *val;
if ((val = switch_channel_get_variable(channel, "sound_prefix")) && !zstr(val)) {
/* if no sound_prefix was set, use the channel sound_prefix */
conference->sound_prefix = switch_core_strdup(conference->pool, val);
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "using channel sound prefix: %s\n", conference->sound_prefix);
}
}
if (!zstr(enter_sound)) {