From 6aa814370aab377943bd109875e8c0ae1bdcdab9 Mon Sep 17 00:00:00 2001 From: charles kerr Date: Sat, 19 Dec 2015 17:56:59 -0600 Subject: move loudness warning's enabled & decibels from volume-control-pulse to options --- src/options.vala | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 src/options.vala (limited to 'src/options.vala') diff --git a/src/options.vala b/src/options.vala new file mode 100644 index 0000000..5e43025 --- /dev/null +++ b/src/options.vala @@ -0,0 +1,40 @@ +/* + * -*- Mode:Vala; indent-tabs-mode:t; tab-width:4; encoding:utf8 -*- + * Copyright 2015 Canonical Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + * Authors: + * Charles Kerr + */ + +public abstract class IndicatorSound.Options : Object +{ + // MAX VOLUME + + public virtual double max_volume { get; protected set; } + + // LOUD + + public signal void loud_changed(); + public abstract PulseAudio.Volume loud_volume(); + public abstract bool loud_volume_warning_enabled(); + + public bool is_loud_pulse (PulseAudio.Volume volume) { + return loud_volume_warning_enabled() && (volume >= loud_volume()); + } + + public bool is_loud (VolumeControl.Volume volume) { + return is_loud_pulse(VolumeControlPulse.double_to_volume(volume.volume)); + } +} -- cgit v1.2.3 From cfa2ff68cf0664c0d147e5a3792e8bd1f95be5d5 Mon Sep 17 00:00:00 2001 From: charles kerr Date: Sun, 20 Dec 2015 09:02:55 -0600 Subject: set options.max_volume's default value to 1.0 this fixes the notifications-tests unit tests. --- src/options.vala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/options.vala') diff --git a/src/options.vala b/src/options.vala index 5e43025..3005cf5 100644 --- a/src/options.vala +++ b/src/options.vala @@ -22,7 +22,7 @@ public abstract class IndicatorSound.Options : Object { // MAX VOLUME - public virtual double max_volume { get; protected set; } + public double max_volume { get; protected set; default = 1.0; } // LOUD -- cgit v1.2.3 From 521915475eb73ae22e2c270c687f1f4d5c7c0465 Mon Sep 17 00:00:00 2001 From: charles kerr Date: Wed, 30 Dec 2015 16:03:02 -0600 Subject: simplify the Options class' properties --- src/options.vala | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'src/options.vala') diff --git a/src/options.vala b/src/options.vala index 3005cf5..1aab852 100644 --- a/src/options.vala +++ b/src/options.vala @@ -20,21 +20,9 @@ public abstract class IndicatorSound.Options : Object { - // MAX VOLUME - public double max_volume { get; protected set; default = 1.0; } - // LOUD - - public signal void loud_changed(); - public abstract PulseAudio.Volume loud_volume(); - public abstract bool loud_volume_warning_enabled(); - - public bool is_loud_pulse (PulseAudio.Volume volume) { - return loud_volume_warning_enabled() && (volume >= loud_volume()); - } + public uint loud_volume { get; protected set; default = PulseAudio.Volume.sw_from_dB(8); } - public bool is_loud (VolumeControl.Volume volume) { - return is_loud_pulse(VolumeControlPulse.double_to_volume(volume.volume)); - } + public bool loud_warning_enabled { get; protected set; default = true; } } -- cgit v1.2.3