From e92e4d762ec5b2c122f17edb1a18b21ef6166e8b Mon Sep 17 00:00:00 2001
From: Roxie Linden <roxie@lindenlab.com>
Date: Mon, 4 Dec 2023 14:22:40 -0800
Subject: Mute using enable.

Muting using the device module microphone mute was muting other
applications, speakers, and so on.  Instead, we mute by enabling/disabling
the input and output streams.
---
 indra/newview/llvoicewebrtc.cpp | 16 ----------------
 indra/newview/llvoicewebrtc.h   |  1 -
 2 files changed, 17 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llvoicewebrtc.cpp b/indra/newview/llvoicewebrtc.cpp
index 435e2e1245..ddd757c39f 100644
--- a/indra/newview/llvoicewebrtc.cpp
+++ b/indra/newview/llvoicewebrtc.cpp
@@ -261,7 +261,6 @@ LLWebRTCVoiceClient::LLWebRTCVoiceClient() :
 
     mEarLocation(0),
     mSpeakerVolumeDirty(true),
-    mSpeakerMuteDirty(true),
     mMicVolume(0),
     mMicVolumeDirty(true),
 
@@ -583,16 +582,7 @@ LLVoiceDeviceList& LLWebRTCVoiceClient::getCaptureDevices()
 
 void LLWebRTCVoiceClient::setCaptureDevice(const std::string& name)
 {
-    bool inTuningMode = mIsInTuningMode;
-    if (inTuningMode)
-    {
-        tuningStop();
-	}
     mWebRTCDeviceInterface->setCaptureDevice(name);
-    if (inTuningMode)
-    {
-        tuningStart();
-    }
 }
 void LLWebRTCVoiceClient::setDevicesListUpdated(bool state)
 {
@@ -1863,12 +1853,6 @@ void LLWebRTCVoiceClient::setVoiceVolume(F32 volume)
 	if (volume != mSpeakerVolume)
 	{
         {
-            int         min_volume = 0.0;
-            if ((volume == min_volume) || (mSpeakerVolume == min_volume))
-            {
-                mSpeakerMuteDirty = true;
-            }
-
             mSpeakerVolume      = volume;
             mSpeakerVolumeDirty = true;
         }
diff --git a/indra/newview/llvoicewebrtc.h b/indra/newview/llvoicewebrtc.h
index f0549495e1..2eb74ed2cb 100644
--- a/indra/newview/llvoicewebrtc.h
+++ b/indra/newview/llvoicewebrtc.h
@@ -645,7 +645,6 @@ private:
 	S32			mEarLocation;  
 	
 	bool		mSpeakerVolumeDirty;
-	bool		mSpeakerMuteDirty;
 	float		mSpeakerVolume;
 
 	int			mMicVolume;
-- 
cgit v1.2.3