Merge lp:~xavi-garcia-mena/indicator-sound/warning-volume-set-to-warn-level into lp:indicator-sound/15.10

[Xavi Garcia]

To avoid going too below the warning level we set the volume when showing the warning dialog to the loud_volume level.

The spec states:
Whenever you increase volume, for the first time in 20 hours, such that acoustic output would be more than 85 dBA, an “Increase Volume” dialog should appear.

So the loud_volume is still a valid level.

After setting this the user has only to press the Up button once to show the warning dialog again.
When setting the loud_volume-1 value the level was decreased 2 steps below the warning level and the used had to press the up button twice.

To avoid going too below the warning level we set the volume when showing the warning dialog to the loud_volume level.

The spec states:
Whenever you increase volume, for the first time in 20 hours, such that acoustic output would be more than 85 dBA, an “Increase Volume” dialog should appear.

So the loud_volume is still a valid level.

After setting this the user has only to press the Up button once to show the warning dialog again.
When setting the loud_volume-1 value the level was decreased 2 steps below the warning level and the used had to press the up button twice.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:536
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/316/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-wily-amd64-ci/91
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-wily-armhf-ci/92
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sound-wily-armhf-ci/92/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

Aha, I see what you mean, >= was the culprit :P

Nice fix. Thanks for finding this.

review: Approve

=== modified file 'src/volume-warning.vala'
--- src/volume-warning.vala	2015-12-31 19:05:06 +0000
+++ src/volume-warning.vala	2016-03-01 10:54:28 +0000
@@ -116,7 +116,9 @@
 			&& multimedia_active
 			&& !approved
 			&& (multimedia_volume != PulseAudio.Volume.INVALID)
-			&& (multimedia_volume >= _options.loud_volume);
+			// from the sound specs:
+			// "Whenever you increase volume,..., such that acoustic output would be MORE than 85 dB
+			&& (multimedia_volume > _options.loud_volume);
 
 		if (high_volume != newval) {
 			debug ("changing high_volume from %d to %d", (int)high_volume, (int)newval);
@@ -198,8 +200,10 @@
 		_notification.show ();
 		this.active = true;
 
-		// lower the volume to just under the warning level
-		sound_system_set_multimedia_volume (_options.loud_volume-1);
+		// lower the volume to just the warning level
+		// from the sound specs:
+		// "Whenever you increase volume,..., such that acoustic output would be MORE than 85 dB
+		sound_system_set_multimedia_volume (_options.loud_volume);
 	}
 
 	private void on_user_response (IndicatorSound.WarnNotification.Response response) {

=== modified file 'tests/notifications-test.cc'
--- tests/notifications-test.cc	2016-03-01 10:54:28 +0000
+++ tests/notifications-test.cc	2016-03-01 10:54:28 +0000
@@ -559,7 +559,7 @@
     } test_volumes[] = {
         { false,   50, 100 },
         { false,   99, 100 },
-        { true,   100, 100 },
+        { false,   100, 100 }, // Whenever you increase volume... such that acoustic output would be *MORE* than 85 dBA
         { true,   101, 100 }
     };