diff options
| author | Xavi Garcia Mena <xavi.garcia.mena@canonical.com> | 2015-10-02 15:59:00 +0200 |
|---|---|---|
| committer | Xavi Garcia Mena <xavi.garcia.mena@canonical.com> | 2015-10-02 15:59:00 +0200 |
| commit | 471f1fef52392a9bb9455124929b81a716f5566e (patch) | |
| tree | dc81a1158ccd0669a4887b9d4264552d91dbf97c /src/volume-control-pulse.vala | |
| parent | 4d511cb3cae735ceb23730647c6135e7dafc2e2b (diff) | |
| parent | 4b736bd0c19e85674add330ee6a00ddd6deb512a (diff) | |
| download | ayatana-indicator-sound-471f1fef52392a9bb9455124929b81a716f5566e.tar.gz ayatana-indicator-sound-471f1fef52392a9bb9455124929b81a716f5566e.tar.bz2 ayatana-indicator-sound-471f1fef52392a9bb9455124929b81a716f5566e.zip | |
merged lp:~unity-api-team/indicator-sound/lp-1481913-revised-ui-volume-warnings
Diffstat (limited to 'src/volume-control-pulse.vala')
| -rw-r--r-- | src/volume-control-pulse.vala | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/volume-control-pulse.vala b/src/volume-control-pulse.vala index 3d4d113..d3e93c5 100644 --- a/src/volume-control-pulse.vala +++ b/src/volume-control-pulse.vala @@ -44,6 +44,7 @@ public class VolumeControlPulse : VolumeControl private bool _is_playing = false; private VolumeControl.Volume _volume = new VolumeControl.Volume(); private double _mic_volume = 0.0; + private Settings _settings = new Settings ("com.canonical.indicator.sound"); /* Used by the pulseaudio stream restore extension */ private DBusConnection _pconn; @@ -95,7 +96,14 @@ public class VolumeControlPulse : VolumeControl /** true when high volume warnings should be shown */ public override bool high_volume { get { - return this._volume.volume > 0.75 && _active_port_headphone && stream == "multimedia"; + if (!_active_port_headphone) { + return false; + } + if (stream != "multimedia") { + return false; + } + var high_volume_level = this._settings.get_double("high-volume-level"); + return this._volume.volume > high_volume_level; } } |