Using the device module to set speaker/mic volume set the system mic/volume

for all applications.  Instead, modify the volume on the various streams.

2 files changed, 99 insertions, 11 deletions

diff --git a/indra/newview/llvoicewebrtc.cpp b/indra/newview/llvoicewebrtc.cpp
index 26b617bde4..435e2e1245 100644
--- a/indra/newview/llvoicewebrtc.cpp
+++ b/indra/newview/llvoicewebrtc.cpp
@@ -746,7 +746,7 @@ void LLWebRTCVoiceClient::sendPositionAndVolumeUpdate(bool force)
 
     if (!mMuteMic)
     {
-        audio_level = (F32) mWebRTCDeviceInterface->getPeerAudioLevel();
+        audio_level = (F32) mWebRTCDeviceInterface->getPeerAudioLevel() * mMicVolume;
         uint_audio_level = (uint32_t) (audio_level * 128);
 
     }
@@ -853,6 +853,33 @@ void LLWebRTCVoiceClient::sessionState::sendData(const std::string &data)
     }
 }
 
+void LLWebRTCVoiceClient::sessionState::setMuteMic(bool muted)
+{
+    mMuted = muted;
+    for (auto& connection : mWebRTCConnections)
+    {
+        connection.second->setMuteMic(muted);
+    }
+}
+
+void LLWebRTCVoiceClient::sessionState::setMicGain(F32 gain)
+{
+    mMicGain = gain;
+    for (auto& connection : mWebRTCConnections)
+    {
+        connection.second->setMicGain(gain);
+    }
+}
+
+void LLWebRTCVoiceClient::sessionState::setSpeakerVolume(F32 volume)
+{
+    mSpeakerVolume = volume;
+    for (auto& connection : mWebRTCConnections)
+    {
+        connection.second->setSpeakerVolume(volume);
+    }
+}
+
 void LLWebRTCVoiceClient::sendLocalAudioUpdates()
 {
 }
@@ -1723,10 +1750,6 @@ void LLWebRTCVoiceClient::leaveChannel(void)
 void LLWebRTCVoiceClient::setMuteMic(bool muted)
 {
 
-    if (mWebRTCDeviceInterface)
-    {
-        mWebRTCDeviceInterface->setMute(muted);
-    }
     mMuteMic = muted;
     sessionState::for_each(boost::bind(predSetMuteMic, _1, muted));
 }
@@ -1738,6 +1761,17 @@ void LLWebRTCVoiceClient::predSetMuteMic(const LLWebRTCVoiceClient::sessionState
     {
         participant->mPower = 0.0;
     }
+    session->setMuteMic(muted);
+}
+
+void LLWebRTCVoiceClient::predSetSpeakerVolume(const LLWebRTCVoiceClient::sessionStatePtr_t &session, F32 volume)
+{
+    session->setSpeakerVolume(volume);
+}
+
+void LLWebRTCVoiceClient::predSetMicGain(const LLWebRTCVoiceClient::sessionStatePtr_t &session, F32 volume)
+{
+    session->setMicGain(volume);
 }
 
 void LLWebRTCVoiceClient::setVoiceEnabled(bool enabled)
@@ -1838,10 +1872,7 @@ void LLWebRTCVoiceClient::setVoiceVolume(F32 volume)
             mSpeakerVolume      = volume;
             mSpeakerVolumeDirty = true;
         }
-        if (mWebRTCDeviceInterface)
-        {
-            mWebRTCDeviceInterface->setSpeakerVolume(volume);
-        }
+        sessionState::for_each(boost::bind(predSetSpeakerVolume, _1, volume));
 	}
 }
 
@@ -1854,6 +1885,7 @@ void LLWebRTCVoiceClient::setMicGain(F32 volume)
 		mMicVolume = scaled_volume;
 		mMicVolumeDirty = true;
 	}
+    sessionState::for_each(boost::bind(predSetMicGain, _1, scaled_volume));
 }
 
 /////////////////////////////
@@ -2059,7 +2091,9 @@ LLWebRTCVoiceClient::sessionState::ptr_t LLWebRTCVoiceClient::sessionState::crea
 
     sessionState::ptr_t session(new sessionState());
     session->mChannelID = channelID;
-    session->mWebRTCConnections[channelID] = connectionPtr_t(new LLVoiceWebRTCConnection(region_id, parcelLocalID, channelID));
+    connectionPtr_t connection = connectionPtr_t(new LLVoiceWebRTCConnection(region_id, parcelLocalID, channelID));
+    session->mWebRTCConnections[channelID] = connection;
+    
     session->mPrimaryConnectionID          = channelID;
 
     // add agent as participant
@@ -2190,6 +2224,9 @@ LLWebRTCVoiceClient::sessionStatePtr_t LLWebRTCVoiceClient::addSession(const std
 		
 		LL_DEBUGS("Voice") << "adding new session: CHANNEL " << channel_id << LL_ENDL;
         result = sessionState::createSession(channel_id, parcel_local_id);
+        result->setMuteMic(mMuteMic);
+        result->setMicGain(mMicVolume);
+        result->setSpeakerVolume(mSpeakerVolume);
 
 		if (LLVoiceClient::instance().getVoiceEffectEnabled())
 		{
@@ -2442,7 +2479,10 @@ LLVoiceWebRTCConnection::LLVoiceWebRTCConnection(const LLUUID &regionID, S32 par
     mChannelID(channelID),
     mRegionID(regionID),
     mParcelLocalID(parcelLocalID),
-    mShutDown(false)
+    mShutDown(false),
+    mMuted(true),
+    mSpeakerVolume(0.0),
+    mMicGain(0.0)
 {
     mWebRTCPeerConnection = llwebrtc::newPeerConnection();
     mWebRTCPeerConnection->setSignalingObserver(this);
@@ -2821,6 +2861,9 @@ bool LLVoiceWebRTCConnection::connectionStateMachine()
 
         case VOICE_STATE_SESSION_ESTABLISHED:
         {
+            mWebRTCAudioInterface->setMute(mMuted);
+            mWebRTCAudioInterface->setReceiveVolume(mSpeakerVolume);
+            mWebRTCAudioInterface->setSendVolume(mMicGain);
             LLWebRTCVoiceClient::getInstance()->OnConnectionEstablished(mChannelID);
             setVoiceConnectionState(VOICE_STATE_SESSION_UP);
         }
@@ -2958,3 +3001,30 @@ void LLVoiceWebRTCConnection::OnVoiceDisconnectionRequestFailure(std::string url
     }
     setVoiceConnectionState(VOICE_STATE_SESSION_EXIT);
 }
+
+void LLVoiceWebRTCConnection::setMuteMic(bool muted)
+{
+    mMuted = true;
+    if (mWebRTCAudioInterface)
+    {
+        mWebRTCAudioInterface->setMute(muted);
+    }
+}
+
+void LLVoiceWebRTCConnection::setMicGain(F32 gain)
+{
+    mMicGain = gain;
+    if (mWebRTCAudioInterface)
+    {
+        mWebRTCAudioInterface->setSendVolume(gain);
+    }
+}
+
+void LLVoiceWebRTCConnection::setSpeakerVolume(F32 volume)
+{
+    mSpeakerVolume = volume;
+    if (mWebRTCAudioInterface)
+    {
+        mWebRTCAudioInterface->setReceiveVolume(volume);
+    }
+}
diff --git a/indra/newview/llvoicewebrtc.h b/indra/newview/llvoicewebrtc.h
index 456681ed25..f0549495e1 100644
--- a/indra/newview/llvoicewebrtc.h
+++ b/indra/newview/llvoicewebrtc.h
@@ -336,6 +336,10 @@ public:
         void OnConnectionFailure(const std::string &channelID);
 
 		void sendData(const std::string &data);
+        
+        void setMuteMic(bool muted);
+        void setMicGain(F32 volume);
+        void setSpeakerVolume(F32 volume);
 		
         static void for_each(sessionFunc_t func);
 
@@ -350,6 +354,10 @@ public:
 		std::string mName;
 		std::string mErrorStatusString;
 		std::queue<std::string> mTextMsgQueue;
+        
+        bool        mMuted;
+        F32         mMicGain;
+        F32         mSpeakerVolume;
 		
 		LLUUID		mIMSessionID;
 		LLUUID		mCallerID;
@@ -404,6 +412,9 @@ public:
     static void predSendData(const LLWebRTCVoiceClient::sessionStatePtr_t &session, const std::string& spatial_data, const std::string& volume_data);
     static void predUpdateOwnVolume(const LLWebRTCVoiceClient::sessionStatePtr_t &session, F32 audio_level);
     static void predSetMuteMic(const LLWebRTCVoiceClient::sessionStatePtr_t &session, bool mute);
+    static void predSetMicGain(const LLWebRTCVoiceClient::sessionStatePtr_t &session, F32 volume);
+    static void predSetSpeakerVolume(const LLWebRTCVoiceClient::sessionStatePtr_t &session, F32 volume);
+
 	//////////////////////////////
 	/// @name TVC/Server management and communication
 	//@{
@@ -746,6 +757,9 @@ class LLVoiceWebRTCConnection :
 	bool connectionStateMachine();
 
 	void sendData(const std::string &data);
+    void setMuteMic(bool muted);
+    void setMicGain(F32 volume);
+    void setSpeakerVolume(F32 volume);
 
 	void shutDown()
 	{ 
@@ -811,6 +825,10 @@ protected:
 
     bool   mShutDown;
 
+    bool        mMuted;
+    F32         mMicGain;
+    F32         mSpeakerVolume;
+
     std::vector<llwebrtc::LLWebRTCIceCandidate> mIceCandidates;
     bool                                        mIceCompleted;
     bool                                        mTrickling;