diff options
author | Eric Laurent <elaurent@google.com> | 2014-11-26 12:08:41 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-26 12:08:41 +0000 |
commit | 1688082913a82db7c48f7fd35d7da6de7a5ed01d (patch) | |
tree | 50e25cb432229d844436f430510a650f2f6834b2 | |
parent | a99b39be8e3a5bc1b187046b851685b52811c517 (diff) | |
parent | 27b9f4b5bd44ef658c771cd4fb137c321c3527c6 (diff) | |
download | hardware_libhardware_legacy-1688082913a82db7c48f7fd35d7da6de7a5ed01d.zip hardware_libhardware_legacy-1688082913a82db7c48f7fd35d7da6de7a5ed01d.tar.gz hardware_libhardware_legacy-1688082913a82db7c48f7fd35d7da6de7a5ed01d.tar.bz2 |
am 27b9f4b5: am e714af92: audio policy: use legacy stream type definitions
* commit '27b9f4b5bd44ef658c771cd4fb137c321c3527c6':
audio policy: use legacy stream type definitions
-rw-r--r-- | audio/AudioPolicyManagerBase.cpp | 4 | ||||
-rw-r--r-- | include/hardware_legacy/AudioPolicyManagerBase.h | 2 |
2 files changed, 3 insertions, 3 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]; diff --git a/include/hardware_legacy/AudioPolicyManagerBase.h b/include/hardware_legacy/AudioPolicyManagerBase.h index b97ce40..cf03f78 100644 --- a/include/hardware_legacy/AudioPolicyManagerBase.h +++ b/include/hardware_legacy/AudioPolicyManagerBase.h @@ -244,7 +244,7 @@ protected: static const VolumeCurvePoint sDefaultVoiceVolumeCurve[AudioPolicyManagerBase::VOLCNT]; static const VolumeCurvePoint sSpeakerVoiceVolumeCurve[AudioPolicyManagerBase::VOLCNT]; // default volume curves per stream and device category. See initializeVolumeCurves() - static const VolumeCurvePoint *sVolumeProfiles[AUDIO_STREAM_CNT][DEVICE_CATEGORY_CNT]; + static const VolumeCurvePoint *sVolumeProfiles[AudioSystem::NUM_STREAM_TYPES][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. |