diff options
| author | Glenn Kasten <gkasten@google.com> | 2013-12-10 09:53:22 -0800 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2013-12-10 10:06:28 -0800 |
| commit | 5082dbeb19e37883230510129c94336063a4f91c (patch) | |
| tree | f075b035aff4f6d2cc95e2f3a3e4dba32843e388 /audio | |
| parent | ce3e7680ccaa71337657591e8b10707233fc67b0 (diff) | |
| download | hardware_libhardware_legacy-5082dbeb19e37883230510129c94336063a4f91c.zip hardware_libhardware_legacy-5082dbeb19e37883230510129c94336063a4f91c.tar.gz hardware_libhardware_legacy-5082dbeb19e37883230510129c94336063a4f91c.tar.bz2 | |
Use audio_format_t in AudioPolicy
Also remove unnecessary default parameters
Change-Id: I553c01a98b8c2a3f3fd2ac98724aded3ad3c3022
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/AudioPolicyManagerBase.cpp | 10 | ||||
| -rw-r--r-- | audio/audio_policy_hal.cpp | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/audio/AudioPolicyManagerBase.cpp b/audio/AudioPolicyManagerBase.cpp index 8187134..b3a9044 100644 --- a/audio/AudioPolicyManagerBase.cpp +++ b/audio/AudioPolicyManagerBase.cpp @@ -495,7 +495,7 @@ void AudioPolicyManagerBase::setSystemProperty(const char* property, const char* AudioPolicyManagerBase::IOProfile *AudioPolicyManagerBase::getProfileForDirectOutput( audio_devices_t device, uint32_t samplingRate, - uint32_t format, + audio_format_t format, uint32_t channelMask, audio_output_flags_t flags) { @@ -529,7 +529,7 @@ AudioPolicyManagerBase::IOProfile *AudioPolicyManagerBase::getProfileForDirectOu audio_io_handle_t AudioPolicyManagerBase::getOutput(AudioSystem::stream_type stream, uint32_t samplingRate, - uint32_t format, + audio_format_t format, uint32_t channelMask, AudioSystem::output_flags flags, const audio_offload_info_t *offloadInfo) @@ -900,7 +900,7 @@ void AudioPolicyManagerBase::releaseOutput(audio_io_handle_t output) audio_io_handle_t AudioPolicyManagerBase::getInput(int inputSource, uint32_t samplingRate, - uint32_t format, + audio_format_t format, uint32_t channelMask, AudioSystem::audio_in_acoustics acoustics) { @@ -2661,7 +2661,7 @@ uint32_t AudioPolicyManagerBase::setOutputDevice(audio_io_handle_t output, AudioPolicyManagerBase::IOProfile *AudioPolicyManagerBase::getInputProfile(audio_devices_t device, uint32_t samplingRate, - uint32_t format, + audio_format_t format, uint32_t channelMask) { // Choose an input profile based on the requested capture parameters: select the first available @@ -3549,7 +3549,7 @@ AudioPolicyManagerBase::IOProfile::~IOProfile() // get a valid a match bool AudioPolicyManagerBase::IOProfile::isCompatibleProfile(audio_devices_t device, uint32_t samplingRate, - uint32_t format, + audio_format_t format, uint32_t channelMask, audio_output_flags_t flags) const { diff --git a/audio/audio_policy_hal.cpp b/audio/audio_policy_hal.cpp index e44bc48..87c4131 100644 --- a/audio/audio_policy_hal.cpp +++ b/audio/audio_policy_hal.cpp @@ -145,7 +145,7 @@ static audio_io_handle_t ap_get_output(struct audio_policy *pol, ALOGV("%s: tid %d", __func__, gettid()); return lap->apm->getOutput((AudioSystem::stream_type)stream, - sampling_rate, (int) format, channelMask, + sampling_rate, format, channelMask, (AudioSystem::output_flags)flags, offloadInfo); } @@ -180,7 +180,7 @@ static audio_io_handle_t ap_get_input(struct audio_policy *pol, audio_source_t i audio_in_acoustics_t acoustics) { struct legacy_audio_policy *lap = to_lap(pol); - return lap->apm->getInput((int) inputSource, sampling_rate, (int) format, channelMask, + return lap->apm->getInput((int) inputSource, sampling_rate, format, channelMask, (AudioSystem::audio_in_acoustics)acoustics); } |