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

add endconf member flag to make a specific member cause the conference to end when he leaves 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5714 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2007-09-19 16:20:00 +00:00
parent 1f3eabd15c
commit 038a60d5d4
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -131,7 +131,8 @@ typedef enum {
MFLAG_NOCHANNEL = (1 << 5),
MFLAG_INTREE = (1 << 6),
MFLAG_WASTE_BANDWIDTH = (1 << 7),
MFLAG_FLUSH_BUFFER = (1 << 8)
MFLAG_FLUSH_BUFFER = (1 << 8),
MFLAG_ENDCONF = (1 << 9)
} member_flag_t;
typedef enum {
@ -626,6 +627,10 @@ static switch_status_t conference_del_member(conference_obj_t * conference, conf
member->sh = NULL;
}
if (switch_test_flag(member, MFLAG_ENDCONF)) {
switch_set_flag_locked(member->conference, CFLAG_DESTRUCT);
}
member->conference = NULL;
if (!switch_test_flag(member, MFLAG_NOCHANNEL)) {
@ -3903,6 +3908,8 @@ static void set_mflags(char *flags, member_flag_t * f)
*f &= ~MFLAG_CAN_HEAR;
} else if (strstr(flags, "waste")) {
*f |= MFLAG_WASTE_BANDWIDTH;
} else if (strstr(flags, "endconf")) {
*f |= MFLAG_ENDCONF;
}
}
@ -3973,6 +3980,15 @@ SWITCH_STANDARD_APP(conference_function)
return;
}
if ((flags_str = strstr(mydata, flags_prefix))) {
char *p;
*flags_str = '\0';
flags_str += strlen(flags_prefix);
if ((p = strchr(flags_str, '}'))) {
*p = '\0';
}
}
/* is this a bridging conference ? */
if (!strncasecmp(mydata, bridge_prefix, strlen(bridge_prefix))) {
@ -4269,15 +4285,6 @@ SWITCH_STANDARD_APP(conference_function)
/* Install our Signed Linear codec so we get the audio in that format */
switch_core_session_set_read_codec(member.session, &member.read_codec);
if ((flags_str = strstr(mydata, flags_prefix))) {
char *p;
*flags_str = '\0';
flags_str += strlen(flags_prefix);
if ((p = strchr(flags_str, '}'))) {
*p = '\0';
}
}
mflags = conference->mflags;
set_mflags(flags_str, &mflags);