diff options
| author | Steve Kondik <shade@chemlab.org> | 2012-11-18 20:46:23 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2012-11-18 20:46:23 -0800 |
| commit | 90b17dc3aca5efbed34a82972db73de71b724fe3 (patch) | |
| tree | 9acc413d20b5520ad4f5f96786e46718d5dbb7fb /modules/audio/audio_policy.c | |
| parent | bb992a86df645482167013634a8c1de1a3109344 (diff) | |
| parent | c55d7ac337641c7ad9ff734169e65553fbb40787 (diff) | |
| download | hardware_libhardware-90b17dc3aca5efbed34a82972db73de71b724fe3.zip hardware_libhardware-90b17dc3aca5efbed34a82972db73de71b724fe3.tar.gz hardware_libhardware-90b17dc3aca5efbed34a82972db73de71b724fe3.tar.bz2 | |
Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/hardware/libhardware into HEAD
Conflicts:
include/hardware/fb.h
include/hardware/hwcomposer.h
modules/audio/audio_hw.c
Change-Id: Ib37d49cb600bf0cd062847f9c0eb3841bae13f74
Diffstat (limited to 'modules/audio/audio_policy.c')
| -rw-r--r-- | modules/audio/audio_policy.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/audio/audio_policy.c b/modules/audio/audio_policy.c index ce74ff8..82aa449 100644 --- a/modules/audio/audio_policy.c +++ b/modules/audio/audio_policy.c @@ -98,7 +98,7 @@ static audio_io_handle_t ap_get_output(struct audio_policy *pol, audio_stream_type_t stream, uint32_t sampling_rate, audio_format_t format, - uint32_t channels, + audio_channel_mask_t channelMask, audio_output_flags_t flags) { return 0; @@ -124,7 +124,7 @@ static void ap_release_output(struct audio_policy *pol, static audio_io_handle_t ap_get_input(struct audio_policy *pol, audio_source_t inputSource, uint32_t sampling_rate, audio_format_t format, - uint32_t channels, + audio_channel_mask_t channelMask, audio_in_acoustics_t acoustics) { return 0; @@ -195,13 +195,13 @@ static audio_devices_t ap_get_devices_for_stream(const struct audio_policy *pol, } static audio_io_handle_t ap_get_output_for_effect(struct audio_policy *pol, - struct effect_descriptor_s *desc) + const struct effect_descriptor_s *desc) { return 0; } static int ap_register_effect(struct audio_policy *pol, - struct effect_descriptor_s *desc, + const struct effect_descriptor_s *desc, audio_io_handle_t output, uint32_t strategy, int session, |