Merge lp:~ted/indicator-sound/lp1416233-notification-on-output into lp:indicator-sound/15.04

[Ted Gould]

Don't show notification when output mode changes

Misread the design spec.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:474
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/186/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-vivid-amd64-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-vivid-armhf-ci/13
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sound-vivid-armhf-ci/13/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

LGTM. Review only; haven't tested wrt 1416233

review: Approve

[lp:~ted/indicator-sound/lp1416233-notification-on-output]

475. By Ted Gould on 2015-02-02

Watch for double updates from notifications. Supress them

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:475
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/189/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-sound-vivid-amd64-ci/16/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-sound-vivid-armhf-ci/16/console

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

review: Needs Fixing (continuous-integration)

[lp:~ted/indicator-sound/lp1416233-notification-on-output]

476. By Ted Gould on 2015-02-03

Incorrect type

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:475
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/191/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-vivid-amd64-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-vivid-armhf-ci/18
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sound-vivid-armhf-ci/18/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:476
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/193/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-vivid-amd64-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-vivid-armhf-ci/20
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sound-vivid-armhf-ci/20/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~ted/indicator-sound/lp1416233-notification-on-output]

477. By Ted Gould on 2015-02-05

Making sure to record the output and volume for each invocation

478. By Ted Gould on 2015-02-05

Compare doubles with an accuracy range

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:478
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/199/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-vivid-amd64-ci/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-vivid-armhf-ci/26
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sound-vivid-armhf-ci/26/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

=== modified file 'src/service.vala'
--- src/service.vala	2015-01-29 17:31:03 +0000
+++ src/service.vala	2015-02-05 14:53:33 +0000
@@ -270,6 +270,8 @@
 
 	private bool check_sync_notification = false;
 	private bool support_sync_notification = false;
+	private string last_output_notification = "multimedia";
+	private double last_volume_notification = 0;
 
 	void update_sync_notification () {
 		if (!check_sync_notification) {
@@ -283,6 +285,21 @@
 		if (!support_sync_notification)
 			return;
 
+		/* Update our volume and output */
+		var oldoutput = this.last_output_notification;
+		this.last_output_notification = this.volume_control.stream;
+
+		var oldvolume = this.last_volume_notification;
+		this.last_volume_notification = volume_control.volume;
+
+		/* Suppress notifications of volume changes if it is because the 
+		   output stream changed. */
+		if (oldoutput != this.last_output_notification)
+			return;
+		/* Supress updates that don't change the value */
+		if (GLib.Math.fabs(oldvolume - this.last_volume_notification) < 0.01)
+			return;
+
 		var shown_action = actions.lookup_action ("indicator-shown") as SimpleAction;
 		if (shown_action != null && shown_action.get_state().get_boolean())
 			return;

=== modified file 'src/volume-control.vala'
--- src/volume-control.vala	2015-01-29 17:31:55 +0000
+++ src/volume-control.vala	2015-02-05 14:53:33 +0000
@@ -54,6 +54,14 @@
 	private bool _pulse_use_stream_restore = false;
 	private uint32 _active_sink_input = -1;
 	private string[] _valid_roles = {"multimedia", "alert", "alarm", "phone"};
+	public string stream {
+		get {
+			if (_active_sink_input < 0 || _active_sink_input >= _valid_roles.length)
+				return "multimedia";
+			else
+				return _valid_roles[_active_sink_input];
+		}
+	}
 	private string? _objp_role_multimedia = null;
 	private string? _objp_role_alert = null;
 	private string? _objp_role_alarm = null;