diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-02-03 08:31:01 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-03 08:31:01 -0800 |
| commit | 787bae0578fbaab6219ebf23494866b224d01438 (patch) | |
| tree | 935422276579d6f7c3b4e835e1a79bc9082a2b26 /services/audioflinger/AudioFlinger.cpp | |
| parent | ff3c83e04ae459c4252b86dd4440b4e37ee92c16 (diff) | |
| parent | de9719b3ec71472e6bf75117152176af51d1a515 (diff) | |
| download | frameworks_av-787bae0578fbaab6219ebf23494866b224d01438.zip frameworks_av-787bae0578fbaab6219ebf23494866b224d01438.tar.gz frameworks_av-787bae0578fbaab6219ebf23494866b224d01438.tar.bz2 | |
Merge "Use audio_in_acoustics_t consistently"
Diffstat (limited to 'services/audioflinger/AudioFlinger.cpp')
| -rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index 7e2f6be..f71ba0a 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -5103,7 +5103,7 @@ int AudioFlinger::openInput(uint32_t *pDevices, uint32_t *pSamplingRate, audio_format_t *pFormat, uint32_t *pChannels, - uint32_t acoustics) + audio_in_acoustics_t acoustics) { status_t status; RecordThread *thread = NULL; @@ -5128,7 +5128,7 @@ int AudioFlinger::openInput(uint32_t *pDevices, status = inHwDev->open_input_stream(inHwDev, *pDevices, &format, &channels, &samplingRate, - (audio_in_acoustics_t)acoustics, + acoustics, &inStream); ALOGV("openInput() openInputStream returned input %p, SamplingRate %d, Format %d, Channels %x, acoustics %x, status %d", inStream, @@ -5148,7 +5148,7 @@ int AudioFlinger::openInput(uint32_t *pDevices, ALOGV("openInput() reopening with proposed sampling rate and channels"); status = inHwDev->open_input_stream(inHwDev, *pDevices, &format, &channels, &samplingRate, - (audio_in_acoustics_t)acoustics, + acoustics, &inStream); } |