Improve names of USB devices in AudioDeviceDialog.
This commit is contained in:
@@ -83,6 +83,14 @@ export default class AlsaDeviceInfo {
|
|||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
shortDeviceName() : string {
|
||||||
|
// The best device names for USB devices are buried in the long name, so we try to extract them if we can.
|
||||||
|
let pos = this.longName.indexOf(" at usb-");
|
||||||
|
if (pos > 0) {
|
||||||
|
return this.longName.substring(0, pos);
|
||||||
|
}
|
||||||
|
return this.name;
|
||||||
|
}
|
||||||
|
|
||||||
cardId: number = -1;
|
cardId: number = -1;
|
||||||
id: string = "";
|
id: string = "";
|
||||||
|
|||||||
@@ -67,7 +67,7 @@ function sortDevices(devices: AlsaDeviceInfo[]): AlsaDeviceInfo[] {
|
|||||||
let ca = category(a);
|
let ca = category(a);
|
||||||
let cb = category(b);
|
let cb = category(b);
|
||||||
if (ca !== cb) return ca - cb;
|
if (ca !== cb) return ca - cb;
|
||||||
return a.name.localeCompare(b.name);
|
return a.shortDeviceName().localeCompare(b.shortDeviceName());
|
||||||
});
|
});
|
||||||
return copy;
|
return copy;
|
||||||
}
|
}
|
||||||
@@ -584,7 +584,7 @@ const AudioDeviceDialog = withStyles(
|
|||||||
if (!this.state.alsaDevices) return deviceId;
|
if (!this.state.alsaDevices) return deviceId;
|
||||||
for (let i = 0; i < this.state.alsaDevices.length; ++i) {
|
for (let i = 0; i < this.state.alsaDevices.length; ++i) {
|
||||||
if (this.state.alsaDevices[i].id === deviceId) {
|
if (this.state.alsaDevices[i].id === deviceId) {
|
||||||
return this.state.alsaDevices[i].name;
|
return this.state.alsaDevices[i].shortDeviceName();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return deviceId;
|
return deviceId;
|
||||||
@@ -673,7 +673,7 @@ const AudioDeviceDialog = withStyles(
|
|||||||
<MenuItem key={d.id} disabled={d.captureBusy}
|
<MenuItem key={d.id} disabled={d.captureBusy}
|
||||||
value={d.id}
|
value={d.id}
|
||||||
style={{ opacity: d.captureBusy ? 0.3 : 1 }}
|
style={{ opacity: d.captureBusy ? 0.3 : 1 }}
|
||||||
>{d.name}</MenuItem>
|
>{d.shortDeviceName()}</MenuItem>
|
||||||
))}
|
))}
|
||||||
</Select>
|
</Select>
|
||||||
</FormControl>
|
</FormControl>
|
||||||
@@ -695,7 +695,7 @@ const AudioDeviceDialog = withStyles(
|
|||||||
<MenuItem key={d.id} value={d.id}
|
<MenuItem key={d.id} value={d.id}
|
||||||
style={{ opacity: d.playbackBusy ? 0.3 : 1.0 }}
|
style={{ opacity: d.playbackBusy ? 0.3 : 1.0 }}
|
||||||
disabled={d.playbackBusy}
|
disabled={d.playbackBusy}
|
||||||
>{d.name}</MenuItem>
|
>{d.shortDeviceName()}</MenuItem>
|
||||||
))}
|
))}
|
||||||
</Select>
|
</Select>
|
||||||
</FormControl>
|
</FormControl>
|
||||||
|
|||||||
Reference in New Issue
Block a user