commit 80e611bd026bf4134abd9e1908b677dc32b8bd91
author Glenn Kasten <gkasten@google.com> Thu Jan 12 11:47:50 2012 -0800
committer Glenn Kasten <gkasten@google.com> Fri Jan 13 09:27:54 2012 -0800
tree 8048cd4a627fde41c3a9f496c50eb4fb6cf91143
parent 6934b76075fabbd7a1f542b3000b250f4a589492

Use audio_format_t consistently

Change-Id: I6c64429f93c595df264138a668a91916e7bcec66

audio/android_audio_hw.c

diff --git a/audio/android_audio_hw.c b/audio/android_audio_hw.c
index 4a6048b..ab82364 100644
--- a/audio/android_audio_hw.c
+++ b/audio/android_audio_hw.c
@@ -88,7 +88,7 @@
     uint32_t                sample_rate;
     size_t                  buffer_size;
     uint32_t                channels;
-    int                     format;
+    audio_format_t          format;
 
     int                     fd;
     bool                    standby;
@@ -158,13 +158,13 @@
     return out->channels;
 }
 
-static int out_get_format(const struct audio_stream *stream)
+static audio_format_t out_get_format(const struct audio_stream *stream)
 {
     const struct astream_out *out = (const struct astream_out *)stream;
     return out->format;
 }
 
-static int out_set_format(struct audio_stream *stream, int format)
+static audio_format_t out_set_format(struct audio_stream *stream, audio_format_t format)
 {
     struct astream_out *out = (struct astream_out *)stream;
     ALOGE("(%s:%d) %s: Implement me!", __FILE__, __LINE__, __func__);
@@ -218,7 +218,7 @@
     return 0;
 }
 
-static bool _out_validate_parms(struct astream_out *out, int format,
+static bool _out_validate_parms(struct astream_out *out, audio_format_t format,
                                 uint32_t chans, uint32_t rate)
 {
     if ((format && (format != out->format)) ||
@@ -598,7 +598,7 @@
 }
 
 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)
 {
@@ -853,7 +853,7 @@
 }
 
 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)
 {
     /* no input */
@@ -861,7 +861,7 @@
 }
 
 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)