From eda8634b17133df5f3104d96ad56d3626a90aad8 Mon Sep 17 00:00:00 2001 From: Lynx Linden Date: Fri, 11 Dec 2009 15:06:32 +0000 Subject: EXT-3394: Remove manual voice gain controls. The new Vivox SDK supports Automatic Gain Control (AGC), so we shouldn't need to change the local gain level from the default of 50%. This change sets the initial gain level to 50 (instead of 62) and removes the local gain sliders from the Sound Preferences floater and the Voice Controls floater. The latter was not hooked up yet anyway. --- indra/newview/llvoiceclient.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'indra/newview/llvoiceclient.cpp') diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp index 63acba50e7..aa69b46857 100644 --- a/indra/newview/llvoiceclient.cpp +++ b/indra/newview/llvoiceclient.cpp @@ -128,16 +128,8 @@ static int scale_mic_volume(float volume) static int scale_speaker_volume(float volume) { // incoming volume has the range [0.0 ... 1.0], with 0.5 as the default. - // Map it as follows: 0.0 -> 0, 0.5 -> 62, 1.0 -> 75 - - volume -= 0.5f; // offset volume to the range [-0.5 ... 0.5], with 0 at the default. - int scaled_volume = 62; // offset scaled_volume by its default level - if(volume < 0.0f) - scaled_volume += ((int)(volume * 124.0f)); // (62 - 0) * 2 - else - scaled_volume += ((int)(volume * 26.0f)); // (75 - 62) * 2 - - return scaled_volume; + // Map it as follows: 0.0 -> 0, 0.5 -> 50, 1.0 -> 100 + return (int)(volume * 100.0f); } class LLViewerVoiceAccountProvisionResponder : -- cgit v1.2.3