aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog5
-rw-r--r--src/volume-control.vala37
-rw-r--r--tests/manual17
3 files changed, 56 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 63b2e5f..79f21ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-indicator-sound (12.10.2+14.10.20141010-0ubuntu2) UNRELEASED; urgency=medium
+indicator-sound (12.10.2+14.10.20141010-0ubuntu3) UNRELEASED; urgency=medium
* Remove various Vala warnings
+ * Show notifications on volume change (LP: #1378564, #1378961)
- -- Ted Gould <ted@ubuntu.com> Wed, 05 Nov 2014 10:30:30 -0600
+ -- Ted Gould <ted@ubuntu.com> Wed, 05 Nov 2014 10:31:30 -0600
indicator-sound (12.10.2+14.10.20141010-0ubuntu1) utopic; urgency=low
diff --git a/src/volume-control.vala b/src/volume-control.vala
index 5061ae8..dd1128c 100644
--- a/src/volume-control.vala
+++ b/src/volume-control.vala
@@ -19,6 +19,7 @@
*/
using PulseAudio;
+using Notify;
using Gee;
[CCode(cname="pa_cvolume_set", cheader_filename = "pulse/volume.h")]
@@ -67,6 +68,7 @@ public class VolumeControl : Object
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);
@@ -84,6 +86,13 @@ public class VolumeControl : Object
_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 ();
@@ -572,8 +581,34 @@ public class VolumeControl : Object
public void set_volume (double volume)
{
- if (set_volume_internal (volume))
+ /* Using this to detect whether we're on the phone or not */
+ if (_pulse_use_stream_restore) {
+ 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", (int32)(volume * 100.0));
+ if (_active_sink_input == -1 || _valid_roles[_active_sink_input] != "multimedia") {
+ /* No audio ping if we're playing multimedia */
+ _notification.set_hint ("sound-file", "/usr/share/sounds/ubuntu/stereo/message.ogg");
+ } else {
+ _notification.set_hint ("sound-file", null);
+ }
+
+ try {
+ _notification.show ();
+ } catch (GLib.Error e) {
+ warning("Unable to send volume change notification: %s", e.message);
+ }
+ }
+
+ if (set_volume_internal (volume)) {
start_local_volume_timer();
+ }
}
void set_mic_volume_success_cb (Context c, int success)
diff --git a/tests/manual b/tests/manual
index 201465c..d9fb7d5 100644
--- a/tests/manual
+++ b/tests/manual
@@ -22,3 +22,20 @@ Test-case indicator-sound/unity8-items-check
<dd>The menu is populated with items</dd>
</dl>
+Test-case indicator-sound/unity8-sound-notifications
+<dl>
+ <dt>Adjust volume using HW keys if available</dt>
+ <dd>A notification bubble should appear with the sound volume</dd>
+ <dd>An audibule sound should play at the level of the audio</dd>
+ <dt>Adjust volume with slider in sound indicator</dt>
+ <dd>A notification bubble should appear with the sound volume</dd>
+ <dd>An audibule sound should play at the level of the audio</dd>
+ <dt>Open a video with sound and play in media player</dt>
+ <dd>The video should play and the sound should be audible</dd>
+ <dt>Adjust volume using HW keys if available</dt>
+ <dd>A notification bubble should appear with the sound volume</dd>
+ <dd>No notification sound should be heard</dd>
+ <dt>Adjust volume with slider in sound indicator</dt>
+ <dd>A notification bubble should appear with the sound volume</dd>
+ <dd>No notification sound should be heard</dd>
+</dl>