diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-06-22 13:43:51 -0700 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2012-06-25 13:51:10 -0700 |
| commit | 20010053daabfa43fcfe781bbf004473b4c08538 (patch) | |
| tree | f34948205baac68d57000467e9877a0041249d33 /services | |
| parent | 624a7fcb377f2a40109c16de5109ae8ea1f67a69 (diff) | |
| download | frameworks_av-20010053daabfa43fcfe781bbf004473b4c08538.zip frameworks_av-20010053daabfa43fcfe781bbf004473b4c08538.tar.gz frameworks_av-20010053daabfa43fcfe781bbf004473b4c08538.tar.bz2 | |
Remove acoustics from AudioSystem::getInput()
Change-Id: I29fb3ee5664c1f0ee0409c1bb2be087ecca637db
Diffstat (limited to 'services')
| -rw-r--r-- | services/audioflinger/AudioPolicyService.cpp | 6 | ||||
| -rw-r--r-- | services/audioflinger/AudioPolicyService.h | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/services/audioflinger/AudioPolicyService.cpp b/services/audioflinger/AudioPolicyService.cpp index c32fc6b..02b531c 100644 --- a/services/audioflinger/AudioPolicyService.cpp +++ b/services/audioflinger/AudioPolicyService.cpp @@ -272,7 +272,6 @@ audio_io_handle_t AudioPolicyService::getInput(audio_source_t inputSource, uint32_t samplingRate, audio_format_t format, uint32_t channels, - audio_in_acoustics_t acoustics, int audioSession) { if (mpAudioPolicy == NULL) { @@ -283,8 +282,9 @@ audio_io_handle_t AudioPolicyService::getInput(audio_source_t inputSource, return 0; } Mutex::Autolock _l(mLock); + // the audio_in_acoustics_t parameter is ignored by get_input() audio_io_handle_t input = mpAudioPolicy->get_input(mpAudioPolicy, inputSource, samplingRate, - format, channels, acoustics); + format, channels, (audio_in_acoustics_t) 0); if (input == 0) { return input; @@ -1424,7 +1424,7 @@ static int aps_restore_output(void *service, audio_io_handle_t output) return af->restoreOutput(output); } -// deprecated: replaced by aps_open_input_on_module() +// deprecated: replaced by aps_open_input_on_module(), and acoustics parameter is ignored static audio_io_handle_t aps_open_input(void *service, audio_devices_t *pDevices, uint32_t *pSamplingRate, diff --git a/services/audioflinger/AudioPolicyService.h b/services/audioflinger/AudioPolicyService.h index fbca000..b4924fc 100644 --- a/services/audioflinger/AudioPolicyService.h +++ b/services/audioflinger/AudioPolicyService.h @@ -78,8 +78,6 @@ public: uint32_t samplingRate = 0, audio_format_t format = AUDIO_FORMAT_DEFAULT, uint32_t channels = 0, - audio_in_acoustics_t acoustics = - (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); |