Merge lp:~macslow/indicator-sound/synchronous-notification into lp:indicator-sound/14.10

[Mirco Müller]

Added use of synchronous notifications for volume-changes.

Added use of synchronous notifications for volume-changes.

With the proper support in the notification-backend and frontend this will allow doing this: https://www.youtube.com/watch?v=VBhxf2iQK8o

Which is what latest design-requirements request.

* Are there any related MPs required for this MP to build/function as expected? Please list.
Yes. This can be merged right away, but in order to see any effect lp:~macslow/unity-notifications/synchronous-notification and lp:~macslow/unity8/synchronous-notification have to be merged to their respective trunks.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Ted Gould (ted)]

How does this work on desktop? I don't see an MR to remove the functionality from USD.

review: Needs Information

[Mirco Müller (macslow)]

I've to recheck... been too long since I last look at this and tested it.

[Mirco Müller (macslow)]

I just ran unity8 on the desktop. When hitting the hardware-multimedia keys for volume-up/down the notification-daemon from unity8 picks up the triggered volume-notifications and displays them on the unity8-shell.

[Ted Gould (ted)]

On Wed, 2014-09-17 at 17:25 +0000, Mirco Müller wrote:

> I just ran unity8 on the desktop. When hitting the hardware-multimedia
> keys for volume-up/down the notification-daemon from unity8 picks up
> the triggered volume-notifications and displays them on the
> unity8-shell.

Cool, good that works. I was more concerned about the case of running
Unity7 and having indicator-sound and ubuntu-settings-daemon both
sending synchronous notifications to notify-osd.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Mirco Müller (macslow)]

> ...
> Cool, good that works. I was more concerned about the case of running
> Unity7 and having indicator-sound and ubuntu-settings-daemon both
> sending synchronous notifications to notify-osd.

There is no harm in that. Both synchronous notifications (from ubuntu-settings-daemon and indicator-sound) are rendered correctly by unity7 (via notify-osd) and unity8 (via notification-plugin). Since they will also report the same volume-status there also no risk of the user seeing wrong information being displayed.

[Ted Gould (ted)]

Cool, great!

review: Approve

[Ted Gould (ted)]

Uhg, sorry took to long to land and it seems this no conflicts with trunk. Sorry!

review: Needs Fixing

[Ted Gould (ted)]

Figured out a work around :-)

review: Approve

[Michał Sawicz (saviq)]

Testing this with the unity8 parts shows that the values as displayed in the notification seem to be from the previous change, meaning that if you switch direction, you will see a change counter to the direction you pressed the button.

review: Needs Information

=== modified file 'src/volume-control.vala'
--- src/volume-control.vala	2014-04-18 17:41:44 +0000
+++ src/volume-control.vala	2014-09-19 17:43:29 +0000
@@ -19,6 +19,7 @@
  */
 
 using PulseAudio;
+using Notify;
 
 [CCode(cname="pa_cvolume_set", cheader_filename = "pulse/volume.h")]
 extern unowned PulseAudio.CVolume? vol_set (PulseAudio.CVolume? cv, uint channels, PulseAudio.Volume v);
@@ -51,6 +52,7 @@
 	private uint _accountservice_volume_timer = 0;
 	private bool _send_next_local_volume = false;
 	private double _account_service_volume = 0.0;
+	private Notify.Notification _notification;
 
 	public signal void volume_changed (double v);
 	public signal void mic_volume_changed (double v);
@@ -68,6 +70,13 @@
 
 		_mute_cancellable = new Cancellable ();
 		_volume_cancellable = new Cancellable ();
+
+		Notify.init ("Volume");
+		_notification = new Notify.Notification("Volume", "", "audio-volume-muted");
+		_notification.set_hint ("value", 0);
+		_notification.set_hint ("x-canonical-private-synchronous", "true");
+		_notification.set_hint ("x-canonical-non-shaped-icon", "true");
+
 		setup_accountsservice.begin ();
 
 		this.reconnect_to_pulse ();
@@ -340,8 +349,21 @@
 
 	public void set_volume (double volume)
 	{
-		if (set_volume_internal (volume))
+		if (_volume == 0.0)
+			_notification.update ("Volume", "", "audio-volume-muted");
+		if (_volume > 0.0 && _volume <= 0.33)
+			_notification.update ("Volume", "", "audio-volume-low");
+		if (_volume > 0.33 && _volume <= 0.66)
+			_notification.update ("Volume", "", "audio-volume-medium");
+		if (_volume > 0.66 && _volume <= 1.0)
+			_notification.update ("Volume", "", "audio-volume-high");
+		_notification.set_hint ("value", _volume * 100.0);
+		_notification.set_hint ("sound-file", "/usr/share/sounds/ubuntu/stereo/message.ogg");
+		_notification.show ();			
+
+		if (set_volume_internal (volume)) {
 			start_local_volume_timer();
+		}
 	}
 
 	void set_mic_volume_success_cb (Context c, int success)