audio: fix cycle output, improve icon resolution for sink

fixes #1808

quickshell/Modules/ControlCenter/Details/AudioOutputDetail.qml

@@ -234,16 +234,7 @@ Rectangle {
                         spacing: Theme.spacingS
 
                         DankIcon {
-                            name: {
-                                if (modelData.name.includes("bluez"))
-                                    return "headset";
-                                else if (modelData.name.includes("hdmi"))
-                                    return "tv";
-                                else if (modelData.name.includes("usb"))
-                                    return "headset";
-                                else
-                                    return "speaker";
-                            }
+                            name: AudioService.sinkIcon(modelData)
                             size: Theme.iconSize - 4
                             color: modelData === AudioService.sink ? Theme.primary : Theme.surfaceText
                             anchors.verticalCenter: parent.verticalCenter

quickshell/Modules/OSD/AudioOutputOSD.qml

@@ -22,27 +22,14 @@ DankOSD {
         text: root.deviceName
     }
 
-    function getIconForSink(sink) {
-        if (!sink)
-            return "speaker";
-        const name = sink.name || "";
-        if (name.includes("bluez"))
-            return "headset";
-        if (name.includes("hdmi"))
-            return "tv";
-        if (name.includes("usb"))
-            return "headset";
-        return "speaker";
-    }
-
     Connections {
         target: AudioService
 
-        function onAudioOutputCycled(name) {
+        function onAudioOutputCycled(name, icon) {
             if (!SettingsData.osdAudioOutputEnabled)
                 return;
             root.deviceName = name;
-            root.deviceIcon = getIconForSink(AudioService.sink);
+            root.deviceIcon = icon;
             root.show();
         }
     }