diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-01-20 14:50:29 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-20 14:50:29 -0800 |
| commit | ea84c55f2ce47e54fc0e73f69f3e283e2e9afe59 (patch) | |
| tree | 6368730914e63d7671ae62d36363180d28ac15e0 /modules/audio | |
| parent | 7c50e9bad4173cddff6dfc49ee0d4e10053867b4 (diff) | |
| parent | fe79eb3f06967f863a637e546eb4421d0da2283b (diff) | |
| download | hardware_libhardware-ea84c55f2ce47e54fc0e73f69f3e283e2e9afe59.zip hardware_libhardware-ea84c55f2ce47e54fc0e73f69f3e283e2e9afe59.tar.gz hardware_libhardware-ea84c55f2ce47e54fc0e73f69f3e283e2e9afe59.tar.bz2 | |
Merge "Use audio_format_t consistently"
Diffstat (limited to 'modules/audio')
| -rw-r--r-- | modules/audio/audio_hw.c | 14 | ||||
| -rw-r--r-- | modules/audio/audio_policy.c | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/modules/audio/audio_hw.c b/modules/audio/audio_hw.c index 6465df9..a2d7861 100644 --- a/modules/audio/audio_hw.c +++ b/modules/audio/audio_hw.c @@ -60,12 +60,12 @@ static uint32_t out_get_channels(const struct audio_stream *stream) return AUDIO_CHANNEL_OUT_STEREO; } -static int out_get_format(const struct audio_stream *stream) +static audio_format_t out_get_format(const struct audio_stream *stream) { return AUDIO_FORMAT_PCM_16_BIT; } -static int out_set_format(struct audio_stream *stream, int format) +static int out_set_format(struct audio_stream *stream, audio_format_t format) { return 0; } @@ -147,12 +147,12 @@ static uint32_t in_get_channels(const struct audio_stream *stream) return AUDIO_CHANNEL_IN_MONO; } -static int in_get_format(const struct audio_stream *stream) +static audio_format_t in_get_format(const struct audio_stream *stream) { return AUDIO_FORMAT_PCM_16_BIT; } -static int in_set_format(struct audio_stream *stream, int format) +static int in_set_format(struct audio_stream *stream, audio_format_t format) { return 0; } @@ -208,7 +208,7 @@ static int in_remove_audio_effect(const struct audio_stream *stream, effect_hand } static int adev_open_output_stream(struct audio_hw_device *dev, - uint32_t devices, int *format, + uint32_t devices, audio_format_t *format, uint32_t *channels, uint32_t *sample_rate, struct audio_stream_out **stream_out) { @@ -294,14 +294,14 @@ static int adev_get_mic_mute(const struct audio_hw_device *dev, bool *state) } static size_t adev_get_input_buffer_size(const struct audio_hw_device *dev, - uint32_t sample_rate, int format, + uint32_t sample_rate, audio_format_t format, int channel_count) { return 320; } static int adev_open_input_stream(struct audio_hw_device *dev, uint32_t devices, - int *format, uint32_t *channels, + audio_format_t *format, uint32_t *channels, uint32_t *sample_rate, audio_in_acoustics_t acoustics, struct audio_stream_in **stream_in) diff --git a/modules/audio/audio_policy.c b/modules/audio/audio_policy.c index 905c210..bfb4c39 100644 --- a/modules/audio/audio_policy.c +++ b/modules/audio/audio_policy.c @@ -97,7 +97,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) { @@ -123,7 +123,7 @@ 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) { |