diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-01-20 14:50:30 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-20 14:50:30 -0800 |
| commit | c97d4bb2bdbb9b057685412d966bca2d4aa3fa3d (patch) | |
| tree | 180853b1de0fdc9ff18b8b7b7d9bf8c6cf22512a /audio/audio_policy_hal.cpp | |
| parent | ba1e8cb245b1395fa6dd8a3eb9fe92a3d8a99adf (diff) | |
| parent | 53e2cfab45b411db0bf6c4b5d146cd9d8b1b1425 (diff) | |
| download | hardware_libhardware_legacy-c97d4bb2bdbb9b057685412d966bca2d4aa3fa3d.zip hardware_libhardware_legacy-c97d4bb2bdbb9b057685412d966bca2d4aa3fa3d.tar.gz hardware_libhardware_legacy-c97d4bb2bdbb9b057685412d966bca2d4aa3fa3d.tar.bz2 | |
Merge "Use audio_format_t consistently"
Diffstat (limited to 'audio/audio_policy_hal.cpp')
| -rw-r--r-- | audio/audio_policy_hal.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/audio/audio_policy_hal.cpp b/audio/audio_policy_hal.cpp index e997a81..ae631f5 100644 --- a/audio/audio_policy_hal.cpp +++ b/audio/audio_policy_hal.cpp @@ -136,7 +136,7 @@ static int ap_init_check(const struct audio_policy *pol) static audio_io_handle_t ap_get_output(struct audio_policy *pol, audio_stream_type_t stream, uint32_t sampling_rate, - uint32_t format, + audio_format_t format, uint32_t channels, audio_policy_output_flags_t flags) { @@ -144,7 +144,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, format, channels, + sampling_rate, (int) format, channels, (AudioSystem::output_flags)flags); } @@ -173,12 +173,12 @@ static void ap_release_output(struct audio_policy *pol, static audio_io_handle_t ap_get_input(struct audio_policy *pol, int inputSource, uint32_t sampling_rate, - uint32_t format, + audio_format_t format, uint32_t channels, audio_in_acoustics_t acoustics) { struct legacy_audio_policy *lap = to_lap(pol); - return lap->apm->getInput(inputSource, sampling_rate, format, channels, + return lap->apm->getInput(inputSource, sampling_rate, (int) format, channels, (AudioSystem::audio_in_acoustics)acoustics); } |