diff options
author | Steve Block <steveblock@google.com> | 2012-01-06 19:20:56 +0000 |
---|---|---|
committer | Jean-Baptiste Queru <jbq@google.com> | 2012-01-19 14:45:03 -0800 |
commit | c6aacce37191e1cc79cfeba13b39899f59c68c3b (patch) | |
tree | df4401aaa38914e03d5eadc82507e7c6fdcc573e /media/jni/audioeffect | |
parent | a51f0e707f1f3142358aa919ea60ad2842803139 (diff) | |
download | frameworks_base-c6aacce37191e1cc79cfeba13b39899f59c68c3b.zip frameworks_base-c6aacce37191e1cc79cfeba13b39899f59c68c3b.tar.gz frameworks_base-c6aacce37191e1cc79cfeba13b39899f59c68c3b.tar.bz2 |
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
Change-Id: I1de629b4632a4b3187ca1a28d6416daccd35f924
Diffstat (limited to 'media/jni/audioeffect')
-rw-r--r-- | media/jni/audioeffect/android_media_AudioEffect.cpp | 48 | ||||
-rw-r--r-- | media/jni/audioeffect/android_media_Visualizer.cpp | 18 |
2 files changed, 33 insertions, 33 deletions
diff --git a/media/jni/audioeffect/android_media_AudioEffect.cpp b/media/jni/audioeffect/android_media_AudioEffect.cpp index 0ce0277..3b325b7 100644 --- a/media/jni/audioeffect/android_media_AudioEffect.cpp +++ b/media/jni/audioeffect/android_media_AudioEffect.cpp @@ -149,7 +149,7 @@ static void effectCallback(int event, void* user, void *info) { size = arg1 + p->vsize; array = env->NewByteArray(size); if (array == NULL) { - LOGE("effectCallback: Couldn't allocate byte array for parameter data"); + ALOGE("effectCallback: Couldn't allocate byte array for parameter data"); goto effectCallback_Exit; } bytes = env->GetByteArrayElements(array, NULL); @@ -195,7 +195,7 @@ android_media_AudioEffect_native_init(JNIEnv *env) // Get the AudioEffect class jclass clazz = env->FindClass(kClassPathName); if (clazz == NULL) { - LOGE("Can't find %s", kClassPathName); + ALOGE("Can't find %s", kClassPathName); return; } @@ -206,7 +206,7 @@ android_media_AudioEffect_native_init(JNIEnv *env) fields.clazzEffect, "postEventFromNative", "(Ljava/lang/Object;IIILjava/lang/Object;)V"); if (fields.midPostNativeEvent == NULL) { - LOGE("Can't find AudioEffect.%s", "postEventFromNative"); + ALOGE("Can't find AudioEffect.%s", "postEventFromNative"); return; } @@ -216,7 +216,7 @@ android_media_AudioEffect_native_init(JNIEnv *env) fields.clazzEffect, "mNativeAudioEffect", "I"); if (fields.fidNativeAudioEffect == NULL) { - LOGE("Can't find AudioEffect.%s", "mNativeAudioEffect"); + ALOGE("Can't find AudioEffect.%s", "mNativeAudioEffect"); return; } // fidJniData; @@ -224,13 +224,13 @@ android_media_AudioEffect_native_init(JNIEnv *env) fields.clazzEffect, "mJniData", "I"); if (fields.fidJniData == NULL) { - LOGE("Can't find AudioEffect.%s", "mJniData"); + ALOGE("Can't find AudioEffect.%s", "mJniData"); return; } clazz = env->FindClass("android/media/audiofx/AudioEffect$Descriptor"); if (clazz == NULL) { - LOGE("Can't find android/media/audiofx/AudioEffect$Descriptor class"); + ALOGE("Can't find android/media/audiofx/AudioEffect$Descriptor class"); return; } fields.clazzDesc = (jclass)env->NewGlobalRef(clazz); @@ -241,7 +241,7 @@ android_media_AudioEffect_native_init(JNIEnv *env) "<init>", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V"); if (fields.midDescCstor == NULL) { - LOGE("Can't find android/media/audiofx/AudioEffect$Descriptor class constructor"); + ALOGE("Can't find android/media/audiofx/AudioEffect$Descriptor class constructor"); return; } } @@ -290,7 +290,7 @@ android_media_AudioEffect_native_setup(JNIEnv *env, jobject thiz, jobject weak_t lpJniStorage = new AudioEffectJniStorage(); if (lpJniStorage == NULL) { - LOGE("setup: Error creating JNI Storage"); + ALOGE("setup: Error creating JNI Storage"); goto setup_failure; } @@ -305,7 +305,7 @@ android_media_AudioEffect_native_setup(JNIEnv *env, jobject thiz, jobject weak_t &lpJniStorage->mCallbackData); if (jId == NULL) { - LOGE("setup: NULL java array for id pointer"); + ALOGE("setup: NULL java array for id pointer"); lStatus = AUDIOEFFECT_ERROR_BAD_VALUE; goto setup_failure; } @@ -319,19 +319,19 @@ android_media_AudioEffect_native_setup(JNIEnv *env, jobject thiz, jobject weak_t sessionId, 0); if (lpAudioEffect == NULL) { - LOGE("Error creating AudioEffect"); + ALOGE("Error creating AudioEffect"); goto setup_failure; } lStatus = translateError(lpAudioEffect->initCheck()); if (lStatus != AUDIOEFFECT_SUCCESS && lStatus != AUDIOEFFECT_ERROR_ALREADY_EXISTS) { - LOGE("AudioEffect initCheck failed %d", lStatus); + ALOGE("AudioEffect initCheck failed %d", lStatus); goto setup_failure; } nId = (jint *) env->GetPrimitiveArrayCritical(jId, NULL); if (nId == NULL) { - LOGE("setup: Error retrieving id pointer"); + ALOGE("setup: Error retrieving id pointer"); lStatus = AUDIOEFFECT_ERROR_BAD_VALUE; goto setup_failure; } @@ -382,7 +382,7 @@ android_media_AudioEffect_native_setup(JNIEnv *env, jobject thiz, jobject weak_t env->DeleteLocalRef(jdescName); env->DeleteLocalRef(jdescImplementor); if (jdesc == NULL) { - LOGE("env->NewObject(fields.clazzDesc, fields.midDescCstor)"); + ALOGE("env->NewObject(fields.clazzDesc, fields.midDescCstor)"); goto setup_failure; } @@ -534,14 +534,14 @@ static jint android_media_AudioEffect_native_setParameter(JNIEnv *env, // get the pointer for the param from the java array lpParam = (jbyte *) env->GetPrimitiveArrayCritical(pJavaParam, NULL); if (lpParam == NULL) { - LOGE("setParameter: Error retrieving param pointer"); + ALOGE("setParameter: Error retrieving param pointer"); goto setParameter_Exit; } // get the pointer for the value from the java array lpValue = (jbyte *) env->GetPrimitiveArrayCritical(pJavaValue, NULL); if (lpValue == NULL) { - LOGE("setParameter: Error retrieving value pointer"); + ALOGE("setParameter: Error retrieving value pointer"); goto setParameter_Exit; } @@ -597,14 +597,14 @@ android_media_AudioEffect_native_getParameter(JNIEnv *env, // get the pointer for the param from the java array lpParam = (jbyte *) env->GetPrimitiveArrayCritical(pJavaParam, NULL); if (lpParam == NULL) { - LOGE("getParameter: Error retrieving param pointer"); + ALOGE("getParameter: Error retrieving param pointer"); goto getParameter_Exit; } // get the pointer for the value from the java array lpValue = (jbyte *) env->GetPrimitiveArrayCritical(pJavaValue, NULL); if (lpValue == NULL) { - LOGE("getParameter: Error retrieving value pointer"); + ALOGE("getParameter: Error retrieving value pointer"); goto getParameter_Exit; } @@ -665,7 +665,7 @@ static jint android_media_AudioEffect_native_command(JNIEnv *env, jobject thiz, if (cmdSize != 0) { pCmdData = (jbyte *) env->GetPrimitiveArrayCritical(jCmdData, NULL); if (pCmdData == NULL) { - LOGE("setParameter: Error retrieving command pointer"); + ALOGE("setParameter: Error retrieving command pointer"); goto command_Exit; } } @@ -674,7 +674,7 @@ static jint android_media_AudioEffect_native_command(JNIEnv *env, jobject thiz, if (replySize != 0 && jReplyData != NULL) { pReplyData = (jbyte *) env->GetPrimitiveArrayCritical(jReplyData, NULL); if (pReplyData == NULL) { - LOGE("setParameter: Error retrieving reply pointer"); + ALOGE("setParameter: Error retrieving reply pointer"); goto command_Exit; } } @@ -759,7 +759,7 @@ android_media_AudioEffect_native_queryEffects(JNIEnv *env, jclass clazz) env->DeleteLocalRef(jdescName); env->DeleteLocalRef(jdescImplementor); if (jdesc == NULL) { - LOGE("env->NewObject(fields.clazzDesc, fields.midDescCstor)"); + ALOGE("env->NewObject(fields.clazzDesc, fields.midDescCstor)"); goto queryEffects_failure; } @@ -847,7 +847,7 @@ android_media_AudioEffect_native_queryPreProcessings(JNIEnv *env, jclass clazz, env->DeleteLocalRef(jdescName); env->DeleteLocalRef(jdescImplementor); if (jdesc == NULL) { - LOGE("env->NewObject(fields.clazzDesc, fields.midDescCstor)"); + ALOGE("env->NewObject(fields.clazzDesc, fields.midDescCstor)"); env->DeleteLocalRef(ret); return NULL;; } @@ -895,18 +895,18 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved) jint result = -1; if (vm->GetEnv((void**) &env, JNI_VERSION_1_4) != JNI_OK) { - LOGE("ERROR: GetEnv failed\n"); + ALOGE("ERROR: GetEnv failed\n"); goto bail; } assert(env != NULL); if (register_android_media_AudioEffect(env) < 0) { - LOGE("ERROR: AudioEffect native registration failed\n"); + ALOGE("ERROR: AudioEffect native registration failed\n"); goto bail; } if (register_android_media_visualizer(env) < 0) { - LOGE("ERROR: Visualizer native registration failed\n"); + ALOGE("ERROR: Visualizer native registration failed\n"); goto bail; } diff --git a/media/jni/audioeffect/android_media_Visualizer.cpp b/media/jni/audioeffect/android_media_Visualizer.cpp index 53c90f3..ecd4d07 100644 --- a/media/jni/audioeffect/android_media_Visualizer.cpp +++ b/media/jni/audioeffect/android_media_Visualizer.cpp @@ -185,7 +185,7 @@ android_media_visualizer_native_init(JNIEnv *env) // Get the Visualizer class jclass clazz = env->FindClass(kClassPathName); if (clazz == NULL) { - LOGE("Can't find %s", kClassPathName); + ALOGE("Can't find %s", kClassPathName); return; } @@ -196,7 +196,7 @@ android_media_visualizer_native_init(JNIEnv *env) fields.clazzEffect, "postEventFromNative", "(Ljava/lang/Object;IIILjava/lang/Object;)V"); if (fields.midPostNativeEvent == NULL) { - LOGE("Can't find Visualizer.%s", "postEventFromNative"); + ALOGE("Can't find Visualizer.%s", "postEventFromNative"); return; } @@ -206,7 +206,7 @@ android_media_visualizer_native_init(JNIEnv *env) fields.clazzEffect, "mNativeVisualizer", "I"); if (fields.fidNativeVisualizer == NULL) { - LOGE("Can't find Visualizer.%s", "mNativeVisualizer"); + ALOGE("Can't find Visualizer.%s", "mNativeVisualizer"); return; } // fidJniData; @@ -214,7 +214,7 @@ android_media_visualizer_native_init(JNIEnv *env) fields.clazzEffect, "mJniData", "I"); if (fields.fidJniData == NULL) { - LOGE("Can't find Visualizer.%s", "mJniData"); + ALOGE("Can't find Visualizer.%s", "mJniData"); return; } @@ -233,7 +233,7 @@ android_media_visualizer_native_setup(JNIEnv *env, jobject thiz, jobject weak_th lpJniStorage = new visualizerJniStorage(); if (lpJniStorage == NULL) { - LOGE("setup: Error creating JNI Storage"); + ALOGE("setup: Error creating JNI Storage"); goto setup_failure; } @@ -248,7 +248,7 @@ android_media_visualizer_native_setup(JNIEnv *env, jobject thiz, jobject weak_th &lpJniStorage->mCallbackData); if (jId == NULL) { - LOGE("setup: NULL java array for id pointer"); + ALOGE("setup: NULL java array for id pointer"); lStatus = VISUALIZER_ERROR_BAD_VALUE; goto setup_failure; } @@ -259,19 +259,19 @@ android_media_visualizer_native_setup(JNIEnv *env, jobject thiz, jobject weak_th NULL, sessionId); if (lpVisualizer == NULL) { - LOGE("Error creating Visualizer"); + ALOGE("Error creating Visualizer"); goto setup_failure; } lStatus = translateError(lpVisualizer->initCheck()); if (lStatus != VISUALIZER_SUCCESS && lStatus != VISUALIZER_ERROR_ALREADY_EXISTS) { - LOGE("Visualizer initCheck failed %d", lStatus); + ALOGE("Visualizer initCheck failed %d", lStatus); goto setup_failure; } nId = (jint *) env->GetPrimitiveArrayCritical(jId, NULL); if (nId == NULL) { - LOGE("setup: Error retrieving id pointer"); + ALOGE("setup: Error retrieving id pointer"); lStatus = VISUALIZER_ERROR_BAD_VALUE; goto setup_failure; } |