From: Anthony Minessale <anthm@freeswitch.org>
Date: Thu, 8 Sep 2016 22:32:43 +0000 (-0500)
Subject: FS-9495 #resolve [add conference_join_energy_level variable]
X-Git-Tag: v1.6.11~9^2~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71c54d6f3a693ea9f5ceeb05958927a46dfea8d1;p=thirdparty%2Ffreeswitch.git

FS-9495 #resolve [add conference_join_energy_level variable]
---

diff --git a/src/mod/applications/mod_conference/conference_member.c b/src/mod/applications/mod_conference/conference_member.c
index 8552781e1f..afd2570e58 100644
--- a/src/mod/applications/mod_conference/conference_member.c
+++ b/src/mod/applications/mod_conference/conference_member.c
@@ -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;