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

Add "record-wait-mod" flag to control auto recording behavior 

Introduced a new conference flag, CFLAG_RECORD_WAIT_MOD, to delay auto recording until a moderator joins. Updated relevant logic to test and clear this flag based on moderator presence and participant count. This enhances flexibility in managing recording settings for moderated conferences.
This commit is contained in:
Aron Podrigal 2025-01-15 14:16:31 -06:00
parent 53abb53f2b
commit 6deca50592
4 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mod/applications/mod_conference/conference_member.c
View File

@ -903,6 +903,9 @@ switch_status_t conference_member_add(conference_obj_t *conference, conference_m
conference_utils_clear_flag(conference, CFLAG_WAIT_MOD); conference_utils_clear_flag(conference, CFLAG_WAIT_MOD);
} }
if (conference_utils_test_flag(conference, CFLAG_RECORD_WAIT_MOD) && conference_utils_member_test_flag(member, MFLAG_MOD)) {
conference_utils_clear_flag(conference, CFLAG_RECORD_WAIT_MOD);
}
if (conference->count > 1) { if (conference->count > 1) {
if (((conference->moh_sound || conference->tmp_moh_sound) && !conference_utils_test_flag(conference, CFLAG_WAIT_MOD)) || if (((conference->moh_sound || conference->tmp_moh_sound) && !conference_utils_test_flag(conference, CFLAG_WAIT_MOD)) ||
(conference_utils_test_flag(conference, CFLAG_WAIT_MOD) && !switch_true(switch_channel_get_variable(channel, "conference_permanent_wait_mod_moh")))) { (conference_utils_test_flag(conference, CFLAG_WAIT_MOD) && !switch_true(switch_channel_get_variable(channel, "conference_permanent_wait_mod_moh")))) {

2
src/mod/applications/mod_conference/conference_utils.c
View File

@ -190,6 +190,8 @@ void conference_utils_set_cflags(const char *flags, conference_flag_t *f)
for (i = 0; i < argc && argv[i]; i++) { for (i = 0; i < argc && argv[i]; i++) {
if (!strcasecmp(argv[i], "wait-mod")) { if (!strcasecmp(argv[i], "wait-mod")) {
f[CFLAG_WAIT_MOD] = 1; f[CFLAG_WAIT_MOD] = 1;
} else if (!strcasecmp(argv[i], "record-wait-mod")) {
f[CFLAG_RECORD_WAIT_MOD] = 1;
} else if (!strcasecmp(argv[i], "video-floor-only")) { } else if (!strcasecmp(argv[i], "video-floor-only")) {
f[CFLAG_VID_FLOOR] = 1; f[CFLAG_VID_FLOOR] = 1;
} else if (!strcasecmp(argv[i], "audio-always")) { } else if (!strcasecmp(argv[i], "audio-always")) {

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

@ -433,7 +433,7 @@ void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, void *ob
} }
/* Start auto recording if there's the minimum number of required participants. */ /* Start auto recording if there's the minimum number of required participants. */
if (conference->auto_record && !conference->auto_recording && (conference->count >= conference->min_recording_participants)) { if (conference->auto_record && !conference->auto_recording && (conference->count >= conference->min_recording_participants) && !conference_utils_test_flag(conference, CFLAG_RECORD_WAIT_MOD)) {
conference->auto_recording++; conference->auto_recording++;
conference->record_count++; conference->record_count++;
imember = conference->members; imember = conference->members;
@ -1175,6 +1175,10 @@ void conference_xlist(conference_obj_t *conference, switch_xml_t x_conference, i
switch_xml_set_attr_d(x_conference, "wait_mod", "true"); switch_xml_set_attr_d(x_conference, "wait_mod", "true");
} }
if (conference_utils_test_flag(conference, CFLAG_RECORD_WAIT_MOD)) {
switch_xml_set_attr_d(x_conference, "record_wait_mod", "true");
}
if (conference_utils_test_flag(conference, CFLAG_AUDIO_ALWAYS)) { if (conference_utils_test_flag(conference, CFLAG_AUDIO_ALWAYS)) {
switch_xml_set_attr_d(x_conference, "audio_always", "true"); switch_xml_set_attr_d(x_conference, "audio_always", "true");
} }

1
src/mod/applications/mod_conference/mod_conference.h
View File

@ -258,6 +258,7 @@ typedef enum {
CFLAG_NO_MOH, CFLAG_NO_MOH,
CFLAG_DED_VID_LAYER_AUDIO_FLOOR, CFLAG_DED_VID_LAYER_AUDIO_FLOOR,
CFLAG_BREAKABLE, CFLAG_BREAKABLE,
CFLAG_RECORD_WAIT_MOD,
///////////////////////////////// /////////////////////////////////
CFLAG_MAX CFLAG_MAX
} conference_flag_t; } conference_flag_t;