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

MODAPP-261 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13207 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2009-04-30 04:20:22 +00:00
parent 04ff045b5d
commit d624e70a54
1 changed files with 15 additions and 7 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

@ -155,7 +155,8 @@ typedef enum {
CFLAG_ENFORCE_MIN = (1 << 2), CFLAG_ENFORCE_MIN = (1 << 2),
CFLAG_DESTRUCT = (1 << 3), CFLAG_DESTRUCT = (1 << 3),
CFLAG_LOCKED = (1 << 4), CFLAG_LOCKED = (1 << 4),
CFLAG_ANSWERED = (1 << 5) CFLAG_ANSWERED = (1 << 5),
CFLAG_BRIDGE_TO = (1 << 6),
} conf_flag_t; } conf_flag_t;
typedef enum { typedef enum {
@ -642,6 +643,8 @@ static switch_status_t conference_add_member(conference_obj_t *conference, confe
switch_snprintf(msg, sizeof(msg), "There are %d callers", conference->count); switch_snprintf(msg, sizeof(msg), "There are %d callers", conference->count);
conference_member_say(member, msg, CONF_DEFAULT_LEADIN); conference_member_say(member, msg, CONF_DEFAULT_LEADIN);
} else if (conference->count == 1 && !conference->perpetual_sound) { } else if (conference->count == 1 && !conference->perpetual_sound) {
/* as long as its not a bridge_to conference, announce if person is alone */
if (!switch_test_flag(conference, CFLAG_BRIDGE_TO)) {
if (conference->alone_sound) { if (conference->alone_sound) {
conference_stop_file(conference, FILE_STOP_ASYNC); conference_stop_file(conference, FILE_STOP_ASYNC);
conference_play_file(conference, conference->alone_sound, CONF_DEFAULT_LEADIN, switch_core_session_get_channel(member->session), 1); conference_play_file(conference, conference->alone_sound, CONF_DEFAULT_LEADIN, switch_core_session_get_channel(member->session), 1);
@ -650,6 +653,8 @@ static switch_status_t conference_add_member(conference_obj_t *conference, confe
conference_member_say(member, msg, CONF_DEFAULT_LEADIN); conference_member_say(member, msg, CONF_DEFAULT_LEADIN);
} }
} }
}
} }
} }
@ -4873,6 +4878,9 @@ SWITCH_STANDARD_APP(conference_function)
/* Indicate the conference is dynamic */ /* Indicate the conference is dynamic */
switch_set_flag_locked(conference, CFLAG_DYNAMIC); switch_set_flag_locked(conference, CFLAG_DYNAMIC);
/* Indicate the conference has a bridgeto party */
switch_set_flag_locked(conference, CFLAG_BRIDGE_TO);
/* Start the conference thread for this conference */ /* Start the conference thread for this conference */
launch_conference_thread(conference); launch_conference_thread(conference);