Fix feedback loop from volume to channel volumes.

saivert · Jun 11, 2024 · 85d2c50 · 85d2c50
1 parent c10aa0d
commit 85d2c50
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/backend/pwnodeobject.rs b/src/backend/pwnodeobject.rs
@@ -465,14 +465,18 @@ impl PwNodeObject {
     }
 
     pub(crate) fn set_channel_volumes_vec(&self, values: &[f32]) {
-        *(self.imp().channel_volumes.borrow_mut()) = values.to_owned();
-
-        self.update_channel_objects();
+        self.set_channel_volumes_vec_no_send(values);
         if !self.imp().block.get() {
             self.send_volume_using_mixerapi(PropertyChanged::ChannelVolumes);
         }
     }
 
+    pub(crate) fn set_channel_volumes_vec_no_send(&self, values: &[f32]) {
+        *(self.imp().channel_volumes.borrow_mut()) = values.to_owned();
+
+        self.update_channel_objects();
+    }
+
     pub(crate) fn set_channel_volume(&self, index: u32, volume: f32) {
         if let Some(value) = self
             .imp()

diff --git a/src/backend/pwnodeobject/mixerapi.rs b/src/backend/pwnodeobject/mixerapi.rs
@@ -58,7 +58,10 @@ impl PwNodeObject {
                         *v = max;
                     }
                 }
-                self.set_channel_volumes_vec(&channel_volumes);
+                if let Some(cv) = self.make_channel_volumes_variant(&self.channel_volumes_vec()) {
+                    variant.insert("channelVolumes", cv);
+                }
+                self.set_channel_volumes_vec_no_send(&channel_volumes);
             }
             PropertyChanged::ChannelVolumes => {
                 if let Some(cv) = self.make_channel_volumes_variant(&self.channel_volumes_vec()) {