chore(sound): node name and is_sink not needed anymore

Author: mmstick

subscriptions/sound/src/lib.rs

@@ -267,12 +267,10 @@ impl Model {
 
     pub fn sink_changed(&mut self, pos: usize) -> Task<Message> {
         if let Some(&object_id) = self.sink_node_ids.get(pos) {
-            if let Some(node_name) = self.node_names.get(object_id).cloned() {
-                self.set_default_sink_id(object_id);
-                tokio::task::spawn(async move {
-                    wpctl::set_default(object_id, &node_name, true).await;
-                });
-            }
+            self.set_default_sink_id(object_id);
+            tokio::task::spawn(async move {
+                wpctl::set_default(object_id).await;
+            });
         }
 
         Task::none()
@@ -308,12 +306,10 @@ impl Model {
 
     pub fn source_changed(&mut self, pos: usize) -> Task<Message> {
         if let Some(&object_id) = self.source_node_ids.get(pos) {
-            if let Some(node_name) = self.node_names.get(object_id).cloned() {
-                self.set_default_source_id(object_id);
-                tokio::task::spawn(async move {
-                    wpctl::set_default(object_id, &node_name, false).await;
-                });
-            }
+            self.set_default_source_id(object_id);
+            tokio::task::spawn(async move {
+                wpctl::set_default(object_id).await;
+            });
         }
 
         Task::none()
@@ -561,9 +557,8 @@ impl Model {
 
                             if self.active_sink_node_name == node.node_name {
                                 self.set_default_sink_id(node.object_id);
-                                let node_name = node.node_name.clone();
                                 tokio::task::spawn(async move {
-                                    wpctl::set_default(node.object_id, &node_name, true).await;
+                                    wpctl::set_default(node.object_id).await;
                                 });
                             }
                         }
@@ -574,9 +569,8 @@ impl Model {
 
                             if self.active_source_node_name == node.node_name {
                                 self.set_default_source_id(node.object_id);
-                                let node_name = node.node_name.clone();
                                 tokio::task::spawn(async move {
-                                    wpctl::set_default(node.object_id, &node_name, false).await;
+                                    wpctl::set_default(node.object_id).await;
                                 });
                             }
                         }
@@ -588,9 +582,8 @@ impl Model {
                 if let Some((device_id, node_id)) = self.prev_profile_node {
                     if Some(device_id) == node.device_id && node.object_id == node_id {
                         self.prev_profile_node = None;
-                        let is_sink = matches!(node.media_class, pipewire::MediaClass::Sink);
                         tokio::task::spawn(async move {
-                            wpctl::set_default(node_id, &node.node_name, is_sink).await;
+                            wpctl::set_default(node_id).await;
                         });
                     }
                 }

subscriptions/sound/src/wpctl.rs

@@ -1,6 +1,6 @@
 use numtoa::BaseN;
 
-pub async fn set_default(id: u32, name: &str, is_sink: bool) {
+pub async fn set_default(id: u32) {
     let id = numtoa::BaseN::<10>::u32(id);
     _ = tokio::process::Command::new("wpctl")
         .args(["set-default", id.as_str()])