From af0d715e8a451cac638980c67d1a4be0634a6b79 Mon Sep 17 00:00:00 2001 From: charles kerr Date: Sat, 19 Dec 2015 21:31:12 -0600 Subject: remove high-volume-approved from volume-control --- src/volume-warning.vala | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'src/volume-warning.vala') 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 */ -- cgit v1.2.3