merge storm-122

1 files changed, 321 insertions, 0 deletions

diff --git a/indra/newview/llpanelvoicedevicesettings.cpp b/indra/newview/llpanelvoicedevicesettings.cpp
new file mode 100644
index 0000000000..aef870d352
--- /dev/null
+++ b/indra/newview/llpanelvoicedevicesettings.cpp
@@ -0,0 +1,321 @@
+/** 
+ * @file llpanelvoicedevicesettings.cpp
+ * @author Richard Nelson
+ * @brief Voice communication set-up 
+ *
+ * $LicenseInfo:firstyear=2007&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2010, Linden Research, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+ 
+#include "llviewerprecompiledheaders.h"
+
+#include "llpanelvoicedevicesettings.h"
+
+// Viewer includes
+#include "llcombobox.h"
+#include "llsliderctrl.h"
+#include "llviewercontrol.h"
+#include "llvoiceclient.h"
+#include "llvoicechannel.h"
+
+// Library includes (after viewer)
+#include "lluictrlfactory.h"
+
+
+static LLRegisterPanelClassWrapper<LLPanelVoiceDeviceSettings> t_panel_group_general("panel_voice_device_settings");
+
+
+LLPanelVoiceDeviceSettings::LLPanelVoiceDeviceSettings()
+	: LLPanel()
+{
+	mCtrlInputDevices = NULL;
+	mCtrlOutputDevices = NULL;
+	mInputDevice = gSavedSettings.getString("VoiceInputAudioDevice");
+	mOutputDevice = gSavedSettings.getString("VoiceOutputAudioDevice");
+	mDevicesUpdated = FALSE;
+
+	// grab "live" mic volume level
+	mMicVolume = gSavedSettings.getF32("AudioLevelMic");
+
+}
+
+LLPanelVoiceDeviceSettings::~LLPanelVoiceDeviceSettings()
+{
+}
+
+BOOL LLPanelVoiceDeviceSettings::postBuild()
+{
+	LLSlider* volume_slider = getChild<LLSlider>("mic_volume_slider");
+	// set mic volume tuning slider based on last mic volume setting
+	volume_slider->setValue(mMicVolume);
+
+	getChild<LLComboBox>("voice_input_device")->setCommitCallback(
+		boost::bind(&LLPanelVoiceDeviceSettings::onCommitInputDevice, this));
+	getChild<LLComboBox>("voice_output_device")->setCommitCallback(
+		boost::bind(&LLPanelVoiceDeviceSettings::onCommitOutputDevice, this));
+	
+	return TRUE;
+}
+
+// virtual
+void LLPanelVoiceDeviceSettings::handleVisibilityChange ( BOOL new_visibility )
+{
+	if (new_visibility)
+	{
+		initialize();	
+	}
+	else
+	{
+		cleanup();
+		// when closing this window, turn of visiblity control so that 
+		// next time preferences is opened we don't suspend voice
+		gSavedSettings.setBOOL("ShowDeviceSettings", FALSE);
+	}
+}
+void LLPanelVoiceDeviceSettings::draw()
+{
+	refresh();
+
+	// let user know that volume indicator is not yet available
+	bool is_in_tuning_mode = LLVoiceClient::getInstance()->inTuningMode();
+	getChildView("wait_text")->setVisible( !is_in_tuning_mode);
+
+	LLPanel::draw();
+
+	if (is_in_tuning_mode)
+	{
+		const S32 num_bars = 5;
+		F32 voice_power = LLVoiceClient::getInstance()->tuningGetEnergy() / LLVoiceClient::OVERDRIVEN_POWER_LEVEL;
+		S32 discrete_power = llmin(num_bars, llfloor(voice_power * (F32)num_bars + 0.1f));
+
+		for(S32 power_bar_idx = 0; power_bar_idx < num_bars; power_bar_idx++)
+		{
+			std::string view_name = llformat("%s%d", "bar", power_bar_idx);
+			LLView* bar_view = getChild<LLView>(view_name);
+			if (bar_view)
+			{
+				gl_rect_2d(bar_view->getRect(), LLColor4::grey, TRUE);
+
+				LLColor4 color;
+				if (power_bar_idx < discrete_power)
+				{
+					color = (power_bar_idx >= 3) ? LLUIColorTable::instance().getColor("OverdrivenColor") : LLUIColorTable::instance().getColor("SpeakingColor");
+				}
+				else
+				{
+					color = LLUIColorTable::instance().getColor("PanelFocusBackgroundColor");
+				}
+
+				LLRect color_rect = bar_view->getRect();
+				color_rect.stretch(-1);
+				gl_rect_2d(color_rect, color, TRUE);
+			}
+		}
+	}
+}
+
+void LLPanelVoiceDeviceSettings::apply()
+{
+	std::string s;
+	if(mCtrlInputDevices)
+	{
+		s = mCtrlInputDevices->getSimple();
+		gSavedSettings.setString("VoiceInputAudioDevice", s);
+		mInputDevice = s;
+	}
+
+	if(mCtrlOutputDevices)
+	{
+		s = mCtrlOutputDevices->getSimple();
+		gSavedSettings.setString("VoiceOutputAudioDevice", s);
+		mOutputDevice = s;
+	}
+
+	// assume we are being destroyed by closing our embedding window
+	LLSlider* volume_slider = getChild<LLSlider>("mic_volume_slider");
+	if(volume_slider)
+	{
+		F32 slider_value = (F32)volume_slider->getValue().asReal();
+		gSavedSettings.setF32("AudioLevelMic", slider_value);
+		mMicVolume = slider_value;
+	}
+}
+
+void LLPanelVoiceDeviceSettings::cancel()
+{
+	gSavedSettings.setString("VoiceInputAudioDevice", mInputDevice);
+	gSavedSettings.setString("VoiceOutputAudioDevice", mOutputDevice);
+
+	if(mCtrlInputDevices)
+		mCtrlInputDevices->setSimple(mInputDevice);
+
+	if(mCtrlOutputDevices)
+		mCtrlOutputDevices->setSimple(mOutputDevice);
+
+	gSavedSettings.setF32("AudioLevelMic", mMicVolume);
+	LLSlider* volume_slider = getChild<LLSlider>("mic_volume_slider");
+	if(volume_slider)
+	{
+		volume_slider->setValue(mMicVolume);
+	}
+}
+
+void LLPanelVoiceDeviceSettings::refresh()
+{
+	//grab current volume
+	LLSlider* volume_slider = getChild<LLSlider>("mic_volume_slider");
+	// set mic volume tuning slider based on last mic volume setting
+	F32 current_volume = (F32)volume_slider->getValue().asReal();
+	LLVoiceClient::getInstance()->tuningSetMicVolume(current_volume);
+
+	// Fill in popup menus
+	mCtrlInputDevices = getChild<LLComboBox>("voice_input_device");
+	mCtrlOutputDevices = getChild<LLComboBox>("voice_output_device");
+
+	if(!LLVoiceClient::getInstance()->deviceSettingsAvailable())
+	{
+		// The combo boxes are disabled, since we can't get the device settings from the daemon just now.
+		// Put the currently set default (ONLY) in the box, and select it.
+		if(mCtrlInputDevices)
+		{
+			mCtrlInputDevices->removeall();
+			mCtrlInputDevices->add( mInputDevice, ADD_BOTTOM );
+			mCtrlInputDevices->setSimple(mInputDevice);
+		}
+		if(mCtrlOutputDevices)
+		{
+			mCtrlOutputDevices->removeall();
+			mCtrlOutputDevices->add( mOutputDevice, ADD_BOTTOM );
+			mCtrlOutputDevices->setSimple(mOutputDevice);
+		}
+	}
+	else if (!mDevicesUpdated)
+	{
+		LLVoiceDeviceList::const_iterator iter;
+		
+		if(mCtrlInputDevices)
+		{
+			mCtrlInputDevices->removeall();
+			mCtrlInputDevices->add( getString("default_text"), ADD_BOTTOM );
+
+			for(iter=LLVoiceClient::getInstance()->getCaptureDevices().begin(); 
+				iter != LLVoiceClient::getInstance()->getCaptureDevices().end();
+				iter++)
+			{
+				// Lets try to localize some system device names. EXT-8375
+				std::string device_name = *iter;
+				LLStringUtil::toLower(device_name); //compare in low case
+				if ("default system device" == device_name)
+				{
+					device_name = getString(device_name);
+				}
+				else if ("no device" == device_name)
+				{
+					device_name = getString(device_name);
+				}
+				else
+				{
+					// restore original value
+					device_name = *iter;
+				}
+				mCtrlInputDevices->add(device_name, ADD_BOTTOM );
+			}
+
+			if(!mCtrlInputDevices->setSimple(mInputDevice))
+			{
+				mCtrlInputDevices->setSimple(getString("default_text"));
+			}
+		}
+		
+		if(mCtrlOutputDevices)
+		{
+			mCtrlOutputDevices->removeall();
+			mCtrlOutputDevices->add( getString("default_text"), ADD_BOTTOM );
+
+			for(iter= LLVoiceClient::getInstance()->getRenderDevices().begin(); 
+				iter !=  LLVoiceClient::getInstance()->getRenderDevices().end(); iter++)
+			{
+				// Lets try to localize some system device names. EXT-8375
+				std::string device_name = *iter;
+				LLStringUtil::toLower(device_name); //compare in low case
+				if ("default system device" == device_name)
+				{
+					device_name = getString(device_name);
+				}
+				else if ("no device" == device_name)
+				{
+					device_name = getString(device_name);
+				}
+				else
+				{
+					// restore original value
+					device_name = *iter;
+				}
+				mCtrlOutputDevices->add(device_name, ADD_BOTTOM );
+			}
+
+			if(!mCtrlOutputDevices->setSimple(mOutputDevice))
+			{
+				mCtrlOutputDevices->setSimple(getString("default_text"));
+			}
+		}
+		mDevicesUpdated = TRUE;
+	}	
+}
+
+void LLPanelVoiceDeviceSettings::initialize()
+{
+	mInputDevice = gSavedSettings.getString("VoiceInputAudioDevice");
+	mOutputDevice = gSavedSettings.getString("VoiceOutputAudioDevice");
+	mMicVolume = gSavedSettings.getF32("AudioLevelMic");
+	mDevicesUpdated = FALSE;
+
+	// ask for new device enumeration
+	LLVoiceClient::getInstance()->refreshDeviceLists();
+
+	// put voice client in "tuning" mode
+	LLVoiceClient::getInstance()->tuningStart();
+	LLVoiceChannel::suspend();
+}
+
+void LLPanelVoiceDeviceSettings::cleanup()
+{
+	LLVoiceClient::getInstance()->tuningStop();
+	LLVoiceChannel::resume();
+}
+
+void LLPanelVoiceDeviceSettings::onCommitInputDevice()
+{
+	if(LLVoiceClient::getInstance())
+	{
+		LLVoiceClient::getInstance()->setCaptureDevice(
+			getChild<LLComboBox>("voice_input_device")->getValue().asString());
+	}
+}
+
+void LLPanelVoiceDeviceSettings::onCommitOutputDevice()
+{
+	if(LLVoiceClient::getInstance())
+	{
+		LLVoiceClient::getInstance()->setRenderDevice(
+			getChild<LLComboBox>("voice_input_device")->getValue().asString());
+	}
+}