diff options
author | Ted Gould <ted@gould.cx> | 2014-10-06 21:40:45 -0500 |
---|---|---|
committer | Ted Gould <ted@gould.cx> | 2014-10-06 21:40:45 -0500 |
commit | c0cecdcd99352f2a9b5ecb1d5da599bf4c3d49f7 (patch) | |
tree | a98ca2c193795e1aa99500c911ea65a63f4edffa /src/volume-control.vala | |
parent | 3c9299344089687233581ef6548abf36032003c6 (diff) | |
parent | c53c5cc119f713fd0868a5643681df7b6e296fff (diff) | |
download | ayatana-indicator-sound-c0cecdcd99352f2a9b5ecb1d5da599bf4c3d49f7.tar.gz ayatana-indicator-sound-c0cecdcd99352f2a9b5ecb1d5da599bf4c3d49f7.tar.bz2 ayatana-indicator-sound-c0cecdcd99352f2a9b5ecb1d5da599bf4c3d49f7.zip |
Sync in balance branch as well
Diffstat (limited to 'src/volume-control.vala')
-rw-r--r-- | src/volume-control.vala | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/volume-control.vala b/src/volume-control.vala index 20450ca..5a8bbe2 100644 --- a/src/volume-control.vala +++ b/src/volume-control.vala @@ -175,9 +175,9 @@ public class VolumeControl : Object } if (_pulse_use_stream_restore == false && - _volume != volume_to_double (i.volume.values[0])) + _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); } } @@ -512,7 +512,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); } |