diff options
Diffstat (limited to 'indra/newview/llvoicewebrtc.h')
| -rw-r--r-- | indra/newview/llvoicewebrtc.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/indra/newview/llvoicewebrtc.h b/indra/newview/llvoicewebrtc.h index 7042bbae00..480a7897cd 100644 --- a/indra/newview/llvoicewebrtc.h +++ b/indra/newview/llvoicewebrtc.h @@ -41,7 +41,7 @@ class LLWebRTCProtocolParser; #include "llparcel.h" #include "llmutelist.h" #include <queue> -#include "json/reader.h" +#include "boost/json.hpp" #ifdef LL_USESYSTEMLIBS # include "expat.h" @@ -64,7 +64,7 @@ class LLWebRTCVoiceClient : public LLSingleton<LLWebRTCVoiceClient>, public llwebrtc::LLWebRTCDevicesObserver, public LLMuteListObserver { - LLSINGLETON_C11(LLWebRTCVoiceClient); + LLSINGLETON(LLWebRTCVoiceClient); LOG_CLASS(LLWebRTCVoiceClient); virtual ~LLWebRTCVoiceClient(); @@ -122,15 +122,15 @@ public: bool isParticipant(const LLUUID& speaker_id) override; // Send a text message to the specified user, initiating the session if necessary. - // virtual BOOL sendTextMessage(const LLUUID& participant_id, const std::string& message) const {return false;}; + // virtual bool sendTextMessage(const LLUUID& participant_id, const std::string& message) const {return false;}; // Returns true if calling back the session URI after the session has closed is possible. // Currently this will be false only for PSTN P2P calls. // NOTE: this will return true if the session can't be found. - BOOL isSessionCallBackPossible(const LLUUID &session_id) override; + bool isSessionCallBackPossible(const LLUUID &session_id) override; // WebRTC doesn't preclude text im - BOOL isSessionTextIMPossible(const LLUUID &session_id) override { return TRUE; } + bool isSessionTextIMPossible(const LLUUID &session_id) override { return true; } //////////////////////////// /// @name Channel stuff @@ -177,9 +177,9 @@ public: ////////////////////////// /// @name nearby speaker accessors std::string getDisplayName(const LLUUID& id) override; - BOOL isParticipantAvatar(const LLUUID &id) override; - BOOL getIsSpeaking(const LLUUID& id) override; - BOOL getIsModeratorMuted(const LLUUID& id) override; + bool isParticipantAvatar(const LLUUID &id) override; + bool getIsSpeaking(const LLUUID& id) override; + bool getIsModeratorMuted(const LLUUID& id) override; F32 getCurrentPower(const LLUUID& id) override; // "power" is related to "amplitude" in a defined way. I'm just not sure what the formula is... F32 getUserVolume(const LLUUID& id) override; void setUserVolume(const LLUUID& id, F32 volume) override; // set's volume for specified agent, from 0-1 (where .5 is nominal) |