mirror of
https://github.com/signalwire/freeswitch.git
synced 2025-04-29 21:46:02 +00:00
MINTWO flag to kick both out if its two
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@11523 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
parent
e79e13bcb0
commit
414adc5728
@ -140,7 +140,8 @@ typedef enum {
|
|||||||
MFLAG_ENDCONF = (1 << 9),
|
MFLAG_ENDCONF = (1 << 9),
|
||||||
MFLAG_HAS_AUDIO = (1 << 10),
|
MFLAG_HAS_AUDIO = (1 << 10),
|
||||||
MFLAG_TALKING = (1 << 11),
|
MFLAG_TALKING = (1 << 11),
|
||||||
MFLAG_RESTART = (1 << 12)
|
MFLAG_RESTART = (1 << 12),
|
||||||
|
MFLAG_MINTWO = (1 << 13)
|
||||||
} member_flag_t;
|
} member_flag_t;
|
||||||
|
|
||||||
typedef enum {
|
typedef enum {
|
||||||
@ -4307,6 +4308,10 @@ static void set_mflags(char *flags, member_flag_t *f)
|
|||||||
if (strstr(flags, "endconf")) {
|
if (strstr(flags, "endconf")) {
|
||||||
*f |= MFLAG_ENDCONF;
|
*f |= MFLAG_ENDCONF;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (strstr(flags, "mintwo")) {
|
||||||
|
*f |= MFLAG_MINTWO;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -4815,6 +4820,10 @@ SWITCH_STANDARD_APP(conference_function)
|
|||||||
set_mflags(flags_str, &mflags);
|
set_mflags(flags_str, &mflags);
|
||||||
switch_set_flag_locked((&member), MFLAG_RUNNING | mflags);
|
switch_set_flag_locked((&member), MFLAG_RUNNING | mflags);
|
||||||
|
|
||||||
|
if (mflags & MFLAG_MINTWO) {
|
||||||
|
conference->min = 2;
|
||||||
|
}
|
||||||
|
|
||||||
/* Add the caller to the conference */
|
/* Add the caller to the conference */
|
||||||
if (conference_add_member(conference, &member) != SWITCH_STATUS_SUCCESS) {
|
if (conference_add_member(conference, &member) != SWITCH_STATUS_SUCCESS) {
|
||||||
switch_core_codec_destroy(&member.read_codec);
|
switch_core_codec_destroy(&member.read_codec);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user