aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2015-02-05 17:19:13 +0000
committerCI Train Bot <ci-train-bot@canonical.com>2015-02-05 17:19:13 +0000
commitc9cb54483cc5966b3c542ec86dd4e6bf7b33d4ec (patch)
treec4bf747687988a9a24cd0cf069a997b7adfc9913
parent59dfdd3906fd238e5ea3606d72b938677096e2c5 (diff)
parentc6002f571882de3b7bf3d3a6a2045272d818b4db (diff)
downloadayatana-indicator-sound-c9cb54483cc5966b3c542ec86dd4e6bf7b33d4ec.tar.gz
ayatana-indicator-sound-c9cb54483cc5966b3c542ec86dd4e6bf7b33d4ec.tar.bz2
ayatana-indicator-sound-c9cb54483cc5966b3c542ec86dd4e6bf7b33d4ec.zip
Don't show notification when output mode changes Fixes: #1416233
Approved by: Charles Kerr, PS Jenkins bot
-rw-r--r--src/service.vala17
-rw-r--r--src/volume-control.vala8
2 files changed, 25 insertions, 0 deletions
diff --git a/src/service.vala b/src/service.vala
index fb56215..b07f267 100644
--- a/src/service.vala
+++ b/src/service.vala
@@ -270,6 +270,8 @@ public class IndicatorSound.Service: Object {
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 @@ public class IndicatorSound.Service: Object {
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;
diff --git a/src/volume-control.vala b/src/volume-control.vala
index bf97021..62cb2d0 100644
--- a/src/volume-control.vala
+++ b/src/volume-control.vala
@@ -54,6 +54,14 @@ public class VolumeControl : Object
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;