retronetworking
/
freeswitch
13
0
Fork 0
Code Pull Requests Releases Activity

FS-8789: remove ability to swap to personal canvas while recording and prevent recording while personal canvas is on.

This commit is contained in:
Brian West 2016-02-02 17:33:56 -06:00
parent 46ebf3cea7
commit 277ce6d0de
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/mod/applications/mod_conference/conference_api.c
View File

@ -1013,6 +1013,10 @@ switch_status_t conference_api_sub_vid_personal(conference_obj_t *conference, sw
if (argv[2]) {
on = switch_true(argv[2]);
if (on) {
if (conference->record_count > 0) {
stream->write_function(stream, "-ERR conference is recording, not enabling vid-personal.\n");
return SWITCH_STATUS_SUCCESS;
}
conference_utils_set_flag(conference, CFLAG_PERSONAL_CANVAS);
} else {
conference_utils_clear_flag(conference, CFLAG_PERSONAL_CANVAS);
@ -2411,6 +2415,11 @@ switch_status_t conference_api_sub_record(conference_obj_t *conference, switch_s
return SWITCH_STATUS_GENERR;
}
if (conference_utils_test_flag(conference, CFLAG_PERSONAL_CANVAS)) {
stream->write_function(stream, "-ERR Personal Canvas enabled, recording not permitted.\n");
return SWITCH_STATUS_SUCCESS;
}
if (argv[3]) {
if (argv[3]) {

5
src/mod/applications/mod_conference/conference_record.c
View File

@ -60,6 +60,11 @@ void conference_record_launch_thread(conference_obj_t *conference, char *path, i
return;
}
if (conference_utils_test_flag(conference, CFLAG_PERSONAL_CANVAS)) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Personal Canvas enabled, recording not permitted.\n");
return;
}
rec->conference = conference;
rec->path = switch_core_strdup(pool, path);
rec->pool = pool;