diff options
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | src/volume-control.vala | 24 |
2 files changed, 8 insertions, 23 deletions
diff --git a/debian/changelog b/debian/changelog index e472d77..1e47f23 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-sound (12.10.2+14.10.20141008-0ubuntu1) utopic; urgency=low + + [ Ted Gould ] + * Revert notifications on volume change. + + -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 08 Oct 2014 18:55:06 +0000 + indicator-sound (12.10.2+14.10.20141007-0ubuntu1) utopic; urgency=low [ Ted Gould ] diff --git a/src/volume-control.vala b/src/volume-control.vala index 70c038e..29c49f6 100644 --- a/src/volume-control.vala +++ b/src/volume-control.vala @@ -19,7 +19,6 @@ */ using PulseAudio; -using Notify; using Gee; [CCode(cname="pa_cvolume_set", cheader_filename = "pulse/volume.h")] @@ -68,7 +67,6 @@ 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); @@ -86,13 +84,6 @@ 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 (); @@ -578,21 +569,8 @@ public class VolumeControl : Object public void set_volume (double 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)) { + if (set_volume_internal (volume)) start_local_volume_timer(); - } } void set_mic_volume_success_cb (Context c, int success) |