From c53c5cc119f713fd0868a5643681df7b6e296fff Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Wed, 1 Oct 2014 16:51:09 +0200 Subject: Volume control: properly scale channels when setting the volume And display the volume of the loudest channel in the UI. This is consistent with gnome-control-center. --- src/volume-control.vala | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/volume-control.vala') diff --git a/src/volume-control.vala b/src/volume-control.vala index 2efa186..a4015b5 100644 --- a/src/volume-control.vala +++ b/src/volume-control.vala @@ -129,9 +129,9 @@ public class VolumeControl : Object this.notify_property ("is-playing"); } - if (_volume != volume_to_double (i.volume.values[0])) + if (_volume != volume_to_double (i.volume.max ())) { - _volume = volume_to_double (i.volume.values[0]); + _volume = volume_to_double (i.volume.max ()); volume_changed (_volume); } } @@ -310,7 +310,8 @@ public class VolumeControl : Object if (i == null) return; - unowned CVolume cvol = vol_set (i.volume, 1, double_to_volume (_volume)); + unowned CVolume cvol = i.volume; + cvol.scale (double_to_volume (_volume)); c.set_sink_volume_by_index (i.index, cvol, set_volume_success_cb); } -- cgit v1.2.3