diff options
| author | charles kerr <charlesk@canonical.com> | 2015-12-19 21:31:12 -0600 |
|---|---|---|
| committer | charles kerr <charlesk@canonical.com> | 2015-12-19 21:31:12 -0600 |
| commit | af0d715e8a451cac638980c67d1a4be0634a6b79 (patch) | |
| tree | 0894fdc9fb56d4138bf3dba7e9c0ce8c02edfe7c /src/volume-warning.vala | |
| parent | 6773fd52378cca6b3b8058923f4262633cc8f71e (diff) | |
| download | ayatana-indicator-sound-af0d715e8a451cac638980c67d1a4be0634a6b79.tar.gz ayatana-indicator-sound-af0d715e8a451cac638980c67d1a4be0634a6b79.tar.bz2 ayatana-indicator-sound-af0d715e8a451cac638980c67d1a4be0634a6b79.zip | |
remove high-volume-approved from volume-control
Diffstat (limited to 'src/volume-warning.vala')
| -rw-r--r-- | src/volume-warning.vala | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/volume-warning.vala b/src/volume-warning.vala index 452acbe..99ae772 100644 --- a/src/volume-warning.vala +++ b/src/volume-warning.vala @@ -706,14 +706,17 @@ public class VolumeWarning : VolumeControl /** HIGH VOLUME APPROVED PROPERTY **/ - private bool _high_volume_approved = false; + public bool high_volume_approved { get; private set; default = false; } + + public void approve_high_volume() { + _high_volume_approved_at = GLib.get_monotonic_time(); + update_high_volume_approved(); + update_high_volume_approved_timer(); + } + private uint _high_volume_approved_timer = 0; private int64 _high_volume_approved_at = 0; private int64 _high_volume_approved_ttl_usec = 0; - public override bool high_volume_approved { - get { return this._high_volume_approved; } - private set { this._high_volume_approved = value; } - } private void init_high_volume_approved() { _settings.changed["warning-volume-confirmation-ttl"].connect(() => update_high_volume_approved_cache()); update_high_volume_approved_cache(); @@ -759,11 +762,6 @@ public class VolumeWarning : VolumeControl return (_high_volume_approved_at != 0) && (_high_volume_approved_at + _high_volume_approved_ttl_usec >= now); } - public override void approve_high_volume() { - _high_volume_approved_at = GLib.get_monotonic_time(); - update_high_volume_approved(); - update_high_volume_approved_timer(); - } /** MIC VOLUME PROPERTY */ |