kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-05-06 16:02:23 +00:00
Code Issues Projects Releases Wiki Activity

FS-5925 --resolve

Browse Source 
Conflicts:
	src/mod/applications/mod_conference/mod_conference.c
This commit is contained in:
Anthony Minessale 2013-10-31 09:28:31 -05:00
parent bd20c517d6
commit ba3a84cc6e
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,6 +32,8 @@
* David Weekly <david@weekly.org> * David Weekly <david@weekly.org>
* Joao Mesquita <jmesquita@gmail.com> * Joao Mesquita <jmesquita@gmail.com>
* Raymond Chandler <intralanman@freeswitch.org> * Raymond Chandler <intralanman@freeswitch.org>
* Seven Du <dujinfang@gmail.com>
* Emmanuel Schmidbauer <e.schmidbauer@gmail.com>
* *
* mod_conference.c -- Software Conference Bridge * mod_conference.c -- Software Conference Bridge
* *
@ -3605,6 +3607,7 @@ static void conference_loop_output(conference_member_t *member)
const char *ann = switch_channel_get_variable(channel, "conference_auto_outcall_announce"); const char *ann = switch_channel_get_variable(channel, "conference_auto_outcall_announce");
const char *prefix = switch_channel_get_variable(channel, "conference_auto_outcall_prefix"); const char *prefix = switch_channel_get_variable(channel, "conference_auto_outcall_prefix");
const char *maxwait = switch_channel_get_variable(channel, "conference_auto_outcall_maxwait"); const char *maxwait = switch_channel_get_variable(channel, "conference_auto_outcall_maxwait");
const char *delimiter_val = switch_channel_get_variable(channel, "conference_auto_outcall_delimiter");
int to = 60; int to = 60;
int wait_sec = 2; int wait_sec = 2;
int loops = 0; int loops = 0;
@ -3631,7 +3634,12 @@ static void conference_loop_output(conference_member_t *member)
int x = 0; int x = 0;
switch_assert(cpstr); switch_assert(cpstr);
argc = switch_separate_string(cpstr, ',', argv, (sizeof(argv) / sizeof(argv[0]))); if (!zstr(delimiter_val) && strlen(delimiter_val) == 1) {
char delimiter = *delimiter_val;
argc = switch_separate_string(cpstr, delimiter, argv, (sizeof(argv) / sizeof(argv[0])));
} else {
argc = switch_separate_string(cpstr, ',', argv, (sizeof(argv) / sizeof(argv[0])));
}
for (x = 0; x < argc; x++) { for (x = 0; x < argc; x++) {
char *dial_str = switch_mprintf("%s%s", switch_str_nil(prefix), argv[x]); char *dial_str = switch_mprintf("%s%s", switch_str_nil(prefix), argv[x]);
switch_assert(dial_str); switch_assert(dial_str);