summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Blechmann <tim@klingt.org>2024-05-03 13:20:39 +0800
committerTim Blechmann <tim@klingt.org>2024-05-08 08:43:16 +0800
commit905e7264571b6cd9b1e5ad5a946a6f2824b0494a (patch)
tree112cb3442515974a89eb90ca2d97070198f18cca
parent2937fe559305e0c1c81ba6942a586edfffe0bd76 (diff)
ALSA: relax (sys)default detection
Check if the device name starts with (sys)default. Pick-to: 6.5 6.7 Change-Id: I069c6f2b639df2fb0c50cfce283c6797ae86ed3f Reviewed-by: Mikko Hallamaa <mikko.hallamaa@qt.io> Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io> Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
-rw-r--r--src/multimedia/alsa/qalsamediadevices.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/multimedia/alsa/qalsamediadevices.cpp b/src/multimedia/alsa/qalsamediadevices.cpp
index 10a7e464a..9466fa0cd 100644
--- a/src/multimedia/alsa/qalsamediadevices.cpp
+++ b/src/multimedia/alsa/qalsamediadevices.cpp
@@ -78,12 +78,12 @@ static QList<QAudioDevice> availableDevices(QAudioDevice::Mode mode)
if (infop) {
devices.append(infop->create());
- if (!hasDefault && infop->id == "default") {
+ if (!hasDefault && infop->id.startsWith("default")) {
infop->isDefault = true;
hasDefault = true;
- } else if (!sysdefault && !hasDefault && infop->id == "sysdefault") {
- sysdefault = infop;
}
+ if (!sysdefault && infop->id.startsWith("sysdefault"))
+ sysdefault = infop;
}
}