livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CR suggestions

master
Roxie Linden 2024-04-07 19:23:00 -07:00
parent 4be63d8c1f
commit 648741470f
3 changed files with 30 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
indra/llwebrtc/llwebrtc.cpp
View File

@ -515,16 +515,6 @@ void LLWebRTCImpl::updateDevices()
char name[webrtc::kAdmMaxDeviceNameSize];
char guid[webrtc::kAdmMaxGuidSize];
mTuningDeviceModule->PlayoutDeviceName(index, name, guid);
#if WEBRTC_LINUX
// Linux audio implementation (pulse and alsa)
// return empty strings for the guid, so
// use the name for the guid
if (!strcmp(guid, ""))
{
strcpy(guid, name);
}
#endif // WEBRTC_LINUX
mPlayoutDeviceList.emplace_back(name, guid);
}
@ -543,15 +533,6 @@ void LLWebRTCImpl::updateDevices()
char name[webrtc::kAdmMaxDeviceNameSize];
char guid[webrtc::kAdmMaxGuidSize];
mTuningDeviceModule->RecordingDeviceName(index, name, guid);
#if WEBRTC_LINUX
// Linux audio implementation (pulse and alsa)
// return empty strings for the guid, so
// use the name for the guid
if (!strcmp(guid, ""))
{
strcpy(guid, name);
}
#endif // WEBRTC_LINUX
mRecordingDeviceList.emplace_back(name, guid);
}

7
indra/llwebrtc/llwebrtc.h
View File

@ -78,7 +78,12 @@ class LLWebRTCVoiceDevice
LLWebRTCVoiceDevice(const std::string &display_name, const std::string &id) :
mDisplayName(display_name),
mID(id)
{};
{
if (mID.empty())
{
mID = display_name;
}
};
};
typedef std::vector<LLWebRTCVoiceDevice> LLWebRTCVoiceDeviceList;

48
indra/newview/llimview.cpp
View File

@ -3005,42 +3005,42 @@ void LLIncomingCallDialog::processCallResponse(S32 response, const LLSD &payload
{
if (type == IM_SESSION_P2P_INVITE)
{
// decline p2p voice, either via the vivox-style call mechanism
// decline p2p voice, either via the vivox-style call mechanism
// or via the webrtc-style "decline p2p" mechanism.
LLVoiceP2PIncomingCallInterfacePtr call = LLVoiceClient::getInstance()->getIncomingCallInterface(payload["voice_channel_info"]);
if (call)
{
call->declineInvite();
}
LLVoiceP2PIncomingCallInterfacePtr call = LLVoiceClient::getInstance()->getIncomingCallInterface(payload["voice_channel_info"]);
if (call)
{
call->declineInvite();
}
else
{
// webrtc-style decline.
LLViewerRegion *region = gAgent.getRegion();
if (region)
{
std::string url = region->getCapability("ChatSessionRequest");
LLViewerRegion *region = gAgent.getRegion();
if (region)
{
std::string url = region->getCapability("ChatSessionRequest");
LLSD data;
data["method"] = "decline p2p voice";
data["session-id"] = session_id;
LLSD data;
data["method"] = "decline p2p voice";
data["session-id"] = session_id;
LLCoreHttpUtil::HttpCoroutineAdapter::messageHttpPost(url, data, "P2P declined", "P2P decline failed.");
}
LLCoreHttpUtil::HttpCoroutineAdapter::messageHttpPost(url, data, "P2P declined", "P2P decline failed.");
}
}
}
else
{
LLViewerRegion *region = gAgent.getRegion();
if (region)
{
std::string url = region->getCapability("ChatSessionRequest");
LLViewerRegion *region = gAgent.getRegion();
if (region)
{
std::string url = region->getCapability("ChatSessionRequest");
LLSD data;
data["method"] = "decline invitation";
data["session-id"] = session_id;
LLSD data;
data["method"] = "decline invitation";
data["session-id"] = session_id;
LLCoreHttpUtil::HttpCoroutineAdapter::messageHttpPost(url, data, "Invitation declined", "Invitation decline failed.");
}
LLCoreHttpUtil::HttpCoroutineAdapter::messageHttpPost(url, data, "Invitation declined", "Invitation decline failed.");
}
}
}