From 20b14df3ee6f2addbc5fed71dde71ed5c1ebce3e Mon Sep 17 00:00:00 2001 From: Seungbae Shin Date: Thu, 22 Jun 2017 22:40:37 +0900 Subject: [PATCH] Fix build error due to -Wformat [Version] 0.3.77 [Profile] Common [Issue Type] Enhancement Change-Id: I5b5b9dd123eeeb5445b108063ddb158e0597a1d5 --- src/cpp/CAudioIO.cpp | 6 +++++- src/cpp/CAudioInfo.cpp | 6 +++--- src/cpp/CAudioInput.cpp | 4 ++-- src/cpp/CAudioOutput.cpp | 4 ++-- src/cpp/CAudioSessionHandler.cpp | 14 +++++++++----- src/cpp/CPulseAudioClient.cpp | 7 ++++--- src/cpp/CPulseStreamSpec.cpp | 4 ++-- 7 files changed, 27 insertions(+), 18 deletions(-) diff --git a/src/cpp/CAudioIO.cpp b/src/cpp/CAudioIO.cpp index d669e3a..931bae5 100644 --- a/src/cpp/CAudioIO.cpp +++ b/src/cpp/CAudioIO.cpp @@ -191,7 +191,11 @@ void CAudioIO::onStateChanged(CAudioInfo::EAudioIOState state, bool byPolicy) { const char* state_string[] = { "NONE", "IDLE", "RUNNING", "PAUSED" }; AUDIO_IO_LOGD("previous(%s,%d) ===> current(%s,%d), by_policy(%d)", - state_string[(int)mStatePrev], mStatePrev, state_string[(int)mState], mState, mByPolicy); + state_string[static_cast(mStatePrev)], + static_cast(mStatePrev), + state_string[static_cast(mState)], + static_cast(mState), + mByPolicy); if (mStateChangedCallback.onStateChanged != NULL) { mStateChangedCallback.onStateChanged(mState, mStatePrev, mByPolicy, mStateChangedCallback.mUserData); diff --git a/src/cpp/CAudioInfo.cpp b/src/cpp/CAudioInfo.cpp index 3429c7e..39e29dc 100644 --- a/src/cpp/CAudioInfo.cpp +++ b/src/cpp/CAudioInfo.cpp @@ -100,7 +100,7 @@ int CAudioInfo::getSampleSize() { bytes_in_sample = 2; break; default: - AUDIO_IO_LOGW("As unrecognized sample type %d, let's assume S16_LE", __mSampleType); + AUDIO_IO_LOGW("As unrecognized sample type %d, let's assume S16_LE", static_cast(__mSampleType)); bytes_in_sample = 2; break; } @@ -113,7 +113,7 @@ int CAudioInfo::getSampleSize() { number_of_channel = 2; break; default: - AUDIO_IO_LOGW("As unrecognized channel %d, let's assume STEREO", __mChannel); + AUDIO_IO_LOGW("As unrecognized channel %d, let's assume STEREO", static_cast(__mChannel)); number_of_channel = 2; break; } @@ -124,7 +124,7 @@ int CAudioInfo::getSampleSize() { void CAudioInfo::convertAudioType2StreamType(CAudioInfo::EAudioType audioType, char **streamType) { if (audioType < CAudioInfo::EAudioType::AUDIO_IN_TYPE_MEDIA || audioType >= CAudioInfo::EAudioType::AUDIO_TYPE_MAX) { THROW_ERROR_MSG_FORMAT(CAudioError::EError::ERROR_NOT_SUPPORTED_TYPE, - "The audioType is not supported [audioType:%u]", to_integral(audioType)); + "The audioType is not supported [audioType:%u]", to_integral(audioType)); } *streamType = (char *)__STREAM_TYPE_TABLE[(unsigned int)audioType]; return; diff --git a/src/cpp/CAudioInput.cpp b/src/cpp/CAudioInput.cpp index 2ca4d0a..8b64493 100644 --- a/src/cpp/CAudioInput.cpp +++ b/src/cpp/CAudioInput.cpp @@ -80,14 +80,14 @@ void CAudioInput::onStream(CPulseAudioClient* pClient, size_t length) { void CAudioInput::onInterrupt(CAudioSessionHandler* pHandler, int id, mm_sound_focus_type_e focus_type, mm_sound_focus_state_e state, const char *reason_for_change, const char *additional_info) { assert(pHandler); - AUDIO_IO_LOGD("[pHandler:0x%x], [focus_type:%d], [state:%d], [reason_for_change:%s], [additional_info:%s]", + AUDIO_IO_LOGD("[pHandler:%p], [focus_type:%d], [state:%d], [reason_for_change:%s], [additional_info:%s]", pHandler, focus_type, state, reason_for_change, additional_info); CAudioIO::onInterrupt(pHandler, id, focus_type, state, reason_for_change, additional_info); } void CAudioInput::onSignal(CAudioSessionHandler* pHandler, mm_sound_signal_name_t signal, int value) { assert(pHandler); - AUDIO_IO_LOGD("[pHandler:0x%x], [signal:%d], [value:%d]", pHandler, signal, value); + AUDIO_IO_LOGD("[pHandler:%p], [signal:%d], [value:%d]", pHandler, signal, value); CAudioIO::onSignal(pHandler, signal, value); } diff --git a/src/cpp/CAudioOutput.cpp b/src/cpp/CAudioOutput.cpp index 2e5db0e..df64c48 100644 --- a/src/cpp/CAudioOutput.cpp +++ b/src/cpp/CAudioOutput.cpp @@ -72,14 +72,14 @@ void CAudioOutput::onStream(CPulseAudioClient* pClient, size_t length) { void CAudioOutput::onInterrupt(CAudioSessionHandler* pHandler, int id, mm_sound_focus_type_e focus_type, mm_sound_focus_state_e state, const char *reason_for_change, const char *additional_info) { assert(pHandler); - AUDIO_IO_LOGD("[pHandler:0x%x], [focus_type:%d], [state:%d], [reason_for_change:%s], [additional_info:%s]", + AUDIO_IO_LOGD("[pHandler:%p], [focus_type:%d], [state:%d], [reason_for_change:%s], [additional_info:%s]", pHandler, focus_type, state, reason_for_change, additional_info); CAudioIO::onInterrupt(pHandler, id, focus_type, state, reason_for_change, additional_info); } void CAudioOutput::onSignal(CAudioSessionHandler* pHandler, mm_sound_signal_name_t signal, int value) { assert(pHandler); - AUDIO_IO_LOGD("[pHandler:0x%x], [signal:%d], [value:%d]", pHandler, signal, value); + AUDIO_IO_LOGD("[pHandler:%p], [signal:%d], [value:%d]", pHandler, signal, value); CAudioIO::onSignal(pHandler, signal, value); } diff --git a/src/cpp/CAudioSessionHandler.cpp b/src/cpp/CAudioSessionHandler.cpp index 7091980..267a5ec 100644 --- a/src/cpp/CAudioSessionHandler.cpp +++ b/src/cpp/CAudioSessionHandler.cpp @@ -207,7 +207,7 @@ CAudioInfo CAudioSessionHandler::getAudioInfo() { void CAudioSessionHandler::__sound_pcm_signal_cb(mm_sound_signal_name_t signal, int value, void *user_data) { assert(user_data); - AUDIO_IO_LOGD("[signal:%d], [value:%d], [user_data:0x%x]", signal, value, user_data); + AUDIO_IO_LOGD("[signal:%d], [value:%d], [user_data:%p]", signal, value, user_data); CAudioSessionHandler* pHandler = static_cast(user_data); if (pHandler->__mpEventListener != NULL) @@ -307,10 +307,12 @@ bool CAudioSessionHandler::isSkipSession() { return false; } -void CAudioSessionHandler::__sound_pcm_focus_cb(int id, mm_sound_focus_type_e focus_type, mm_sound_focus_state_e state, const char *reason_for_change, int option, const char *additional_info, void *user_data) { +void CAudioSessionHandler::__sound_pcm_focus_cb(int id, mm_sound_focus_type_e focus_type, mm_sound_focus_state_e state, + const char *reason_for_change, int option, const char *additional_info, void *user_data) { assert(user_data); - AUDIO_IO_LOGD("[id:%d], [focus_type:%d], [state:%d], [reason_for_change:%s], [additional_info:%s], [user_data:0x%x]", id, focus_type, state, reason_for_change, additional_info, user_data); + AUDIO_IO_LOGD("[id:%d], [focus_type:%d], [state:%d], [reason_for_change:%s], [additional_info:%s], [user_data:%p]", + id, focus_type, state, reason_for_change, additional_info, user_data); /* FIXME: disable it temporarily */ #ifndef DISABLE_SESSION_BACK_COMP @@ -330,8 +332,10 @@ void CAudioSessionHandler::__sound_pcm_focus_cb(int id, mm_sound_focus_type_e fo return; } -void CAudioSessionHandler::__sound_pcm_focus_watch_cb(int id, mm_sound_focus_type_e focus_type, mm_sound_focus_state_e state, const char *reason_for_change, const char *additional_info, void *user_data) { - AUDIO_IO_LOGD("[id:%d], [focus_type:%d], [state:%d], [reason_for_change:%s], [additional_info:%s], [user_data:0x%x]", id, focus_type, state, reason_for_change, additional_info, user_data); +void CAudioSessionHandler::__sound_pcm_focus_watch_cb(int id, mm_sound_focus_type_e focus_type, mm_sound_focus_state_e state, + const char *reason_for_change, const char *additional_info, void *user_data) { + AUDIO_IO_LOGD("[id:%d], [focus_type:%d], [state:%d], [reason_for_change:%s], [additional_info:%s], [user_data:%p]", + id, focus_type, state, reason_for_change, additional_info, user_data); CAudioSessionHandler::__sound_pcm_focus_cb(-1, focus_type, state, reason_for_change, 0, additional_info, user_data); diff --git a/src/cpp/CPulseAudioClient.cpp b/src/cpp/CPulseAudioClient.cpp index c59de3d..4dd4a8c 100644 --- a/src/cpp/CPulseAudioClient.cpp +++ b/src/cpp/CPulseAudioClient.cpp @@ -18,6 +18,7 @@ #include #include "CAudioIODef.h" #include +#include #ifdef ENABLE_DPM #include #endif @@ -268,7 +269,7 @@ void CPulseAudioClient::initialize() throw(CAudioError) { } // Adds latency on proplist for delivery to PULSEAUDIO - AUDIO_IO_LOGD("LATENCY : %s[%d]", __mSpec.getStreamLatencyToString(), __mSpec.getStreamLatency()); + AUDIO_IO_LOGD("LATENCY : %s[%d]", __mSpec.getStreamLatencyToString(), static_cast(__mSpec.getStreamLatency())); pa_proplist_setf(__mpPropList, PA_PROP_MEDIA_TIZEN_AUDIO_LATENCY, "%s", __mSpec.getStreamLatencyToString()); // Allocates PA mainloop @@ -952,10 +953,10 @@ pa_usec_t CPulseAudioClient::getFinalLatency() throw(CAudioError) { if (__mDirection == EStreamDirection::STREAM_DIRECTION_PLAYBACK) { ret = (pa_bytes_to_usec(buffer_attr->tlength, sample_spec) + timing_info->configured_sink_usec); - AUDIO_IO_LOGD("FINAL PLAYBACK LATENCY[%d]", ret); + AUDIO_IO_LOGD("FINAL PLAYBACK LATENCY[%" PRIu64 "]", ret); } else { ret = (pa_bytes_to_usec(buffer_attr->fragsize, sample_spec) + timing_info->configured_source_usec); - AUDIO_IO_LOGD("FINAL RECORD LATENCY[%d]", ret); + AUDIO_IO_LOGD("FINAL RECORD LATENCY[%" PRIu64 "]", ret); } } else { THROW_ERROR_MSG_FORMAT(CAudioError::EError::ERROR_NOT_SUPPORTED, "This version(ver.%d) is not supported", ver); diff --git a/src/cpp/CPulseStreamSpec.cpp b/src/cpp/CPulseStreamSpec.cpp index 7ce3092..08a445d 100644 --- a/src/cpp/CPulseStreamSpec.cpp +++ b/src/cpp/CPulseStreamSpec.cpp @@ -138,7 +138,7 @@ void CPulseStreamSpec::__adjustSpec() throw(CAudioError) { break; default: - AUDIO_IO_LOGW("Invalid __mLatency[%d]", __mLatency); + AUDIO_IO_LOGW("Invalid __mLatency[%d]", static_cast(__mLatency)); break; } } @@ -177,7 +177,7 @@ const char* CPulseStreamSpec::getStreamLatencyToString() { break; default: - AUDIO_IO_LOGW("Invalid __mLatency[%d]", __mLatency); + AUDIO_IO_LOGW("Invalid __mLatency[%d]", static_cast(__mLatency)); latency = STREAM_LATENCY_DEFAULT; break; } -- 2.7.4