Anonymous

Index: phonon/libkaudiodevicelist/audiodevice.cpp
===================================================================
--- phonon/libkaudiodevicelist/audiodevice.cpp  (revision 738537)
+++ phonon/libkaudiodevicelist/audiodevice.cpp  (working copy)
@@ -207,11 +207,11 @@
         }
         QString x_phononId = QLatin1String("x-phonon:CARD=") + handles.first().toString(); // the first is either an int (card number) or a QString (card id)
         QString fallbackId = QLatin1String("plughw:CARD=")   + handles.first().toString(); // the first is either an int (card number) or a QString (card id)
+        // prefer CARD=0 devices over CARD>0
+        d->initialPreference -= handles.first().toInt();
         if (handles.size() > 1 && handles.at(1).isValid()) {
-            if (handles.at(1).toInt() == 0) {
-                // prefer DEV=0 devices over DEV>0
-                d->initialPreference += 1;
-            }
+            // prefer DEV=0 devices over DEV>0
+            d->initialPreference -= handles.at(1).toInt();
             x_phononId += ",DEV=" + handles.at(1).toString();
             fallbackId += ",DEV=" + handles.at(1).toString();
             if (handles.size() > 2 && handles.at(2).isValid()) {