cbfa47c0da
Minor updates to code, mostly just a migration with some v3 stuff commented, since we don't have LLAvatarList and must use buttons since scrolllist menus don't actually exist nicely yet. Added toggleMuteVoice and isVoiceMuted to LLAvatarActions Added a minor touch to the voice volume slider, it'll now offer changing your own volume while in an active voice session.. nice to not drop out of an import voice session just to fix yourself. Also, fix a bug with SpeakerMgr's not flagging speakers for removal properly, causing external speakers and speakers managed by LLActiveSpeakerMgr to never actually get removed.
93 lines
2.9 KiB
C++
93 lines
2.9 KiB
C++
/**
|
|
* @file llfloateractivespeakers.cpp
|
|
* @brief Management interface for muting and controlling volume of residents currently speaking
|
|
*
|
|
* $LicenseInfo:firstyear=2005&license=viewergpl$
|
|
* Second Life Viewer Source Code
|
|
* Copyright (c) 2005-2009, Linden Research, Inc.
|
|
*
|
|
* The source code in this file ("Source Code") is provided by Linden Lab
|
|
* to you under the terms of the GNU General Public License, version 2.0
|
|
* ("GPL"), unless you have obtained a separate licensing agreement
|
|
* ("Other License"), formally executed by you and Linden Lab. Terms of
|
|
* the GPL can be found in doc/GPL-license.txt in this distribution, or
|
|
* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
|
|
*
|
|
* There are special exceptions to the terms and conditions of the GPL as
|
|
* it is applied to this Source Code. View the full text of the exception
|
|
* in the file doc/FLOSS-exception.txt in this software distribution, or
|
|
* online at
|
|
* http://secondlifegrid.net/programs/open_source/licensing/flossexception
|
|
*
|
|
* By copying, modifying or distributing this software, you acknowledge
|
|
* that you have read and understood your obligations described above,
|
|
* and agree to abide by those obligations.
|
|
*
|
|
* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
|
|
* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
|
|
* COMPLETENESS OR PERFORMANCE.
|
|
* $/LicenseInfo$
|
|
*/
|
|
|
|
#include "llviewerprecompiledheaders.h"
|
|
|
|
#include "llfloateractivespeakers.h"
|
|
|
|
#include "llparticipantlist.h"
|
|
#include "llspeakers.h"
|
|
#include "lluictrlfactory.h"
|
|
|
|
LLFloaterActiveSpeakers::LLFloaterActiveSpeakers(const LLSD& seed) : mPanel(NULL)
|
|
{
|
|
mFactoryMap["active_speakers_panel"] = LLCallbackMap(createSpeakersPanel, NULL);
|
|
// do not automatically open singleton floaters (as result of getInstance())
|
|
BOOL no_open = FALSE;
|
|
LLUICtrlFactory::getInstance()->buildFloater(this, "floater_active_speakers.xml", &getFactoryMap(), no_open);
|
|
//RN: for now, we poll voice client every frame to get voice amplitude feedback
|
|
//LLVoiceClient::getInstance()->addObserver(this);
|
|
mPanel->refreshSpeakers();
|
|
}
|
|
|
|
LLFloaterActiveSpeakers::~LLFloaterActiveSpeakers()
|
|
{
|
|
}
|
|
|
|
void LLFloaterActiveSpeakers::onOpen()
|
|
{
|
|
gSavedSettings.setBOOL("ShowActiveSpeakers", TRUE);
|
|
}
|
|
|
|
void LLFloaterActiveSpeakers::onClose(bool app_quitting)
|
|
{
|
|
if (!app_quitting)
|
|
{
|
|
gSavedSettings.setBOOL("ShowActiveSpeakers", FALSE);
|
|
}
|
|
setVisible(FALSE);
|
|
}
|
|
|
|
void LLFloaterActiveSpeakers::draw()
|
|
{
|
|
// update state every frame to get live amplitude feedback
|
|
mPanel->refreshSpeakers();
|
|
LLFloater::draw();
|
|
}
|
|
|
|
BOOL LLFloaterActiveSpeakers::postBuild()
|
|
{
|
|
mPanel = getChild<LLParticipantList>("active_speakers_panel");
|
|
return TRUE;
|
|
}
|
|
|
|
void LLFloaterActiveSpeakers::onParticipantsChanged()
|
|
{
|
|
//refresh();
|
|
}
|
|
|
|
//static
|
|
void* LLFloaterActiveSpeakers::createSpeakersPanel(void* data)
|
|
{
|
|
return new LLParticipantList(LLActiveSpeakerMgr::getInstance(), /*show_text_chatters=*/ false);
|
|
}
|
|
|