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

Merge pull request #1204 in FS/freeswitch from ~DRAGOS_OANCEA_NX/freeswitch-dragos-nx:fix_vol_conference_member to master 

* commit '5d35744fb2870f1c22a987b809d2f7677b24b66c':
  FS-10087: fix for volume level per member of conference (volume level when playing file)
This commit is contained in:
Mike Jerris 2017-03-24 17:14:16 +00:00
parent f9d69580e8 5d35744fb2
commit 6c46b78f93
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -564,6 +564,11 @@ void conference_member_add_file_data(conference_member_t *member, int16_t *data,
} else if (member->fnode->type == NODE_TYPE_FILE) {
switch_core_file_read(&member->fnode->fh, file_frame, &file_sample_len);
file_data_len = file_sample_len * 2 * member->fnode->fh.channels;
if (member->fnode->fh.vol) {
switch_change_sln_volume_granular((void *)file_frame, (uint32_t)file_sample_len * member->fnode->fh.channels,
member->fnode->fh.vol);
}
}
if (file_sample_len <= 0) {
@ -1413,8 +1418,14 @@ switch_status_t conference_member_play_file(conference_member_t *member, char *f
fnode->file = switch_core_strdup(fnode->pool, file);
if (fnode->fh.params) {
const char *vol = switch_event_get_header(fnode->fh.params, "vol");
const char *position = switch_event_get_header(fnode->fh.params, "position");
if (!zstr(vol)) {
fnode->fh.vol = atoi(vol);
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(member->session), SWITCH_LOG_DEBUG, "Set playback volume for file: %d\n",fnode->fh.vol);
}
if (!bad_params && !zstr(position) && member->conference->channels == 2) {
fnode->al = conference_al_create(pool);
if (conference_al_parse_position(fnode->al, position) != SWITCH_STATUS_SUCCESS) {