From 0f11b51a57bc9062c4fe8af73747319cedabc5d6 Mon Sep 17 00:00:00 2001 From: Glenn Kasten Date: Fri, 31 Jan 2014 16:18:54 -0800 Subject: Fix unused parameter warnings in audio Change-Id: I665ba3358dd9502f0adec70d486e7bf8a2e1b0fe --- media/libmedia/AudioEffect.cpp | 4 ++-- media/libmedia/AudioRecord.cpp | 2 +- media/libmedia/AudioSystem.cpp | 2 +- media/libnbaio/PipeReader.cpp | 2 +- media/mediaserver/main_mediaserver.cpp | 2 +- services/audioflinger/AudioFlinger.cpp | 8 ++++---- services/audioflinger/AudioPolicyService.cpp | 30 ++++++++++++++-------------- services/audioflinger/Effects.cpp | 2 +- services/audioflinger/Threads.cpp | 30 ++++++++++++++++------------ services/audioflinger/Threads.h | 6 +++--- services/audioflinger/Tracks.cpp | 10 +++++----- services/medialog/MediaLogService.cpp | 2 +- 12 files changed, 52 insertions(+), 48 deletions(-) diff --git a/media/libmedia/AudioEffect.cpp b/media/libmedia/AudioEffect.cpp index 8dfffb3..35f6557 100644 --- a/media/libmedia/AudioEffect.cpp +++ b/media/libmedia/AudioEffect.cpp @@ -380,9 +380,9 @@ void AudioEffect::enableStatusChanged(bool enabled) } void AudioEffect::commandExecuted(uint32_t cmdCode, - uint32_t cmdSize, + uint32_t cmdSize __unused, void *cmdData, - uint32_t replySize, + uint32_t replySize __unused, void *replyData) { if (cmdData == NULL || replyData == NULL) { diff --git a/media/libmedia/AudioRecord.cpp b/media/libmedia/AudioRecord.cpp index b69e3ae..286096e 100644 --- a/media/libmedia/AudioRecord.cpp +++ b/media/libmedia/AudioRecord.cpp @@ -87,7 +87,7 @@ AudioRecord::AudioRecord( int notificationFrames, int sessionId, transfer_type transferType, - audio_input_flags_t flags) + audio_input_flags_t flags __unused) : mStatus(NO_INIT), mSessionId(AUDIO_SESSION_ALLOCATE), mPreviousPriority(ANDROID_PRIORITY_NORMAL), mPreviousSchedulingGroup(SP_DEFAULT), diff --git a/media/libmedia/AudioSystem.cpp b/media/libmedia/AudioSystem.cpp index dcb72f8..1ab94fa 100644 --- a/media/libmedia/AudioSystem.cpp +++ b/media/libmedia/AudioSystem.cpp @@ -333,7 +333,7 @@ status_t AudioSystem::getOutputLatency(uint32_t* latency, audio_stream_type_t st } status_t AudioSystem::getLatency(audio_io_handle_t output, - audio_stream_type_t streamType, + audio_stream_type_t streamType __unused, uint32_t* latency) { OutputDescriptor *outputDesc; diff --git a/media/libnbaio/PipeReader.cpp b/media/libnbaio/PipeReader.cpp index d786b84..24da1bd 100644 --- a/media/libnbaio/PipeReader.cpp +++ b/media/libnbaio/PipeReader.cpp @@ -59,7 +59,7 @@ ssize_t PipeReader::availableToRead() return avail; } -ssize_t PipeReader::read(void *buffer, size_t count, int64_t readPTS) +ssize_t PipeReader::read(void *buffer, size_t count, int64_t readPTS __unused) { ssize_t avail = availableToRead(); if (CC_UNLIKELY(avail <= 0)) { diff --git a/media/mediaserver/main_mediaserver.cpp b/media/mediaserver/main_mediaserver.cpp index d5207d5..a347951 100644 --- a/media/mediaserver/main_mediaserver.cpp +++ b/media/mediaserver/main_mediaserver.cpp @@ -37,7 +37,7 @@ using namespace android; -int main(int argc, char** argv) +int main(int argc __unused, char** argv) { signal(SIGPIPE, SIG_IGN); char value[PROPERTY_VALUE_MAX]; diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index f9cc17b..1e134d0 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -264,7 +264,7 @@ AudioFlinger::AudioHwDevice* AudioFlinger::findSuitableHwDev_l( return NULL; } -void AudioFlinger::dumpClients(int fd, const Vector& args) +void AudioFlinger::dumpClients(int fd, const Vector& args __unused) { const size_t SIZE = 256; char buffer[SIZE]; @@ -296,7 +296,7 @@ void AudioFlinger::dumpClients(int fd, const Vector& args) } -void AudioFlinger::dumpInternals(int fd, const Vector& args) +void AudioFlinger::dumpInternals(int fd, const Vector& args __unused) { const size_t SIZE = 256; char buffer[SIZE]; @@ -311,7 +311,7 @@ void AudioFlinger::dumpInternals(int fd, const Vector& args) write(fd, result.string(), result.size()); } -void AudioFlinger::dumpPermissionDenial(int fd, const Vector& args) +void AudioFlinger::dumpPermissionDenial(int fd, const Vector& args __unused) { const size_t SIZE = 256; char buffer[SIZE]; @@ -1259,7 +1259,7 @@ AudioFlinger::NotificationClient::~NotificationClient() { } -void AudioFlinger::NotificationClient::binderDied(const wp& who) +void AudioFlinger::NotificationClient::binderDied(const wp& who __unused) { sp keep(this); mAudioFlinger->removeNotificationClient(mPid); diff --git a/services/audioflinger/AudioPolicyService.cpp b/services/audioflinger/AudioPolicyService.cpp index 415f696..6a115ff 100644 --- a/services/audioflinger/AudioPolicyService.cpp +++ b/services/audioflinger/AudioPolicyService.cpp @@ -613,7 +613,7 @@ status_t AudioPolicyService::dumpInternals(int fd) return NO_ERROR; } -status_t AudioPolicyService::dump(int fd, const Vector& args) +status_t AudioPolicyService::dump(int fd, const Vector& args __unused) { if (!dumpAllowed()) { dumpPermissionDenial(fd); @@ -1461,7 +1461,7 @@ status_t AudioPolicyService::loadPreProcessorConfig(const char *path) extern "C" { -static audio_module_handle_t aps_load_hw_module(void *service, +static audio_module_handle_t aps_load_hw_module(void *service __unused, const char *name) { sp af = AudioSystem::get_audio_flinger(); @@ -1474,7 +1474,7 @@ static audio_module_handle_t aps_load_hw_module(void *service, } // deprecated: replaced by aps_open_output_on_module() -static audio_io_handle_t aps_open_output(void *service, +static audio_io_handle_t aps_open_output(void *service __unused, audio_devices_t *pDevices, uint32_t *pSamplingRate, audio_format_t *pFormat, @@ -1492,7 +1492,7 @@ static audio_io_handle_t aps_open_output(void *service, pLatencyMs, flags); } -static audio_io_handle_t aps_open_output_on_module(void *service, +static audio_io_handle_t aps_open_output_on_module(void *service __unused, audio_module_handle_t module, audio_devices_t *pDevices, uint32_t *pSamplingRate, @@ -1511,7 +1511,7 @@ static audio_io_handle_t aps_open_output_on_module(void *service, pLatencyMs, flags, offloadInfo); } -static audio_io_handle_t aps_open_dup_output(void *service, +static audio_io_handle_t aps_open_dup_output(void *service __unused, audio_io_handle_t output1, audio_io_handle_t output2) { @@ -1523,7 +1523,7 @@ static audio_io_handle_t aps_open_dup_output(void *service, return af->openDuplicateOutput(output1, output2); } -static int aps_close_output(void *service, audio_io_handle_t output) +static int aps_close_output(void *service __unused, audio_io_handle_t output) { sp af = AudioSystem::get_audio_flinger(); if (af == 0) { @@ -1533,7 +1533,7 @@ static int aps_close_output(void *service, audio_io_handle_t output) return af->closeOutput(output); } -static int aps_suspend_output(void *service, audio_io_handle_t output) +static int aps_suspend_output(void *service __unused, audio_io_handle_t output) { sp af = AudioSystem::get_audio_flinger(); if (af == 0) { @@ -1544,7 +1544,7 @@ static int aps_suspend_output(void *service, audio_io_handle_t output) return af->suspendOutput(output); } -static int aps_restore_output(void *service, audio_io_handle_t output) +static int aps_restore_output(void *service __unused, audio_io_handle_t output) { sp af = AudioSystem::get_audio_flinger(); if (af == 0) { @@ -1556,12 +1556,12 @@ static int aps_restore_output(void *service, audio_io_handle_t output) } // deprecated: replaced by aps_open_input_on_module(), and acoustics parameter is ignored -static audio_io_handle_t aps_open_input(void *service, +static audio_io_handle_t aps_open_input(void *service __unused, audio_devices_t *pDevices, uint32_t *pSamplingRate, audio_format_t *pFormat, audio_channel_mask_t *pChannelMask, - audio_in_acoustics_t acoustics) + audio_in_acoustics_t acoustics __unused) { sp af = AudioSystem::get_audio_flinger(); if (af == 0) { @@ -1572,7 +1572,7 @@ static audio_io_handle_t aps_open_input(void *service, return af->openInput((audio_module_handle_t)0, pDevices, pSamplingRate, pFormat, pChannelMask); } -static audio_io_handle_t aps_open_input_on_module(void *service, +static audio_io_handle_t aps_open_input_on_module(void *service __unused, audio_module_handle_t module, audio_devices_t *pDevices, uint32_t *pSamplingRate, @@ -1588,7 +1588,7 @@ static audio_io_handle_t aps_open_input_on_module(void *service, return af->openInput(module, pDevices, pSamplingRate, pFormat, pChannelMask); } -static int aps_close_input(void *service, audio_io_handle_t input) +static int aps_close_input(void *service __unused, audio_io_handle_t input) { sp af = AudioSystem::get_audio_flinger(); if (af == 0) { @@ -1598,7 +1598,7 @@ static int aps_close_input(void *service, audio_io_handle_t input) return af->closeInput(input); } -static int aps_set_stream_output(void *service, audio_stream_type_t stream, +static int aps_set_stream_output(void *service __unused, audio_stream_type_t stream, audio_io_handle_t output) { sp af = AudioSystem::get_audio_flinger(); @@ -1609,7 +1609,7 @@ static int aps_set_stream_output(void *service, audio_stream_type_t stream, return af->setStreamOutput(stream, output); } -static int aps_move_effects(void *service, int session, +static int aps_move_effects(void *service __unused, int session, audio_io_handle_t src_output, audio_io_handle_t dst_output) { @@ -1621,7 +1621,7 @@ static int aps_move_effects(void *service, int session, return af->moveEffects(session, src_output, dst_output); } -static char * aps_get_parameters(void *service, audio_io_handle_t io_handle, +static char * aps_get_parameters(void *service __unused, audio_io_handle_t io_handle, const char *keys) { String8 result = AudioSystem::getParameters(io_handle, String8(keys)); diff --git a/services/audioflinger/Effects.cpp b/services/audioflinger/Effects.cpp index 59b4770..537c076 100644 --- a/services/audioflinger/Effects.cpp +++ b/services/audioflinger/Effects.cpp @@ -805,7 +805,7 @@ bool AudioFlinger::EffectModule::isOffloaded() const return mOffloaded; } -void AudioFlinger::EffectModule::dump(int fd, const Vector& args) +void AudioFlinger::EffectModule::dump(int fd, const Vector& args __unused) { const size_t SIZE = 256; char buffer[SIZE]; diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp index 515368c..1f80527 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp @@ -185,7 +185,11 @@ CpuStats::CpuStats() { } -void CpuStats::sample(const String8 &title) { +void CpuStats::sample(const String8 &title +#ifndef DEBUG_CPU_USAGE + __unused +#endif + ) { #ifdef DEBUG_CPU_USAGE // get current thread's delta CPU time in wall clock ns double wcNs; @@ -421,7 +425,7 @@ void AudioFlinger::ThreadBase::processConfigEvents_l() } } -void AudioFlinger::ThreadBase::dumpBase(int fd, const Vector& args) +void AudioFlinger::ThreadBase::dumpBase(int fd, const Vector& args __unused) { const size_t SIZE = 256; char buffer[SIZE]; @@ -604,7 +608,7 @@ void AudioFlinger::ThreadBase::clearPowerManager() mPowerManager.clear(); } -void AudioFlinger::ThreadBase::PMDeathRecipient::binderDied(const wp& who) +void AudioFlinger::ThreadBase::PMDeathRecipient::binderDied(const wp& who __unused) { sp thread = mThread.promote(); if (thread != 0) { @@ -1088,7 +1092,7 @@ void AudioFlinger::PlaybackThread::dump(int fd, const Vector& args) dumpEffectChains(fd, args); } -void AudioFlinger::PlaybackThread::dumpTracks(int fd, const Vector& args) +void AudioFlinger::PlaybackThread::dumpTracks(int fd, const Vector& args __unused) { const size_t SIZE = 256; char buffer[SIZE]; @@ -1614,7 +1618,7 @@ void AudioFlinger::PlaybackThread::resetDraining(uint32_t sequence) // static int AudioFlinger::PlaybackThread::asyncCallback(stream_callback_event_t event, - void *param, + void *param __unused, void *cookie) { AudioFlinger::PlaybackThread *me = (AudioFlinger::PlaybackThread *)cookie; @@ -3739,14 +3743,14 @@ void AudioFlinger::DirectOutputThread::threadLoop_sleepTime() } // getTrackName_l() must be called with ThreadBase::mLock held -int AudioFlinger::DirectOutputThread::getTrackName_l(audio_channel_mask_t channelMask, - int sessionId) +int AudioFlinger::DirectOutputThread::getTrackName_l(audio_channel_mask_t channelMask __unused, + int sessionId __unused) { return 0; } // deleteTrackName_l() must be called with ThreadBase::mLock held -void AudioFlinger::DirectOutputThread::deleteTrackName_l(int name) +void AudioFlinger::DirectOutputThread::deleteTrackName_l(int name __unused) { } @@ -5026,12 +5030,12 @@ bool AudioFlinger::RecordThread::stop(RecordThread::RecordTrack* recordTrack) { return false; } -bool AudioFlinger::RecordThread::isValidSyncEvent(const sp& event) const +bool AudioFlinger::RecordThread::isValidSyncEvent(const sp& event __unused) const { return false; } -status_t AudioFlinger::RecordThread::setSyncEvent(const sp& event) +status_t AudioFlinger::RecordThread::setSyncEvent(const sp& event __unused) { #if 0 // This branch is currently dead code, but is preserved in case it will be needed in future if (!isValidSyncEvent(event)) { @@ -5109,7 +5113,7 @@ void AudioFlinger::RecordThread::dumpInternals(int fd, const Vector& a dumpBase(fd, args); } -void AudioFlinger::RecordThread::dumpTracks(int fd, const Vector& args) +void AudioFlinger::RecordThread::dumpTracks(int fd, const Vector& args __unused) { const size_t SIZE = 256; char buffer[SIZE]; @@ -5142,7 +5146,7 @@ void AudioFlinger::RecordThread::dumpTracks(int fd, const Vector& args } // AudioBufferProvider interface -status_t AudioFlinger::RecordThread::getNextBuffer(AudioBufferProvider::Buffer* buffer, int64_t pts) +status_t AudioFlinger::RecordThread::getNextBuffer(AudioBufferProvider::Buffer* buffer, int64_t pts __unused) { int32_t rear = mRsmpInRear; int32_t front = mRsmpInFront; @@ -5321,7 +5325,7 @@ String8 AudioFlinger::RecordThread::getParameters(const String8& keys) return out_s8; } -void AudioFlinger::RecordThread::audioConfigChanged_l(int event, int param) { +void AudioFlinger::RecordThread::audioConfigChanged_l(int event, int param __unused) { AudioSystem::OutputDescriptor desc; const void *param2 = NULL; diff --git a/services/audioflinger/Threads.h b/services/audioflinger/Threads.h index 8df6f94..1745ea1 100644 --- a/services/audioflinger/Threads.h +++ b/services/audioflinger/Threads.h @@ -201,13 +201,13 @@ public: // effect void removeEffect_l(const sp< EffectModule>& effect); // detach all tracks connected to an auxiliary effect - virtual void detachAuxEffect_l(int effectId) {} + virtual void detachAuxEffect_l(int effectId __unused) {} // returns either EFFECT_SESSION if effects on this audio session exist in one // chain, or TRACK_SESSION if tracks on this audio session exist, or both virtual uint32_t hasAudioSession(int sessionId) const = 0; // the value returned by default implementation is not important as the // strategy is only meaningful for PlaybackThread which implements this method - virtual uint32_t getStrategyForSession_l(int sessionId) { return 0; } + virtual uint32_t getStrategyForSession_l(int sessionId __unused) { return 0; } // suspend or restore effect according to the type of effect passed. a NULL // type pointer means suspend all effects in the session @@ -625,7 +625,7 @@ private: sp mFastMixerNBLogWriter; public: virtual bool hasFastMixer() const = 0; - virtual FastTrackUnderruns getFastTrackUnderruns(size_t fastIndex) const + virtual FastTrackUnderruns getFastTrackUnderruns(size_t fastIndex __unused) const { FastTrackUnderruns dummy; return dummy; } protected: diff --git a/services/audioflinger/Tracks.cpp b/services/audioflinger/Tracks.cpp index d8d7790..ecedca9 100644 --- a/services/audioflinger/Tracks.cpp +++ b/services/audioflinger/Tracks.cpp @@ -526,7 +526,7 @@ uint32_t AudioFlinger::PlaybackThread::Track::sampleRate() const { // AudioBufferProvider interface status_t AudioFlinger::PlaybackThread::Track::getNextBuffer( - AudioBufferProvider::Buffer* buffer, int64_t pts) + AudioBufferProvider::Buffer* buffer, int64_t pts __unused) { ServerProxy::Buffer buf; size_t desiredFrames = buffer->frameCount; @@ -576,8 +576,8 @@ bool AudioFlinger::PlaybackThread::Track::isReady() const { return false; } -status_t AudioFlinger::PlaybackThread::Track::start(AudioSystem::sync_event_t event, - int triggerSession) +status_t AudioFlinger::PlaybackThread::Track::start(AudioSystem::sync_event_t event __unused, + int triggerSession __unused) { status_t status = NO_ERROR; ALOGV("start(%d), calling pid %d session %d", @@ -1163,7 +1163,7 @@ void AudioFlinger::PlaybackThread::TimedTrack::trimTimedBufferQueueHead_l( void AudioFlinger::PlaybackThread::TimedTrack::updateFramesPendingAfterTrim_l( const TimedBuffer& buf, - const char* logTag) { + const char* logTag __unused) { uint32_t bufBytes = buf.buffer()->size(); uint32_t consumedAlready = buf.position(); @@ -1786,7 +1786,7 @@ AudioFlinger::RecordThread::RecordTrack::~RecordTrack() // AudioBufferProvider interface status_t AudioFlinger::RecordThread::RecordTrack::getNextBuffer(AudioBufferProvider::Buffer* buffer, - int64_t pts) + int64_t pts __unused) { ServerProxy::Buffer buf; buf.mFrameCount = buffer->frameCount; diff --git a/services/medialog/MediaLogService.cpp b/services/medialog/MediaLogService.cpp index 683fdf3..0c7fbbd 100644 --- a/services/medialog/MediaLogService.cpp +++ b/services/medialog/MediaLogService.cpp @@ -54,7 +54,7 @@ void MediaLogService::unregisterWriter(const sp& shared) } } -status_t MediaLogService::dump(int fd, const Vector& args) +status_t MediaLogService::dump(int fd, const Vector& args __unused) { // FIXME merge with similar but not identical code at services/audioflinger/ServiceUtilities.cpp static const String16 sDump("android.permission.DUMP"); -- cgit v1.1