diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/hardware/audio.h | 10 | ||||
-rw-r--r-- | include/hardware/audio_policy.h | 8 |
2 files changed, 9 insertions, 9 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); diff --git a/include/hardware/audio_policy.h b/include/hardware/audio_policy.h index 454ac85..edf6a68 100644 --- a/include/hardware/audio_policy.h +++ b/include/hardware/audio_policy.h @@ -131,7 +131,7 @@ struct audio_policy { audio_io_handle_t (*get_output)(struct audio_policy *pol, audio_stream_type_t stream, uint32_t samplingRate, - uint32_t format, + audio_format_t format, uint32_t channels, audio_policy_output_flags_t flags); @@ -156,7 +156,7 @@ struct audio_policy { * supplied parameters. */ audio_io_handle_t (*get_input)(struct audio_policy *pol, int inputSource, uint32_t samplingRate, - uint32_t format, + audio_format_t format, uint32_t channels, audio_in_acoustics_t acoustics); @@ -256,7 +256,7 @@ struct audio_policy_service_ops { audio_io_handle_t (*open_output)(void *service, uint32_t *pDevices, uint32_t *pSamplingRate, - uint32_t *pFormat, + audio_format_t *pFormat, uint32_t *pChannels, uint32_t *pLatencyMs, audio_policy_output_flags_t flags); @@ -291,7 +291,7 @@ struct audio_policy_service_ops { audio_io_handle_t (*open_input)(void *service, uint32_t *pDevices, uint32_t *pSamplingRate, - uint32_t *pFormat, + audio_format_t *pFormat, uint32_t *pChannels, uint32_t acoustics); |