Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Voice Update] Further sync llvoiceclient and llvoicevivox with upstream

Browse Source 
Mainly tiny motions to ease merging as viewer-vivox2 work continues
Condenses MultiVoice block
This commit is contained in:
Inusaito Sayori
2013-07-27 16:47:35 -04:00
parent 641067c399
commit 353e2977d6
3 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llvoiceclient.cpp
View File

@@ -540,6 +540,7 @@ void LLVoiceClient::setMuteMic(bool muted)
{
mMuteMic = muted;
updateMicMuteLogic();
mMicroChangedSignal();
}
@@ -550,6 +551,7 @@ void LLVoiceClient::setUserPTTState(bool ptt)
{
mUserPTTState = ptt;
updateMicMuteLogic();
mMicroChangedSignal();
}
bool LLVoiceClient::getUserPTTState()

6
indra/newview/llvoiceclient.h
View File

@@ -301,6 +301,9 @@ public:
LLVoiceClient();
~LLVoiceClient();
typedef boost::signals2::signal<void(void)> micro_changed_signal_t;
micro_changed_signal_t mMicroChangedSignal;
void init(LLPumpIO *pump); // Call this once at application startup (creates connector)
void terminate(); // Call this to clean up during shutdown
@@ -399,6 +402,8 @@ public:
void keyUp(KEY key, MASK mask);
void middleMouseState(bool down);
boost::signals2::connection MicroChangedCallback(const micro_changed_signal_t::slot_type& cb ) { return mMicroChangedSignal.connect(cb); }
/////////////////////////////
// Accessors for data related to nearby speakers
@@ -454,6 +459,7 @@ protected:
LLVoiceModuleInterface* mVoiceModule;
LLPumpIO *m_servicePump;
LLCachedControl<bool> mVoiceEffectEnabled;
LLCachedControl<std::string> mVoiceEffectDefault;

26
indra/newview/llvoicevivox.cpp
View File

@@ -177,6 +177,7 @@ class LLVivoxVoiceClientMuteListObserver : public LLMuteListObserver
/* virtual */ void onChange() { LLVivoxVoiceClient::getInstance()->muteListChanged();}
};
static LLVivoxVoiceClientMuteListObserver mutelist_listener;
static bool sMuteListListener_listening = false;
@@ -836,20 +837,6 @@ void LLVivoxVoiceClient::stateMachine()
// SLIM SDK: these arguments are no longer necessary.
// std::string args = " -p tcp -h -c";
std::string loglevel = gSavedSettings.getString("VivoxDebugLevel");
// If we allow multiple instances of the viewer to start the voice
// daemon, set TEMPORARY random voice port
if (gSavedSettings.getBOOL("VoiceMultiInstance"))
{
LLControlVariable* voice_port = gSavedSettings.getControl("VoicePort");
if (voice_port)
{
const BOOL DO_NOT_PERSIST = FALSE;
S32 port_nr = 30000 + ll_rand(20000);
voice_port->setValue(LLSD(port_nr), DO_NOT_PERSIST);
}
}
if(loglevel.empty())
{
loglevel = "-0"; // turn logging off completely
@@ -858,9 +845,18 @@ void LLVivoxVoiceClient::stateMachine()
args += " -ll ";
args += loglevel;
// Tell voice gateway to listen to a specific port
// If we allow multiple instances of the viewer to start the voicedaemon
if (gSavedSettings.getBOOL("VoiceMultiInstance"))
{
// Set TEMPORARY random voice port
LLControlVariable* voice_port = gSavedSettings.getControl("VoicePort");
if (voice_port)
{
const BOOL DO_NOT_PERSIST = FALSE;
S32 port_nr = 30000 + ll_rand(20000);
voice_port->setValue(LLSD(port_nr), DO_NOT_PERSIST);
}
// Tell voice gateway to listen to a specific port
args += llformat(" -i 127.0.0.1:%u", gSavedSettings.getU32("VoicePort"));
}