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 /include/hardware/audio.h | |
| 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 'include/hardware/audio.h')
| -rw-r--r-- | include/hardware/audio.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/hardware/audio.h b/include/hardware/audio.h index 80eb1a7..fa34467 100644 --- a/include/hardware/audio.h +++ b/include/hardware/audio.h @@ -102,12 +102,12 @@ struct audio_stream { /** * audio format - eg. AUDIO_FORMAT_PCM_16_BIT */ - int (*get_format)(const struct audio_stream *stream); + audio_format_t (*get_format)(const struct audio_stream *stream); /* currently unused - use set_parameters with key * AUDIO_PARAMETER_STREAM_FORMAT */ - int (*set_format)(struct audio_stream *stream, int format); + int (*set_format)(struct audio_stream *stream, audio_format_t format); /** * Put the audio hardware input/output into standby mode. @@ -296,12 +296,12 @@ struct audio_hw_device { * 0 if one of the parameters is not supported */ size_t (*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); /** This method creates and opens the audio hardware output stream */ int (*open_output_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, struct audio_stream_out **out); @@ -310,7 +310,7 @@ struct audio_hw_device { /** This method creates and opens the audio hardware input stream */ int (*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); |