diff options
| author | Eric Laurent <elaurent@google.com> | 2012-04-25 15:47:56 -0700 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2012-04-26 10:17:13 -0700 |
| commit | ddfe26905ea3210c86a88eeb331eef4c9f99b931 (patch) | |
| tree | 6bff7549dc766a6798d73a6385b08dbc0d637054 /include | |
| parent | 739022f26a7127ba76a98dda65411496086114a7 (diff) | |
| download | hardware_libhardware_legacy-ddfe26905ea3210c86a88eeb331eef4c9f99b931.tar.gz hardware_libhardware_legacy-ddfe26905ea3210c86a88eeb331eef4c9f99b931.tar.bz2 hardware_libhardware_legacy-ddfe26905ea3210c86a88eeb331eef4c9f99b931.zip | |
system and UI sounds volume policy
Added specific volume curves for AUDIO_STREAM_SYSTEM,
AUDIO_STREAM_ENFORCED_AUDIBLE and AUDIO_STREAM_DTMF.
Volume for these streams tracks AUDIO_STREAM_RING on phones
and AUDIO_STREAM_MUSIC on tablets but is contrained in the range
-24dB to -6dB on speaker and -24dB to -12dB on headset.
STRATEGY_ENFORCED_AUDIBLE routing policy is now the same as
STRATEGY_MEDIA in countries where not enforced.
Change-Id: If58d96559bfe2bbff4cd94c631d5933bd940778e
Diffstat (limited to 'include')
| -rw-r--r-- | include/hardware_legacy/AudioPolicyManagerBase.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/hardware_legacy/AudioPolicyManagerBase.h b/include/hardware_legacy/AudioPolicyManagerBase.h index 8d38bbd..be6c19d 100644 --- a/include/hardware_legacy/AudioPolicyManagerBase.h +++ b/include/hardware_legacy/AudioPolicyManagerBase.h @@ -221,8 +221,10 @@ protected: static const VolumeCurvePoint sSpeakerMediaVolumeCurve[AudioPolicyManagerBase::VOLCNT]; // volume curve for sonification strategy on speakers static const VolumeCurvePoint sSpeakerSonificationVolumeCurve[AudioPolicyManagerBase::VOLCNT]; - // default volume curves per strategy and device category. See initializeVolumeCurves() - static const VolumeCurvePoint *sVolumeProfiles[NUM_STRATEGIES][DEVICE_CATEGORY_CNT]; + static const VolumeCurvePoint sDefaultSystemVolumeCurve[AudioPolicyManagerBase::VOLCNT]; + static const VolumeCurvePoint sHeadsetSystemVolumeCurve[AudioPolicyManagerBase::VOLCNT]; + // default volume curves per stream and device category. See initializeVolumeCurves() + static const VolumeCurvePoint *sVolumeProfiles[AUDIO_STREAM_CNT][DEVICE_CATEGORY_CNT]; // descriptor for audio outputs. Used to maintain current configuration of each opened audio output // and keep track of the usage of this output by each audio stream type. |