Merge lp:~xavi-garcia-mena/indicator-sound/bug-pressing-cancel-accounts-service into lp:indicator-sound/15.10

[Xavi Garcia]

This branch adds a new signal in volumeWarning to set the warning level volume after pressing cancel.
We are setting the warning level before pressing cancel, which is alright, but sometimes we have issues with the value set to the accounts service that steps on the warning level.

This branch adds a new signal in volumeWarning to set the warning level volume after pressing cancel.
We are setting the warning level before pressing cancel, which is alright, but sometimes we have issues with the value set to the accounts service that steps on the warning level.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:538
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/322/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-wily-amd64-ci/97
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-wily-armhf-ci/98
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sound-wily-armhf-ci/98/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

The patch is fine, approved.

Just thinking out loud, the existing codebase is a little clumsy in how it treats volumes as sometimes a PulseAudio.Volume level, and sometimes a percentage of norm, etc. It might be better to have an actual Volume class that understands these things s.t. we have a consistent volume and don't repeat the conversion utils.

review: Approve

=== modified file 'src/service.vala'
--- src/service.vala	2016-04-05 21:28:26 +0000
+++ src/service.vala	2016-04-15 10:05:04 +0000
@@ -68,6 +68,10 @@
 			update_notification();
 		});
 
+		this._volume_warning.cancel_pressed.connect( (cancel_volume) => {
+			volume_control.set_volume_clamp (cancel_volume, VolumeControl.VolumeReasons.USER_KEYPRESS);
+		});
+
 		this.accounts_service = accounts;
 		/* If we're on the greeter, don't export */
 		if (this.accounts_service != null) {

=== modified file 'src/volume-warning.vala'
--- src/volume-warning.vala	2016-03-01 09:41:41 +0000
+++ src/volume-warning.vala	2016-04-15 10:05:04 +0000
@@ -213,8 +213,18 @@
 		if (response == IndicatorSound.WarnNotification.Response.OK) {
 			approve_high_volume ();
 			sound_system_set_multimedia_volume (_ok_volume);
+		} else {
+			this.cancel_pressed (this.volume_to_double(_options.loud_volume));
 		}
 
 		_ok_volume = PulseAudio.Volume.INVALID;
 	}
+
+	private static double volume_to_double (PulseAudio.Volume vol)
+	{
+		double tmp = (double)(vol - PulseAudio.Volume.MUTED);
+		return tmp / (double)(PulseAudio.Volume.NORM - PulseAudio.Volume.MUTED);
+	}
+
+	public signal void cancel_pressed (double cancel_volume);
 }