mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Prefer audio device 0 if no device preference has been saved

Browse source
This commit is contained in:
Vladimir Skuratovich 2020-10-22 14:40:31 -07:00 committed by Scott Nonnenberg
parent 04b7a29229
commit a4c6003f34
1 changed files with 15 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
ts/services/calling.ts
View file

@ -398,27 +398,23 @@ export class CallingClass {
available: Array<AudioDevice>,
preferred: AudioDevice | undefined
): number | undefined {
if (!preferred) {
// No preference stored
return undefined;
}
// Match by uniqueId first, if available
if (preferred.uniqueId) {
const matchIndex = available.findIndex(
d => d.uniqueId === preferred.uniqueId
);
if (matchIndex !== -1) {
return matchIndex;
if (preferred) {
// Match by uniqueId first, if available
if (preferred.uniqueId) {
const matchIndex = available.findIndex(
d => d.uniqueId === preferred.uniqueId
);
if (matchIndex !== -1) {
return matchIndex;
}
}
// Match by name second
const matchingNames = available.filter(d => d.name === preferred.name);
if (matchingNames.length > 0) {
return matchingNames[0].index;
}
}
// Match by name second
const matchingNames = available.filter(d => d.name === preferred.name);
if (matchingNames.length > 0) {
return matchingNames[0].index;
}
// Nothing matches; take the first device if there are any
// Nothing matches or no preference; take the first device if there are any
return available.length > 0 ? 0 : undefined;
}