Merge lp:~larsu/indicator-sound/lp1374249 into lp:indicator-sound/14.10

[Lars Karlitski]

Volume control: properly scale channels when setting the volume

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.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:447
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/148/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-utopic-amd64-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-utopic-armhf-ci/15
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sound-utopic-armhf-ci/15/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-sound-ci/148/rebuild

review: Approve (continuous-integration)

[Ted Gould (ted)]

Going to not comment on people with unbalanced speakers :-) Patch looks good.

review: Approve

=== modified file 'src/volume-control.vala'
--- src/volume-control.vala	2014-04-18 17:41:44 +0000
+++ src/volume-control.vala	2014-10-01 14:56:48 +0000
@@ -129,9 +129,9 @@
 			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 @@
 		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);
 	}