]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-9495 #resolve [add conference_join_energy_level variable]
authorAnthony Minessale <anthm@freeswitch.org>
Thu, 8 Sep 2016 22:32:43 +0000 (17:32 -0500)
committerAnthony Minessale <anthm@freeswitch.org>
Thu, 8 Sep 2016 22:33:21 +0000 (17:33 -0500)
src/mod/applications/mod_conference/conference_member.c

index 8552781e1f8510a651399a4e16f15ef56bc49dad..afd2570e58e687637bf8ae11068a009d2735af7c 100644 (file)
@@ -743,7 +743,7 @@ switch_status_t conference_member_add(conference_obj_t *conference, conference_m
                conference_video_check_avatar(member, SWITCH_FALSE);
 
                if ((var = switch_channel_get_variable_dup(member->channel, "conference_join_volume_in", SWITCH_FALSE, -1))) {
-                       uint32_t id = atoi(var) - 1;
+                       uint32_t id = atoi(var);
 
                        if (id > -5 && id < 5) {
                                member->volume_in_level = id;
@@ -751,12 +751,21 @@ 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) - 1;
+                       uint32_t id = atoi(var);
 
                        if (id > -5 && id < 5) {
                                member->volume_out_level = id;
                        }
                }
+
+
+               if ((var = switch_channel_get_variable_dup(member->channel, "conference_join_energy_level", SWITCH_FALSE, -1))) {
+                       uint32_t id = atoi(var);
+
+                       if (id > -5 && id < 5) {
+                               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;