diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-02-03 08:31:19 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-03 08:31:19 -0800 |
| commit | 1281e523b0f1bfc8ff44ac66da50ad573f149ec9 (patch) | |
| tree | 79ecda7ce24e16f89a3cc59f865257cf1d271460 /audio | |
| parent | 10d31fa204a23d2d5535a16467ebf11f85a56aea (diff) | |
| parent | 70eb9dec508c3269a0792e362ab34ffb3b29976c (diff) | |
| download | hardware_libhardware_legacy-1281e523b0f1bfc8ff44ac66da50ad573f149ec9.tar.gz hardware_libhardware_legacy-1281e523b0f1bfc8ff44ac66da50ad573f149ec9.tar.bz2 hardware_libhardware_legacy-1281e523b0f1bfc8ff44ac66da50ad573f149ec9.zip | |
Merge "Use audio_in_acoustics_t consistently"
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/AudioPolicyCompatClient.cpp | 2 | ||||
| -rw-r--r-- | audio/AudioPolicyCompatClient.h | 2 | ||||
| -rw-r--r-- | audio/AudioPolicyManagerBase.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/audio/AudioPolicyCompatClient.cpp b/audio/AudioPolicyCompatClient.cpp index 45b6b19..5231b41 100644 --- a/audio/AudioPolicyCompatClient.cpp +++ b/audio/AudioPolicyCompatClient.cpp @@ -67,7 +67,7 @@ audio_io_handle_t AudioPolicyCompatClient::openInput(uint32_t *pDevices, uint32_t *pSamplingRate, uint32_t *pFormat, uint32_t *pChannels, - uint32_t acoustics) + audio_in_acoustics_t acoustics) { return mServiceOps->open_input(mService, pDevices, pSamplingRate, (audio_format_t *) pFormat, pChannels, acoustics); diff --git a/audio/AudioPolicyCompatClient.h b/audio/AudioPolicyCompatClient.h index 4feee37..99dd639 100644 --- a/audio/AudioPolicyCompatClient.h +++ b/audio/AudioPolicyCompatClient.h @@ -50,7 +50,7 @@ public: uint32_t *pSamplingRate, uint32_t *pFormat, uint32_t *pChannels, - uint32_t acoustics); + audio_in_acoustics_t acoustics); virtual status_t closeInput(audio_io_handle_t input); virtual status_t setStreamOutput(AudioSystem::stream_type stream, audio_io_handle_t output); virtual status_t moveEffects(int session, diff --git a/audio/AudioPolicyManagerBase.cpp b/audio/AudioPolicyManagerBase.cpp index 3d198dc..6db942b 100644 --- a/audio/AudioPolicyManagerBase.cpp +++ b/audio/AudioPolicyManagerBase.cpp @@ -710,7 +710,7 @@ audio_io_handle_t AudioPolicyManagerBase::getInput(int inputSource, &inputDesc->mSamplingRate, &inputDesc->mFormat, &inputDesc->mChannels, - inputDesc->mAcoustics); + (audio_in_acoustics_t) inputDesc->mAcoustics); // only accept input with the exact requested set of parameters if (input == 0 || |