fix(sound): wrong profile position when profiles are filtered

Author: mmstick

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

@@ -84,26 +84,34 @@ pub fn view() -> Section<crate::pages::Message> {
                         .and_then(|profile| {
                             profiles
                                 .iter()
+                                .filter(|p| {
+                                    matches!(
+                                        p.available,
+                                        pipewire::Availability::Yes
+                                            | pipewire::Availability::Unknown
+                                    )
+                                })
                                 .enumerate()
                                 .find(|(_, p)| p.index == profile.index)
                                 .map(|(pos, _)| pos)
                         });
 
                 // TODO: cache
-                let profiles = profiles
+                let (indexes, profiles): (Vec<_>, Vec<_>) = profiles
                     .iter()
                     .filter(|p| {
                         matches!(
                             p.available,
                             pipewire::Availability::Yes | pipewire::Availability::Unknown
                         )
                     })
-                    .map(|p| p.description.clone());
+                    .map(|p| (p.index as u32, p.description.clone()))
+                    .collect();
 
                 let dropdown = widget::dropdown::popup_dropdown(
                     Vec::from_iter(profiles),
                     active_profile,
-                    move |id| super::Message::SetProfile(device_id, id),
+                    move |id| super::Message::SetProfile(device_id, indexes[id]),
                     cosmic::iced::window::Id::RESERVED,
                     super::Message::Surface,
                     crate::Message::from,

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

@@ -22,7 +22,7 @@ const AMPLIFICATION_SOURCE: &str = "amplification_source";
 #[derive(Clone, Debug)]
 pub enum Message {
     /// Set the profile of a sound device.
-    SetProfile(u32, usize),
+    SetProfile(u32, u32),
     /// Change the balance of the active sink.
     SinkBalanceChanged(u32),
     /// Change the default output.

subscriptions/sound/src/lib.rs

@@ -134,8 +134,6 @@ pub struct Model {
     active_sink_device: Option<u32>,
     /// Index of active sink device.
     active_sink: Option<usize>,
-    /// Card profile index of active sink device.
-    active_sink_profile: Option<usize>,
 
     /** Source devices */
 
@@ -147,8 +145,6 @@ pub struct Model {
     active_source_device: Option<u32>,
     /// Index of active source device.
     active_source: Option<usize>,
-    /// Card profile index of active source device.
-    active_source_profile: Option<usize>,
 
     /// Device identifier of the default sink.
     default_sink: String,
@@ -176,18 +172,10 @@ impl Model {
         self.active_sink
     }
 
-    pub fn active_sink_profile(&self) -> Option<usize> {
-        self.active_sink_profile
-    }
-
     pub fn active_source(&self) -> Option<usize> {
         self.active_source
     }
 
-    pub fn active_source_profile(&self) -> Option<usize> {
-        self.active_source_profile
-    }
-
     pub fn sinks(&self) -> &[String] {
         &self.sinks
     }
@@ -210,20 +198,16 @@ impl Model {
     /// Sets and applies a profile to a device with wpctl.
     ///
     /// Requires using the device ID rather than a node ID.
-    pub fn set_profile(&mut self, device_id: DeviceId, pos: usize) {
+    pub fn set_profile(&mut self, device_id: DeviceId, index: u32) {
+        eprintln!("set profile {device_id} {index}");
         if let Some(profiles) = self.device_profiles.get(device_id) {
-            if let Some(profile) = profiles.get(pos) {
-                let index = profile.index as u32;
-                tokio::spawn(async move {
-                    wpctl::set_profile(device_id, index).await;
-                });
-
-                self.active_profiles.insert(device_id, profile.clone());
+            for profile in profiles {
+                if profile.index as u32 == index {
+                    tokio::spawn(async move {
+                        wpctl::set_profile(device_id, index).await;
+                    });
 
-                if self.active_sink_device == Some(device_id) {
-                    self.active_sink_profile = Some(pos)
-                } else if self.active_source_device == Some(device_id) {
-                    self.active_source_profile = Some(pos);
+                    self.active_profiles.insert(device_id, profile.clone());
                 }
             }
         }