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

Merge pull request #1718 in FS/freeswitch from ~INFOMIND/freeswitch:bugfix/FS-11826-mod_conference-channel-variables_join to master 

* commit 'b7bce76da5b496400bbd9cce1f53b0be5b4b0ae1':
  FS-11826 [mod_conference] conference_member.c: channel variables (conference_join_) Fixes variables being seen as empty and proper range on conference_join_energy_level
This commit is contained in:
Mike Jerris 2019-05-14 10:11:01 -05:00
parent 8b1d92a88d b7bce76da5
commit 5b9b233475
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -763,7 +763,7 @@ switch_status_t conference_member_add(conference_obj_t *conference, conference_m
}
if ((var = switch_channel_get_variable_dup(member->channel, "conference_join_volume_in", SWITCH_FALSE, -1))) {
uint32_t id = atoi(var);
int id = atoi(var);
if (id > -5 && id < 5) {
member->volume_in_level = id;
@ -771,7 +771,7 @@ switch_status_t conference_member_add(conference_obj_t *conference, conference_m
}
if ((var = switch_channel_get_variable_dup(member->channel, "conference_join_volume_out", SWITCH_FALSE, -1))) {
uint32_t id = atoi(var);
int id = atoi(var);
if (id > -5 && id < 5) {
member->volume_out_level = id;
@ -780,15 +780,15 @@ switch_status_t conference_member_add(conference_obj_t *conference, conference_m
if ((var = switch_channel_get_variable_dup(member->channel, "conference_join_energy_level", SWITCH_FALSE, -1))) {
uint32_t id = atoi(var);
int id = atoi(var);
if (id > -5 && id < 5) {
if (id > -2 && id < 1801) {
member->energy_level = id;
}
}
if ((var = switch_channel_get_variable_dup(member->channel, "video_initial_canvas", SWITCH_FALSE, -1))) {
uint32_t id = atoi(var) - 1;
int id = atoi(var) - 1;
if (id < conference->canvas_count) {
member->canvas_id = id;
member->layer_timeout = DEFAULT_LAYER_TIMEOUT;
@ -796,7 +796,7 @@ switch_status_t conference_member_add(conference_obj_t *conference, conference_m
}
if ((var = switch_channel_get_variable_dup(member->channel, "video_initial_watching_canvas", SWITCH_FALSE, -1))) {
uint32_t id = atoi(var) - 1;
int id = atoi(var) - 1;
if (id == 0) {
id = conference->canvas_count;