summaryrefslogtreecommitdiff
path: root/indra/llwebrtc
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llwebrtc')
-rw-r--r--indra/llwebrtc/llwebrtc.cpp19
-rw-r--r--indra/llwebrtc/llwebrtc.h7
2 files changed, 6 insertions, 20 deletions
diff --git a/indra/llwebrtc/llwebrtc.cpp b/indra/llwebrtc/llwebrtc.cpp
index 57130bb734..eb9bb65e67 100644
--- a/indra/llwebrtc/llwebrtc.cpp
+++ b/indra/llwebrtc/llwebrtc.cpp
@@ -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);
}
diff --git a/indra/llwebrtc/llwebrtc.h b/indra/llwebrtc/llwebrtc.h
index 8830799cde..ac71e0c744 100644
--- a/indra/llwebrtc/llwebrtc.h
+++ b/indra/llwebrtc/llwebrtc.h
@@ -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;