diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-01-12 11:46:47 -0800 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2012-01-20 14:40:37 -0800 |
| commit | b96375691c68f91d9afb53928d23bf6af33787b8 (patch) | |
| tree | 19fba79e5bd88c917f8a01005ebe40299d443ab4 /audio | |
| parent | c8bb333bb345221c0d6fc5190e20b514629770fb (diff) | |
| download | device_samsung_tuna-b96375691c68f91d9afb53928d23bf6af33787b8.zip device_samsung_tuna-b96375691c68f91d9afb53928d23bf6af33787b8.tar.gz device_samsung_tuna-b96375691c68f91d9afb53928d23bf6af33787b8.tar.bz2 | |
Use audio_format_t consistently
Change-Id: I2e2a5f625956dc5d09dbdc3f6f2d9a010ecc7bad
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/audio_hw.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/audio/audio_hw.c b/audio/audio_hw.c index 5f420a4..30d8b2e 100644 --- a/audio/audio_hw.c +++ b/audio/audio_hw.c @@ -1139,7 +1139,7 @@ static int start_output_stream(struct tuna_stream_out *out) return 0; } -static int check_input_parameters(uint32_t sample_rate, int format, int channel_count) +static int check_input_parameters(uint32_t sample_rate, audio_format_t format, int channel_count) { if (format != AUDIO_FORMAT_PCM_16_BIT) return -EINVAL; @@ -1164,7 +1164,7 @@ static int check_input_parameters(uint32_t sample_rate, int format, int channel_ return 0; } -static size_t get_input_buffer_size(uint32_t sample_rate, int format, int channel_count) +static size_t get_input_buffer_size(uint32_t sample_rate, audio_format_t format, int channel_count) { size_t size; size_t device_rate; @@ -1292,12 +1292,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; } @@ -1616,12 +1616,12 @@ static uint32_t in_get_channels(const struct audio_stream *stream) } } -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; } @@ -2164,7 +2164,7 @@ exit: 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) { @@ -2356,7 +2356,7 @@ 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) { size_t size; @@ -2368,7 +2368,7 @@ static size_t adev_get_input_buffer_size(const struct audio_hw_device *dev, } static int adev_open_input_stream(struct audio_hw_device *dev, uint32_t devices, - int *format, uint32_t *channel_mask, + audio_format_t *format, uint32_t *channel_mask, uint32_t *sample_rate, audio_in_acoustics_t acoustics, struct audio_stream_in **stream_in) |