fix(sound): improve audio sink/source display names

Author: mmstick

cosmic-settings/src/pages/sound/mod.rs

@@ -355,7 +355,7 @@ fn input() -> Section<crate::pages::Message> {
                 .push(horizontal_space().width(8.))
                 .push(slider);
             let devices = widget::dropdown::popup_dropdown(
-                &page.model.sources.description,
+                &page.model.sources.display,
                 Some(page.model.sources.active.unwrap_or(0)),
                 Message::SetDefaultSource,
                 window::Id::RESERVED,
@@ -435,7 +435,7 @@ fn output() -> Section<crate::pages::Message> {
                 .push(slider);
 
             let devices = widget::dropdown::popup_dropdown(
-                &page.model.sinks.description,
+                &page.model.sinks.display,
                 Some(page.model.sinks.active.unwrap_or(0)),
                 Message::SetDefaultSink,
                 window::Id::RESERVED,

cosmic-settings/src/pages/sound/model.rs

@@ -183,7 +183,14 @@ impl Model {
 
                             None
                         })
-                        .unwrap_or_else(|| self.sinks.description[pos].clone());
+                        .unwrap_or_else(|| {
+                            [
+                                &node.device_profile_description,
+                                " - ",
+                                &*self.sinks.description[pos],
+                            ]
+                            .concat()
+                        });
 
                     if let Some(default_node_id) = self.default_sink {
                         if default_node_id == node_id {
@@ -241,7 +248,16 @@ impl Model {
 
                             None
                         })
-                        .unwrap_or_else(|| Some(self.sources.description[pos].clone()))
+                        .unwrap_or_else(|| {
+                            Some(
+                                [
+                                    &node.device_profile_description,
+                                    " - ",
+                                    &*self.sources.description[pos],
+                                ]
+                                .concat(),
+                            )
+                        })
                     {
                         self.sources.display[pos] = name;
                     } else {