summaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2014-11-26 12:01:47 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-26 12:01:47 +0000
commit27b9f4b5bd44ef658c771cd4fb137c321c3527c6 (patch)
tree50e25cb432229d844436f430510a650f2f6834b2 /audio
parente88fe4462e186f82f519e115a1d19d6f0089012a (diff)
parente714af927c1e87a488178315b78b0c12c0ec9db9 (diff)
downloadhardware_libhardware_legacy-27b9f4b5bd44ef658c771cd4fb137c321c3527c6.zip
hardware_libhardware_legacy-27b9f4b5bd44ef658c771cd4fb137c321c3527c6.tar.gz
hardware_libhardware_legacy-27b9f4b5bd44ef658c771cd4fb137c321c3527c6.tar.bz2
am e714af92: audio policy: use legacy stream type definitions
* commit 'e714af927c1e87a488178315b78b0c12c0ec9db9': audio policy: use legacy stream type definitions
Diffstat (limited to 'audio')
-rw-r--r--audio/AudioPolicyManagerBase.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/audio/AudioPolicyManagerBase.cpp b/audio/AudioPolicyManagerBase.cpp
index a768be8..85b0084 100644
--- a/audio/AudioPolicyManagerBase.cpp
+++ b/audio/AudioPolicyManagerBase.cpp
@@ -3153,7 +3153,7 @@ const AudioPolicyManagerBase::VolumeCurvePoint
};
const AudioPolicyManagerBase::VolumeCurvePoint
- *AudioPolicyManagerBase::sVolumeProfiles[AUDIO_STREAM_CNT]
+ *AudioPolicyManagerBase::sVolumeProfiles[AudioSystem::NUM_STREAM_TYPES]
[AudioPolicyManagerBase::DEVICE_CATEGORY_CNT] = {
{ // AUDIO_STREAM_VOICE_CALL
sDefaultVoiceVolumeCurve, // DEVICE_CATEGORY_HEADSET
@@ -3209,7 +3209,7 @@ const AudioPolicyManagerBase::VolumeCurvePoint
void AudioPolicyManagerBase::initializeVolumeCurves()
{
- for (int i = 0; i < AUDIO_STREAM_CNT; i++) {
+ for (int i = 0; i < AudioSystem::NUM_STREAM_TYPES; i++) {
for (int j = 0; j < DEVICE_CATEGORY_CNT; j++) {
mStreams[i].mVolumeCurve[j] =
sVolumeProfiles[i][j];