Merge lp:~lukas-kde/indicator-sound/fixUnity8MuteNotification into lp:indicator-sound/15.10

[Lukáš Tinkl]

Send a notification also in the case of mute/unmute events

Update and send a notification also in the case of mute/unmute events. Unity 8 on the desktop lacks this notification otherwise.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Lars Karlitski (larsu)]

Unity 7 shows notifications for mute/unmute. What's different in 8 to make this necessary?

[Ted Gould (ted)]

Looks fine to me.

[Ted Gould (ted)]

The difference is that in U8 the shell passes the events to indicator-sound where in U7 they're handled via X to G-S-D who gives them to Pulse Audio, and Indicator Sound responds to the Pulse Audio signaling.

[Lars Karlitski (larsu)]

Hm, this means that we're sending two notifications on unity7 now, one from unity-settings-daemon and one from indicator-sound. This doesn't result in a visual problem (notify-osd ignores the second notification), but it smells bad and causes unnecessary bus traffic. Please also update unity-control-center in the same landing.

Also, running this branch gives me a "volume muted" bubble when indicator-sound is started, but only when sound is not muted.

review: Needs Fixing

Unmerged revisions

499. By Lukáš Tinkl on 2015-07-28

send a proper notification when muting/unmuting the sound

=== modified file 'src/service.vala'
--- src/service.vala	2015-04-20 21:02:32 +0000
+++ src/service.vala	2015-07-30 19:01:10 +0000
@@ -245,7 +245,7 @@
 		if (this.volume_control.mute)
 			icon = this.mute_blocks_sound ? "audio-volume-muted-blocking-panel" : "audio-volume-muted-panel";
 		else if (this.accounts_service != null && this.accounts_service.silentMode)
-		  icon = "audio-volume-muted-panel";
+			icon = "audio-volume-muted-panel";
 		else if (volume <= 0.0)
 			icon = "audio-volume-low-zero-panel";
 		else if (volume <= 0.3)
@@ -302,7 +302,7 @@
 
 		/* Choose an icon */
 		string icon = "audio-volume-muted";
-		if (volume_control.volume.volume <= 0.0)
+		if (volume_control.volume.volume <= 0.0 || volume_control.mute)
 			icon = "audio-volume-muted";
 		else if (volume_control.volume.volume <= 0.3)
 			icon = "audio-volume-low";
@@ -319,7 +319,10 @@
 		/* Put it all into the notification */
 		sync_notification.clear_hints ();
 		sync_notification.update (_("Volume"), volume_label, icon);
-		sync_notification.set_hint ("value", (int32)Math.round(volume_control.volume.volume / this.max_volume * 100.0));
+		if (volume_control.mute)
+			sync_notification.set_hint ("value", (int32)0);
+		else
+			sync_notification.set_hint ("value", (int32)Math.round(volume_control.volume.volume / this.max_volume * 100.0));
 		sync_notification.set_hint ("x-canonical-value-bar-tint", tint);
 		sync_notification.set_hint ("x-canonical-private-synchronous", "true");
 		sync_notification.set_hint ("x-canonical-non-shaped-icon", "true");
@@ -378,6 +381,7 @@
 		this.volume_control.notify["mute"].connect ( () => {
 			mute_action.set_state (new Variant.boolean (this.volume_control.mute));
 			this.update_root_icon ();
+			this.update_sync_notification ();
 		});
 
 		this.volume_control.notify["is-playing"].connect( () => {