diff options
author | Charles Kerr <charles.kerr@canonical.com> | 2015-08-07 22:35:55 +0000 |
---|---|---|
committer | CI Train Bot <ci-train-bot@canonical.com> | 2015-08-07 22:35:55 +0000 |
commit | 6f29148f8d0379684e6d6e53ce6e0095bed0c923 (patch) | |
tree | 5bad24f90f1ee3164b1c14f26ab27abc72f9786e /data | |
parent | 5a30dde1f09e55729ec0b0b7ed451f15c6e635fa (diff) | |
parent | 4b736bd0c19e85674add330ee6a00ddd6deb512a (diff) | |
download | ayatana-indicator-sound-6f29148f8d0379684e6d6e53ce6e0095bed0c923.tar.gz ayatana-indicator-sound-6f29148f8d0379684e6d6e53ce6e0095bed0c923.tar.bz2 ayatana-indicator-sound-6f29148f8d0379684e6d6e53ce6e0095bed0c923.zip |
Revised UI volume warnings to comply with EU requirements. Fixes: #1481913
Approved by: PS Jenkins bot, Ted Gould
Diffstat (limited to 'data')
-rw-r--r-- | data/com.canonical.indicator.sound.gschema.xml | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/data/com.canonical.indicator.sound.gschema.xml b/data/com.canonical.indicator.sound.gschema.xml index a346c0d..ff4816e 100644 --- a/data/com.canonical.indicator.sound.gschema.xml +++ b/data/com.canonical.indicator.sound.gschema.xml @@ -39,5 +39,44 @@ Whether or not to show the sound indicator in the menu bar. </description> </key> + + <!-- VOLUME --> + + <key name="high-volume-warning-enabled" type="b"> + <default>true</default> + <summary>Whether or not to show the a volume warning.</summary> + <description> + Whether or not to show the a volume warning when the volume exceeds some level while headphones are plugged in. + </description> + </key> + <key name="high-volume-acknowledgment-ttl" type="i"> + <default>1200</default> + <summary>How often, in hours, a user's high volume confirmation should be remembered.</summary> + <description> + After a user confirms that they want to listen at a higher volume, subsequent volume + changes do not need to re-trigger a warning until this interval has passed. + For example, EU standard EN 60950-1/Al2 cites "The acknowledgement does not need to + be repeated more than once every 20 h of cumulative listening time." + </description> + </key> + <key name="high-volume-level" type="d"> + <default>0.75</default> + <summary>Volume level that triggers a high volume warning. [0.0..1.0]</summary><!-- FIXME: decibels would be better --> + <description> + When high volume warnings are enabled, a warning will be shown when + the volume level is raised past this level. + </description> + </key> +<!-- FIXME: not used yet, needs to be worked into the service.max_volume property wrt allow_amplified_volume . + Also, decibels would be better here + <key name="maximum-volume" type="d"> + <default>1.0</default> + <summary>Maximum volume level, [0.0..1.0]</summary> + <description> + Maximum volume level, [0.0..1.0] + </description> + </key> +--> + </schema> </schemalist> |