aboutsummaryrefslogtreecommitdiff
path: root/data/com.canonical.indicator.sound.gschema.xml
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2015-08-10 23:48:37 -0500
committerCharles Kerr <charles.kerr@canonical.com>2015-08-10 23:48:37 -0500
commit20f6bd10f17dfeecea93d03873e3b74ecef54782 (patch)
tree04af30fa7f36ea0f2a971ec1c73f1a4a9ec89187 /data/com.canonical.indicator.sound.gschema.xml
parent4b736bd0c19e85674add330ee6a00ddd6deb512a (diff)
downloadayatana-indicator-sound-20f6bd10f17dfeecea93d03873e3b74ecef54782.tar.gz
ayatana-indicator-sound-20f6bd10f17dfeecea93d03873e3b74ecef54782.tar.bz2
ayatana-indicator-sound-20f6bd10f17dfeecea93d03873e3b74ecef54782.zip
huge pile of diff that consolidates pulse-specific audio work into volume-control-pulse. Work in progress. Promising but currently ugly.
Diffstat (limited to 'data/com.canonical.indicator.sound.gschema.xml')
-rw-r--r--data/com.canonical.indicator.sound.gschema.xml68
1 files changed, 46 insertions, 22 deletions
diff --git a/data/com.canonical.indicator.sound.gschema.xml b/data/com.canonical.indicator.sound.gschema.xml
index ff4816e..c0e4dc1 100644
--- a/data/com.canonical.indicator.sound.gschema.xml
+++ b/data/com.canonical.indicator.sound.gschema.xml
@@ -42,41 +42,65 @@
<!-- VOLUME -->
- <key name="high-volume-warning-enabled" type="b">
+ <key name="warning-volume-enabled" type="b">
<default>true</default>
- <summary>Whether or not to show the a volume warning.</summary>
+ <summary>Whether or not to show high volume warnings.</summary>
<description>
- Whether or not to show the a volume warning when the volume exceeds some level while headphones are plugged in.
+ If enabled on a device, a confirmation dialog will be presented to the user if
+ (a) something is plugged into the headphone jack (ie, no warnings for speaker volumes) AND
+ (b) media is playing (ie, no warnings for ringtone volumes) AND
+ (c) the user attempts to set the volume higher than warning-volume-dB AND
+ (d) the user has not indicated approval in the last warning-volume-approval-ttl seconds.
</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>
+ <key name="warning-volume-confirmation-ttl" type="i">
+ <default>72000</default>
+ <summary>How many seconds a user's warning-volume approval 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."
+ How long to remember a user's approval of the confirmation dialog discussed in the
+ description of 'warning-volume-enabled'.
+
+ The default value (72,000 seconds) corresponds to the 20 hours suggested by
+ EU standard EN 60950-1/Al2: “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 -->
+ <key name="warning-volume-decibels" type="d">
+ <default>-8.0</default>
+ <summary>Volume level that triggers a high volume warning.</summary>
<description>
- When high volume warnings are enabled, a warning will be shown when
- the volume level is raised past this level.
+ Volume level that triggers a high volume warning.
+ See warning-volume-enabled for details.
</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>
+
+ <key name="normal-volume-decibels" type="d">
+ <default>0</default>
+ <summary>Normal output volume.</summary>
<description>
- Maximum volume level, [0.0..1.0]
+ The maximum volume when com.ubuntu.sound's 'allow-amplified-volume' setting is disabled.
+
+ To conform with EU standard EN 60950-1/Al2, this value should never be
+ set to a dB that causes headphone sound output to exceed 100 dBA, nor
+ electric output to exceed 150 mV.
+
+ The default value (0) corresponds to PulseAudio's PA_VOLUME_NORM.
+ </description>
+ </key>
+
+ <key name="amplified-volume-decibels" type="d">
+ <default>11</default>
+ <summary>Output volume to use when com.ubuntu.sound's 'allow-amplified-volume' setting is enabled.</summary>
+ <description>
+ The maximum volume when com.ubuntu.sound's 'allow-amplified-volume' setting is enabled.
+
+ To conform with EU standard EN 60950-1/Al2, this value should never be
+ set to a dB that causes headphone sound output to exceed 100 dBA, nor
+ electric output to exceed 150 mV.
+
+ The default value (11) corresponds to PulseAudio's PA_VOLUME_UI_MAX.
</description>
</key>
--->
</schema>
</schemalist>