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

Merge pull request #1245 in FS/freeswitch from ~DRAGOS_OANCEA_NX/freeswitch-dragos-nx:feature/FS-10198/conf_recording_metadata to master 

* commit '6a7f9d4a8efa9de77e4afb76436bd3f66545ed30':
  FS-10198: mod_conference: add var in xml to configure audio recording metadata
This commit is contained in:
Mike Jerris 2017-04-06 19:39:05 +00:00
parent 1d1cb7e4a1 6a7f9d4a8e
commit 9e73d51a27
3 changed files with 10 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_record.c
View File

@ -306,7 +306,8 @@ void *SWITCH_THREAD_FUNC conference_record_thread_run(switch_thread_t *thread, v
switch_safe_free(vval); switch_safe_free(vval);
} }
switch_core_file_set_string(&member->rec->fh, SWITCH_AUDIO_COL_STR_ARTIST, "FreeSWITCH mod_conference Software Conference Module"); switch_core_file_set_string(&member->rec->fh, SWITCH_AUDIO_COL_STR_ARTIST,
!zstr(conference->recording_metadata)?conference->recording_metadata:"FreeSWITCH mod_conference Software Conference Module");
if (test_eflag(conference, EFLAG_RECORD) && if (test_eflag(conference, EFLAG_RECORD) &&
switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {

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

@ -2631,6 +2631,7 @@ conference_obj_t *conference_new(char *name, conference_xml_cfg_t cfg, switch_co
char *suppress_events = NULL; char *suppress_events = NULL;
char *verbose_events = NULL; char *verbose_events = NULL;
char *auto_record = NULL; char *auto_record = NULL;
char *recording_metadata = NULL;
int auto_record_canvas = 0; int auto_record_canvas = 0;
int min_recording_participants = 1; int min_recording_participants = 1;
char *conference_log_dir = NULL; char *conference_log_dir = NULL;
@ -2939,6 +2940,8 @@ conference_obj_t *conference_new(char *name, conference_xml_cfg_t cfg, switch_co
verbose_events = val; verbose_events = val;
} else if (!strcasecmp(var, "auto-record") && !zstr(val)) { } else if (!strcasecmp(var, "auto-record") && !zstr(val)) {
auto_record = val; auto_record = val;
} else if (!strcasecmp(var, "recording-metadata") && !zstr(val)) {
recording_metadata = val;
} else if (!strcasecmp(var, "auto-record-canvas-id") && !zstr(val)) { } else if (!strcasecmp(var, "auto-record-canvas-id") && !zstr(val)) {
auto_record_canvas = atoi(val); auto_record_canvas = atoi(val);
if (auto_record_canvas) { if (auto_record_canvas) {
@ -3481,6 +3484,10 @@ conference_obj_t *conference_new(char *name, conference_xml_cfg_t cfg, switch_co
conference->auto_record = switch_core_strdup(conference->pool, auto_record); conference->auto_record = switch_core_strdup(conference->pool, auto_record);
} }
if (!zstr(recording_metadata)) {
conference->recording_metadata = switch_core_strdup(conference->pool, recording_metadata);
}
conference->min_recording_participants = min_recording_participants; conference->min_recording_participants = min_recording_participants;
if (!zstr(desc)) { if (!zstr(desc)) {

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

@ -683,6 +683,7 @@ typedef struct conference_obj {
int broadcast_chat_messages; int broadcast_chat_messages;
int comfort_noise_level; int comfort_noise_level;
int auto_recording; int auto_recording;
char *recording_metadata;
int record_count; int record_count;
uint32_t min_recording_participants; uint32_t min_recording_participants;
int ivr_dtmf_timeout; int ivr_dtmf_timeout;