diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2024-09-18 13:01:43 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2024-09-18 13:01:43 -0700 |
| commit | 52091a6097cd4e68f3fc1b0972080867ceb09122 (patch) | |
| tree | 36da9b661849421b5116eb9a03efdfe5d7ef0fb4 | |
| parent | 27b8e6d576346e3174760087a15811478a90459e (diff) | |
Mute other / set volume level for other is not working.
As part of the boost::json conversion, the json that mutes and sets peer gain
was not being formed correctly.
Also, tweaked the peer gain default.
| -rw-r--r-- | indra/newview/llvoicewebrtc.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llvoicewebrtc.cpp b/indra/newview/llvoicewebrtc.cpp index 3d684e5a1b..aabf897050 100644 --- a/indra/newview/llvoicewebrtc.cpp +++ b/indra/newview/llvoicewebrtc.cpp @@ -87,6 +87,8 @@ namespace { const F32 SPEAKING_AUDIO_LEVEL = 0.30; + const uint32_t PEER_GAIN_CONVERSION_FACTOR = 220; + static const std::string REPORTED_VOICE_SERVER_TYPE = "Secondlife WebRTC Gateway"; // Don't send positional updates more frequently than this: @@ -2443,7 +2445,7 @@ void LLVoiceWebRTCConnection::setSpeakerVolume(F32 volume) void LLVoiceWebRTCConnection::setUserVolume(const LLUUID& id, F32 volume) { - boost::json::object root = {{"ug", {id.asString(), (uint32_t) (volume * 200)}}}; + boost::json::object root = { { "ug", { { id.asString(), (uint32_t)(volume * PEER_GAIN_CONVERSION_FACTOR) } } } }; std::string json_data = boost::json::serialize(root); if (mWebRTCDataInterface) { @@ -2453,7 +2455,7 @@ void LLVoiceWebRTCConnection::setUserVolume(const LLUUID& id, F32 volume) void LLVoiceWebRTCConnection::setUserMute(const LLUUID& id, bool mute) { - boost::json::object root = {{"m", {id.asString(), mute}}}; + boost::json::object root = { { "m", { { id.asString(), mute } } } }; std::string json_data = boost::json::serialize(root); if (mWebRTCDataInterface) { |