diff options
| author | Steve Block <steveblock@google.com> | 2012-01-05 23:22:43 +0000 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2012-01-19 14:44:59 -0800 |
| commit | a51f0e707f1f3142358aa919ea60ad2842803139 (patch) | |
| tree | 3a4bea403affd07f7611fe13da8cbf64a61ee3e3 /media/jni | |
| parent | 933e85615059b85a87747da57288384541cc56da (diff) | |
| download | frameworks_base-a51f0e707f1f3142358aa919ea60ad2842803139.zip frameworks_base-a51f0e707f1f3142358aa919ea60ad2842803139.tar.gz frameworks_base-a51f0e707f1f3142358aa919ea60ad2842803139.tar.bz2 | |
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
Change-Id: I8fbdfa7a7581f481968dbb65aa40f7042936d7cb
Diffstat (limited to 'media/jni')
| -rw-r--r-- | media/jni/android_media_MediaPlayer.cpp | 2 | ||||
| -rw-r--r-- | media/jni/audioeffect/android_media_AudioEffect.cpp | 10 | ||||
| -rw-r--r-- | media/jni/audioeffect/android_media_Visualizer.cpp | 2 | ||||
| -rw-r--r-- | media/jni/soundpool/SoundPool.cpp | 4 | ||||
| -rw-r--r-- | media/jni/soundpool/SoundPoolThread.cpp | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/media/jni/android_media_MediaPlayer.cpp b/media/jni/android_media_MediaPlayer.cpp index 0272a03..39f470f 100644 --- a/media/jni/android_media_MediaPlayer.cpp +++ b/media/jni/android_media_MediaPlayer.cpp @@ -659,7 +659,7 @@ android_media_MediaPlayer_native_finalize(JNIEnv *env, jobject thiz) ALOGV("native_finalize"); sp<MediaPlayer> mp = getMediaPlayer(env, thiz); if (mp != NULL) { - LOGW("MediaPlayer finalized without being released"); + ALOGW("MediaPlayer finalized without being released"); } android_media_MediaPlayer_release(env, thiz); } diff --git a/media/jni/audioeffect/android_media_AudioEffect.cpp b/media/jni/audioeffect/android_media_AudioEffect.cpp index d517a58..0ce0277 100644 --- a/media/jni/audioeffect/android_media_AudioEffect.cpp +++ b/media/jni/audioeffect/android_media_AudioEffect.cpp @@ -112,14 +112,14 @@ static void effectCallback(int event, void* user, void *info) { callbackInfo->audioEffect_class); if (!user || !env) { - LOGW("effectCallback error user %p, env %p", user, env); + ALOGW("effectCallback error user %p, env %p", user, env); return; } switch (event) { case AudioEffect::EVENT_CONTROL_STATUS_CHANGED: if (info == 0) { - LOGW("EVENT_CONTROL_STATUS_CHANGED info == NULL"); + ALOGW("EVENT_CONTROL_STATUS_CHANGED info == NULL"); goto effectCallback_Exit; } param = *(bool *)info; @@ -128,7 +128,7 @@ static void effectCallback(int event, void* user, void *info) { break; case AudioEffect::EVENT_ENABLE_STATUS_CHANGED: if (info == 0) { - LOGW("EVENT_ENABLE_STATUS_CHANGED info == NULL"); + ALOGW("EVENT_ENABLE_STATUS_CHANGED info == NULL"); goto effectCallback_Exit; } param = *(bool *)info; @@ -137,7 +137,7 @@ static void effectCallback(int event, void* user, void *info) { break; case AudioEffect::EVENT_PARAMETER_CHANGED: if (info == 0) { - LOGW("EVENT_PARAMETER_CHANGED info == NULL"); + ALOGW("EVENT_PARAMETER_CHANGED info == NULL"); goto effectCallback_Exit; } p = (effect_param_t *)info; @@ -159,7 +159,7 @@ static void effectCallback(int event, void* user, void *info) { ALOGV("EVENT_PARAMETER_CHANGED"); break; case AudioEffect::EVENT_ERROR: - LOGW("EVENT_ERROR"); + ALOGW("EVENT_ERROR"); break; } diff --git a/media/jni/audioeffect/android_media_Visualizer.cpp b/media/jni/audioeffect/android_media_Visualizer.cpp index b64505c..53c90f3 100644 --- a/media/jni/audioeffect/android_media_Visualizer.cpp +++ b/media/jni/audioeffect/android_media_Visualizer.cpp @@ -113,7 +113,7 @@ static void captureCallback(void* user, callbackInfo->visualizer_class); if (!user || !env) { - LOGW("captureCallback error user %p, env %p", user, env); + ALOGW("captureCallback error user %p, env %p", user, env); return; } diff --git a/media/jni/soundpool/SoundPool.cpp b/media/jni/soundpool/SoundPool.cpp index 40db37f..ed63189 100644 --- a/media/jni/soundpool/SoundPool.cpp +++ b/media/jni/soundpool/SoundPool.cpp @@ -52,7 +52,7 @@ SoundPool::SoundPool(int maxChannels, int streamType, int srcQuality) else if (mMaxChannels > 32) { mMaxChannels = 32; } - LOGW_IF(maxChannels != mMaxChannels, "App requested %d channels", maxChannels); + ALOGW_IF(maxChannels != mMaxChannels, "App requested %d channels", maxChannels); mQuit = false; mDecodeThread = 0; @@ -255,7 +255,7 @@ int SoundPool::play(int sampleID, float leftVolume, float rightVolume, // is sample ready? sample = findSample(sampleID); if ((sample == 0) || (sample->state() != Sample::READY)) { - LOGW(" sample %d not READY", sampleID); + ALOGW(" sample %d not READY", sampleID); return 0; } diff --git a/media/jni/soundpool/SoundPoolThread.cpp b/media/jni/soundpool/SoundPoolThread.cpp index bbb56ff..ba3b482 100644 --- a/media/jni/soundpool/SoundPoolThread.cpp +++ b/media/jni/soundpool/SoundPoolThread.cpp @@ -91,7 +91,7 @@ int SoundPoolThread::run() { doLoadSample(msg.mData); break; default: - LOGW("run: Unrecognized message %d\n", + ALOGW("run: Unrecognized message %d\n", msg.mMessageType); break; } |