diff options
author | Lars Uebernickel <lars.uebernickel@canonical.com> | 2014-03-16 17:43:06 +0100 |
---|---|---|
committer | Lars Uebernickel <lars.uebernickel@canonical.com> | 2014-03-16 17:43:06 +0100 |
commit | 2ad60576f3975fab265bd44751c9af634f51a375 (patch) | |
tree | e03a71ac653012804b819bc5851b30c3809bd8b7 | |
parent | e2fdd75b6e7fd1c8572dd10356272668b99d33dd (diff) | |
download | ayatana-indicator-sound-2ad60576f3975fab265bd44751c9af634f51a375.tar.gz ayatana-indicator-sound-2ad60576f3975fab265bd44751c9af634f51a375.tar.bz2 ayatana-indicator-sound-2ad60576f3975fab265bd44751c9af634f51a375.zip |
Show a red icon in the panel when a sound is playing while mute is on
-rw-r--r-- | src/service.vala | 29 | ||||
-rw-r--r-- | src/volume-control.vala | 16 |
2 files changed, 44 insertions, 1 deletions
diff --git a/src/service.vala b/src/service.vala index 2b21275..66bb42f 100644 --- a/src/service.vala +++ b/src/service.vala @@ -113,6 +113,8 @@ public class IndicatorSound.Service: Object { VolumeControl volume_control; MediaPlayerList players; uint player_action_update_id; + bool mute_blocks_sound; + uint sound_was_blocked_timeout_id; Notify.Notification notification; bool syncing_preferred_players = false; @@ -186,7 +188,7 @@ public class IndicatorSound.Service: Object { double volume = this.volume_control.get_volume (); string icon; if (this.volume_control.mute) - icon = "audio-volume-muted-panel"; + icon = this.mute_blocks_sound ? "audio-volume-muted-blocked-panel" : "audio-volume-muted-panel"; else if (volume <= 0.0) icon = "audio-volume-low-zero-panel"; else if (volume <= 0.3) @@ -229,6 +231,31 @@ public class IndicatorSound.Service: Object { this.update_root_icon (); }); + this.volume_control.notify["is-playing"].connect( () => { + if (!this.volume_control.mute) { + this.mute_blocks_sound = false; + return; + } + + if (this.volume_control.is_playing) { + this.mute_blocks_sound = true; + } + else if (this.mute_blocks_sound) { + /* Continue to show the blocking icon five seconds after a player has tried to play something */ + if (this.sound_was_blocked_timeout_id > 0) + Source.remove (this.sound_was_blocked_timeout_id); + + this.sound_was_blocked_timeout_id = Timeout.add_seconds (5, () => { + this.mute_blocks_sound = false; + this.sound_was_blocked_timeout_id = 0; + this.update_root_icon (); + return false; + }); + } + + this.update_root_icon (); + }); + return mute_action; } diff --git a/src/volume-control.vala b/src/volume-control.vala index e994922..8f21b60 100644 --- a/src/volume-control.vala +++ b/src/volume-control.vala @@ -31,6 +31,7 @@ public class VolumeControl : Object private PulseAudio.Context context; private bool _mute = true; + private bool _is_playing = false; private double _volume = 0.0; private double _mic_volume = 0.0; @@ -97,6 +98,13 @@ public class VolumeControl : Object this.notify_property ("mute"); } + var playing = (i.state == PulseAudio.SinkState.RUNNING); + if (_is_playing != playing) + { + _is_playing = playing; + this.notify_property ("is-playing"); + } + if (_volume != volume_to_double (i.volume.values[0])) { _volume = volume_to_double (i.volume.values[0]); @@ -235,6 +243,14 @@ public class VolumeControl : Object } } + public bool is_playing + { + get + { + return this._is_playing; + } + } + /* Volume operations */ private static PulseAudio.Volume double_to_volume (double vol) { |