diff options
Diffstat (limited to 'audio/audio_hw_hal.cpp')
| -rw-r--r-- | audio/audio_hw_hal.cpp | 39 |
1 files changed, 21 insertions, 18 deletions
diff --git a/audio/audio_hw_hal.cpp b/audio/audio_hw_hal.cpp index dd56c80..0fc4efa 100644 --- a/audio/audio_hw_hal.cpp +++ b/audio/audio_hw_hal.cpp @@ -65,7 +65,7 @@ static int out_set_sample_rate(struct audio_stream *stream, uint32_t rate) struct legacy_stream_out *out = reinterpret_cast<struct legacy_stream_out *>(stream); - LOGE("(%s:%d) %s: Implement me!", __FILE__, __LINE__, __func__); + ALOGE("(%s:%d) %s: Implement me!", __FILE__, __LINE__, __func__); /* TODO: implement this */ return 0; } @@ -84,18 +84,19 @@ static uint32_t out_get_channels(const struct audio_stream *stream) return out->legacy_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 legacy_stream_out *out = reinterpret_cast<const struct legacy_stream_out *>(stream); - return out->legacy_out->format(); + // legacy API, don't change return type + return (audio_format_t) out->legacy_out->format(); } -static int out_set_format(struct audio_stream *stream, int format) +static int out_set_format(struct audio_stream *stream, audio_format_t format) { struct legacy_stream_out *out = reinterpret_cast<struct legacy_stream_out *>(stream); - LOGE("(%s:%d) %s: Implement me!", __FILE__, __LINE__, __func__); + ALOGE("(%s:%d) %s: Implement me!", __FILE__, __LINE__, __func__); /* TODO: implement me */ return 0; } @@ -193,7 +194,7 @@ static int in_set_sample_rate(struct audio_stream *stream, uint32_t rate) struct legacy_stream_in *in = reinterpret_cast<struct legacy_stream_in *>(stream); - LOGE("(%s:%d) %s: Implement me!", __FILE__, __LINE__, __func__); + ALOGE("(%s:%d) %s: Implement me!", __FILE__, __LINE__, __func__); /* TODO: implement this */ return 0; } @@ -212,18 +213,19 @@ static uint32_t in_get_channels(const struct audio_stream *stream) return in->legacy_in->channels(); } -static int in_get_format(const struct audio_stream *stream) +static audio_format_t in_get_format(const struct audio_stream *stream) { const struct legacy_stream_in *in = reinterpret_cast<const struct legacy_stream_in *>(stream); - return in->legacy_in->format(); + // legacy API, don't change return type + return (audio_format_t) in->legacy_in->format(); } -static int in_set_format(struct audio_stream *stream, int format) +static int in_set_format(struct audio_stream *stream, audio_format_t format) { struct legacy_stream_in *in = reinterpret_cast<struct legacy_stream_in *>(stream); - LOGE("(%s:%d) %s: Implement me!", __FILE__, __LINE__, __func__); + ALOGE("(%s:%d) %s: Implement me!", __FILE__, __LINE__, __func__); /* TODO: implement me */ return 0; } @@ -360,10 +362,11 @@ static int adev_get_master_volume(struct audio_hw_device *dev, float* volume) return ladev->hwif->getMasterVolume(volume); } -static int adev_set_mode(struct audio_hw_device *dev, int mode) +static int adev_set_mode(struct audio_hw_device *dev, audio_mode_t mode) { struct legacy_audio_device *ladev = to_ladev(dev); - return ladev->hwif->setMode(mode); + // as this is the legacy API, don't change it to use audio_mode_t instead of int + return ladev->hwif->setMode((int) mode); } static int adev_set_mic_mute(struct audio_hw_device *dev, bool state) @@ -395,16 +398,16 @@ static char * adev_get_parameters(const struct audio_hw_device *dev, } 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) { const struct legacy_audio_device *ladev = to_cladev(dev); - return ladev->hwif->getInputBufferSize(sample_rate, format, channel_count); + return ladev->hwif->getInputBufferSize(sample_rate, (int) format, channel_count); } static int adev_open_output_stream(struct audio_hw_device *dev, uint32_t devices, - int *format, + audio_format_t *format, uint32_t *channels, uint32_t *sample_rate, struct audio_stream_out **stream_out) @@ -418,7 +421,7 @@ static int adev_open_output_stream(struct audio_hw_device *dev, if (!out) return -ENOMEM; - out->legacy_out = ladev->hwif->openOutputStream(devices, format, channels, + out->legacy_out = ladev->hwif->openOutputStream(devices, (int *) format, channels, sample_rate, &status); if (!out->legacy_out) { ret = status; @@ -464,7 +467,7 @@ static void adev_close_output_stream(struct audio_hw_device *dev, /** This method creates and opens the audio hardware input stream */ static int adev_open_input_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, audio_in_acoustics_t acoustics, struct audio_stream_in **stream_in) @@ -478,7 +481,7 @@ static int adev_open_input_stream(struct audio_hw_device *dev, if (!in) return -ENOMEM; - in->legacy_in = ladev->hwif->openInputStream(devices, format, channels, + in->legacy_in = ladev->hwif->openInputStream(devices, (int *) format, channels, sample_rate, &status, (AudioSystem::audio_in_acoustics)acoustics); if (!in->legacy_in) { |