summaryrefslogtreecommitdiff
path: root/services/audioflinger/AudioFlinger.cpp
diff options
context:
space:
mode:
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
commitf55bc56490660e8eff92ff1f97607d6e78826629 (patch)
treed9ac1b2452a7dbad2dbacdf1f0e7c95aa74c7653 /services/audioflinger/AudioFlinger.cpp
parent191c849283e8045a64a8f2c3472798c029416086 (diff)
parent882c0a20c5ff34e320e0dd5a30b441954335adae (diff)
Merge "Use audio_in_acoustics_t consistently"
Diffstat (limited to 'services/audioflinger/AudioFlinger.cpp')
-rw-r--r--services/audioflinger/AudioFlinger.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index 7e2f6be33854..f71ba0a34e7a 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);
}