From 5685a0845ecde4a1e53684473af3de77e6641af6 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Fri, 18 Apr 2014 15:45:42 -0700 Subject: audio_remote_submix: allow compiling for 64-bit Fix a few 64-bit warnings and set -Wno-unused-parameter, which makes the directory warnings-clean on 32-bit and 64-bit. Remove LOCAL_32_BIT_ONLY. Change-Id: I6a2183b5bb0cdf438a04de967995da7b1e2e3854 --- modules/audio_remote_submix/Android.mk | 3 ++- modules/audio_remote_submix/audio_hw.cpp | 12 ++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) (limited to 'modules/audio_remote_submix') diff --git a/modules/audio_remote_submix/Android.mk b/modules/audio_remote_submix/Android.mk index d718c76..90da396 100644 --- a/modules/audio_remote_submix/Android.mk +++ b/modules/audio_remote_submix/Android.mk @@ -26,6 +26,7 @@ LOCAL_C_INCLUDES += \ LOCAL_SHARED_LIBRARIES := liblog libcutils libutils libnbaio LOCAL_STATIC_LIBRARIES := libmedia_helper LOCAL_MODULE_TAGS := optional -LOCAL_32_BIT_ONLY := true +LOCAL_CFLAGS := -Wno-unused-parameter + include $(BUILD_SHARED_LIBRARY) diff --git a/modules/audio_remote_submix/audio_hw.cpp b/modules/audio_remote_submix/audio_hw.cpp index 9df17b6..433ef6c 100644 --- a/modules/audio_remote_submix/audio_hw.cpp +++ b/modules/audio_remote_submix/audio_hw.cpp @@ -271,7 +271,7 @@ static ssize_t out_write(struct audio_stream_out *stream, const void* buffer, return 0; } else { // write() returned UNDERRUN or WOULD_BLOCK, retry - ALOGE("out_write() write to pipe returned unexpected %d", written_frames); + ALOGE("out_write() write to pipe returned unexpected %zd", written_frames); written_frames = sink->write(buffer, frames); } } @@ -281,10 +281,10 @@ static ssize_t out_write(struct audio_stream_out *stream, const void* buffer, pthread_mutex_unlock(&out->dev->lock); if (written_frames < 0) { - ALOGE("out_write() failed writing to pipe with %d", written_frames); + ALOGE("out_write() failed writing to pipe with %zd", written_frames); return 0; } else { - ALOGV("out_write() wrote %lu bytes)", written_frames * frame_size); + ALOGV("out_write() wrote %zu bytes)", written_frames * frame_size); return written_frames * frame_size; } } @@ -327,7 +327,7 @@ static int in_set_sample_rate(struct audio_stream *stream, uint32_t rate) static size_t in_get_buffer_size(const struct audio_stream *stream) { const struct submix_stream_in *in = reinterpret_cast(stream); - ALOGV("in_get_buffer_size() returns %u", + ALOGV("in_get_buffer_size() returns %zu", in->dev->config.period_size * audio_stream_frame_size(stream)); return in->dev->config.period_size * audio_stream_frame_size(stream); } @@ -449,7 +449,7 @@ static ssize_t in_read(struct audio_stream_in *stream, void* buffer, } if (remaining_frames > 0) { - ALOGV(" remaining_frames = %d", remaining_frames); + ALOGV(" remaining_frames = %zu", remaining_frames); memset(((char*)buffer)+ bytes - (remaining_frames * frame_size), 0, remaining_frames * frame_size); } @@ -488,7 +488,7 @@ static ssize_t in_read(struct audio_stream_in *stream, void* buffer, } - ALOGV("in_read returns %d", bytes); + ALOGV("in_read returns %zu", bytes); return bytes; } -- cgit v1.1