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 | f55bc56490660e8eff92ff1f97607d6e78826629 (patch) | |
| tree | d9ac1b2452a7dbad2dbacdf1f0e7c95aa74c7653 /services | |
| parent | 191c849283e8045a64a8f2c3472798c029416086 (diff) | |
| parent | 882c0a20c5ff34e320e0dd5a30b441954335adae (diff) | |
| download | frameworks_base-f55bc56490660e8eff92ff1f97607d6e78826629.zip frameworks_base-f55bc56490660e8eff92ff1f97607d6e78826629.tar.gz frameworks_base-f55bc56490660e8eff92ff1f97607d6e78826629.tar.bz2 | |
Merge "Use audio_in_acoustics_t consistently"
Diffstat (limited to 'services')
| -rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 6 | ||||
| -rw-r--r-- | services/audioflinger/AudioFlinger.h | 2 | ||||
| -rw-r--r-- | services/audioflinger/AudioPolicyService.cpp | 2 | ||||
| -rw-r--r-- | services/audioflinger/AudioPolicyService.h | 2 |
4 files changed, 6 insertions, 6 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); } diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h index 4156da8..3f3188c 100644 --- a/services/audioflinger/AudioFlinger.h +++ b/services/audioflinger/AudioFlinger.h @@ -131,7 +131,7 @@ public: uint32_t *pSamplingRate, audio_format_t *pFormat, uint32_t *pChannels, - uint32_t acoustics); + audio_in_acoustics_t acoustics); virtual status_t closeInput(int input); diff --git a/services/audioflinger/AudioPolicyService.cpp b/services/audioflinger/AudioPolicyService.cpp index 0f2f544..1dddbb3 100644 --- a/services/audioflinger/AudioPolicyService.cpp +++ b/services/audioflinger/AudioPolicyService.cpp @@ -1419,7 +1419,7 @@ static audio_io_handle_t aps_open_input(void *service, uint32_t *pSamplingRate, audio_format_t *pFormat, uint32_t *pChannels, - uint32_t acoustics) + audio_in_acoustics_t acoustics) { sp<IAudioFlinger> af = AudioSystem::get_audio_flinger(); if (af == NULL) { diff --git a/services/audioflinger/AudioPolicyService.h b/services/audioflinger/AudioPolicyService.h index 6597bf8..62219e5 100644 --- a/services/audioflinger/AudioPolicyService.h +++ b/services/audioflinger/AudioPolicyService.h @@ -79,7 +79,7 @@ public: audio_format_t format = AUDIO_FORMAT_DEFAULT, uint32_t channels = 0, audio_in_acoustics_t acoustics = - (audio_in_acoustics_t)0, + (audio_in_acoustics_t)0 /*AUDIO_IN_ACOUSTICS_NONE*/, int audioSession = 0); virtual status_t startInput(audio_io_handle_t input); virtual status_t stopInput(audio_io_handle_t input); |