Matrix/element-call-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-call.git synced 2026-08-29 21:15:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix logic a bit as per comments

Browse Source 
(and... add comments)
This commit is contained in:
David Baker
2023-10-06 11:55:56 +01:00
parent aff01d0423
commit 6d2d5641a5
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/settings/SettingsModal.tsx
View File

@@ -101,27 +101,38 @@ export const SettingsModal = (props: Props) => {
// We may present a different device as the currently selected one if we have an active track // We may present a different device as the currently selected one if we have an active track
// from the default device, because the default device may have changed since we acquired the // from the default device, because the default device may have changed since we acquired the
// track, in which case we want to display the one we're actually using rather than what the // track, in which case we want to display the one we're actually using rather than what the
// default is now. // default is now. We only do this if we've selected, and are using, the default device
if ( if (
trackUsedByRoom && trackUsedByRoom &&
(devices.selectedId === "" || (devices.selectedId === "" ||
!devices.selectedId || !devices.selectedId ||
devices.selectedId === "default") devices.selectedId === "default") &&
trackUsedByRoom.mediaStreamTrack.getSettings().deviceId === "default"
) { ) {
// we work out what the actual device is based on groupId, but this only works if // we work out what the actual device is based on groupId, but this only works if
// there is only one such device with the same group ID, which there won't be if // there is only one such device with the same group ID, which there won't be if
// we're using hardware with multiple sub-devices (eg. a multitrack soundcard) // we're using hardware with multiple sub-devices (eg. a multitrack soundcard)
const usedGroupId = const usedGroupId =
trackUsedByRoom?.mediaStreamTrack.getSettings().groupId; trackUsedByRoom?.mediaStreamTrack.getSettings().groupId;
const devicesWithMatchingGroupId = devices.available.filter( const defaultGroupId = devices.available.find(
(d) => d.groupId === usedGroupId && d.groupId !== "default" (d) => d.deviceId === "default"
); )?.groupId;
if (devicesWithMatchingGroupId.length === 1) { // If the device we're actually using doesn't match tne group ID of what the default is
logger.info( // now, then display a different one.
`Current default device doesn't appear to match device in use: selecting ${devicesWithMatchingGroupId[0].label}` if (usedGroupId !== defaultGroupId) {
const devicesWithMatchingGroupId = devices.available.filter(
(d) => d.groupId === usedGroupId && d.deviceId !== "default"
); );
selectedKey = devicesWithMatchingGroupId[0].deviceId;
// One final check: check that there is only one such device matching the group ID.
// If not, we simply can't match up the device correctly: we don't have enough info.
if (devicesWithMatchingGroupId.length === 1) {
logger.info(
`Current default device doesn't appear to match device in use: selecting ${devicesWithMatchingGroupId[0].label}`
);
selectedKey = devicesWithMatchingGroupId[0].deviceId;
}
} }
} }