diff options
Diffstat (limited to 'media/jni')
-rw-r--r-- | media/jni/soundpool/Android.mk | 2 | ||||
-rw-r--r-- | media/jni/soundpool/android_media_SoundPool_SoundPoolImpl.cpp (renamed from media/jni/soundpool/android_media_SoundPool.cpp) | 96 |
2 files changed, 49 insertions, 49 deletions
diff --git a/media/jni/soundpool/Android.mk b/media/jni/soundpool/Android.mk index 5835b9f..ed8d7c1 100644 --- a/media/jni/soundpool/Android.mk +++ b/media/jni/soundpool/Android.mk @@ -2,7 +2,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_SRC_FILES:= \ - android_media_SoundPool.cpp + android_media_SoundPool_SoundPoolImpl.cpp LOCAL_SHARED_LIBRARIES := \ liblog \ diff --git a/media/jni/soundpool/android_media_SoundPool.cpp b/media/jni/soundpool/android_media_SoundPool_SoundPoolImpl.cpp index 9658856..2604850 100644 --- a/media/jni/soundpool/android_media_SoundPool.cpp +++ b/media/jni/soundpool/android_media_SoundPool_SoundPoolImpl.cpp @@ -39,9 +39,9 @@ static inline SoundPool* MusterSoundPool(JNIEnv *env, jobject thiz) { // ---------------------------------------------------------------------------- static int -android_media_SoundPool_load_URL(JNIEnv *env, jobject thiz, jstring path, jint priority) +android_media_SoundPool_SoundPoolImpl_load_URL(JNIEnv *env, jobject thiz, jstring path, jint priority) { - ALOGV("android_media_SoundPool_load_URL"); + ALOGV("android_media_SoundPool_SoundPoolImpl_load_URL"); SoundPool *ap = MusterSoundPool(env, thiz); if (path == NULL) { jniThrowException(env, "java/lang/IllegalArgumentException", NULL); @@ -54,10 +54,10 @@ android_media_SoundPool_load_URL(JNIEnv *env, jobject thiz, jstring path, jint p } static int -android_media_SoundPool_load_FD(JNIEnv *env, jobject thiz, jobject fileDescriptor, +android_media_SoundPool_SoundPoolImpl_load_FD(JNIEnv *env, jobject thiz, jobject fileDescriptor, jlong offset, jlong length, jint priority) { - ALOGV("android_media_SoundPool_load_FD"); + ALOGV("android_media_SoundPool_SoundPoolImpl_load_FD"); SoundPool *ap = MusterSoundPool(env, thiz); if (ap == NULL) return 0; return ap->load(jniGetFDFromFileDescriptor(env, fileDescriptor), @@ -65,104 +65,104 @@ android_media_SoundPool_load_FD(JNIEnv *env, jobject thiz, jobject fileDescripto } static bool -android_media_SoundPool_unload(JNIEnv *env, jobject thiz, jint sampleID) { - ALOGV("android_media_SoundPool_unload\n"); +android_media_SoundPool_SoundPoolImpl_unload(JNIEnv *env, jobject thiz, jint sampleID) { + ALOGV("android_media_SoundPool_SoundPoolImpl_unload\n"); SoundPool *ap = MusterSoundPool(env, thiz); if (ap == NULL) return 0; return ap->unload(sampleID); } static int -android_media_SoundPool_play(JNIEnv *env, jobject thiz, jint sampleID, +android_media_SoundPool_SoundPoolImpl_play(JNIEnv *env, jobject thiz, jint sampleID, jfloat leftVolume, jfloat rightVolume, jint priority, jint loop, jfloat rate) { - ALOGV("android_media_SoundPool_play\n"); + ALOGV("android_media_SoundPool_SoundPoolImpl_play\n"); SoundPool *ap = MusterSoundPool(env, thiz); if (ap == NULL) return 0; return ap->play(sampleID, leftVolume, rightVolume, priority, loop, rate); } static void -android_media_SoundPool_pause(JNIEnv *env, jobject thiz, jint channelID) +android_media_SoundPool_SoundPoolImpl_pause(JNIEnv *env, jobject thiz, jint channelID) { - ALOGV("android_media_SoundPool_pause"); + ALOGV("android_media_SoundPool_SoundPoolImpl_pause"); SoundPool *ap = MusterSoundPool(env, thiz); if (ap == NULL) return; ap->pause(channelID); } static void -android_media_SoundPool_resume(JNIEnv *env, jobject thiz, jint channelID) +android_media_SoundPool_SoundPoolImpl_resume(JNIEnv *env, jobject thiz, jint channelID) { - ALOGV("android_media_SoundPool_resume"); + ALOGV("android_media_SoundPool_SoundPoolImpl_resume"); SoundPool *ap = MusterSoundPool(env, thiz); if (ap == NULL) return; ap->resume(channelID); } static void -android_media_SoundPool_autoPause(JNIEnv *env, jobject thiz) +android_media_SoundPool_SoundPoolImpl_autoPause(JNIEnv *env, jobject thiz) { - ALOGV("android_media_SoundPool_autoPause"); + ALOGV("android_media_SoundPool_SoundPoolImpl_autoPause"); SoundPool *ap = MusterSoundPool(env, thiz); if (ap == NULL) return; ap->autoPause(); } static void -android_media_SoundPool_autoResume(JNIEnv *env, jobject thiz) +android_media_SoundPool_SoundPoolImpl_autoResume(JNIEnv *env, jobject thiz) { - ALOGV("android_media_SoundPool_autoResume"); + ALOGV("android_media_SoundPool_SoundPoolImpl_autoResume"); SoundPool *ap = MusterSoundPool(env, thiz); if (ap == NULL) return; ap->autoResume(); } static void -android_media_SoundPool_stop(JNIEnv *env, jobject thiz, jint channelID) +android_media_SoundPool_SoundPoolImpl_stop(JNIEnv *env, jobject thiz, jint channelID) { - ALOGV("android_media_SoundPool_stop"); + ALOGV("android_media_SoundPool_SoundPoolImpl_stop"); SoundPool *ap = MusterSoundPool(env, thiz); if (ap == NULL) return; ap->stop(channelID); } static void -android_media_SoundPool_setVolume(JNIEnv *env, jobject thiz, jint channelID, +android_media_SoundPool_SoundPoolImpl_setVolume(JNIEnv *env, jobject thiz, jint channelID, float leftVolume, float rightVolume) { - ALOGV("android_media_SoundPool_setVolume"); + ALOGV("android_media_SoundPool_SoundPoolImpl_setVolume"); SoundPool *ap = MusterSoundPool(env, thiz); if (ap == NULL) return; ap->setVolume(channelID, leftVolume, rightVolume); } static void -android_media_SoundPool_setPriority(JNIEnv *env, jobject thiz, jint channelID, +android_media_SoundPool_SoundPoolImpl_setPriority(JNIEnv *env, jobject thiz, jint channelID, int priority) { - ALOGV("android_media_SoundPool_setPriority"); + ALOGV("android_media_SoundPool_SoundPoolImpl_setPriority"); SoundPool *ap = MusterSoundPool(env, thiz); if (ap == NULL) return; ap->setPriority(channelID, priority); } static void -android_media_SoundPool_setLoop(JNIEnv *env, jobject thiz, jint channelID, +android_media_SoundPool_SoundPoolImpl_setLoop(JNIEnv *env, jobject thiz, jint channelID, int loop) { - ALOGV("android_media_SoundPool_setLoop"); + ALOGV("android_media_SoundPool_SoundPoolImpl_setLoop"); SoundPool *ap = MusterSoundPool(env, thiz); if (ap == NULL) return; ap->setLoop(channelID, loop); } static void -android_media_SoundPool_setRate(JNIEnv *env, jobject thiz, jint channelID, +android_media_SoundPool_SoundPoolImpl_setRate(JNIEnv *env, jobject thiz, jint channelID, float rate) { - ALOGV("android_media_SoundPool_setRate"); + ALOGV("android_media_SoundPool_SoundPoolImpl_setRate"); SoundPool *ap = MusterSoundPool(env, thiz); if (ap == NULL) return; ap->setRate(channelID, rate); @@ -176,9 +176,9 @@ static void android_media_callback(SoundPoolEvent event, SoundPool* soundPool, v } static jint -android_media_SoundPool_native_setup(JNIEnv *env, jobject thiz, jobject weakRef, jint maxChannels, jint streamType, jint srcQuality) +android_media_SoundPool_SoundPoolImpl_native_setup(JNIEnv *env, jobject thiz, jobject weakRef, jint maxChannels, jint streamType, jint srcQuality) { - ALOGV("android_media_SoundPool_native_setup"); + ALOGV("android_media_SoundPool_SoundPoolImpl_native_setup"); SoundPool *ap = new SoundPool(maxChannels, (audio_stream_type_t) streamType, srcQuality); if (ap == NULL) { return -1; @@ -194,9 +194,9 @@ android_media_SoundPool_native_setup(JNIEnv *env, jobject thiz, jobject weakRef, } static void -android_media_SoundPool_release(JNIEnv *env, jobject thiz) +android_media_SoundPool_SoundPoolImpl_release(JNIEnv *env, jobject thiz) { - ALOGV("android_media_SoundPool_release"); + ALOGV("android_media_SoundPool_SoundPoolImpl_release"); SoundPool *ap = MusterSoundPool(env, thiz); if (ap != NULL) { @@ -219,67 +219,67 @@ android_media_SoundPool_release(JNIEnv *env, jobject thiz) static JNINativeMethod gMethods[] = { { "_load", "(Ljava/lang/String;I)I", - (void *)android_media_SoundPool_load_URL + (void *)android_media_SoundPool_SoundPoolImpl_load_URL }, { "_load", "(Ljava/io/FileDescriptor;JJI)I", - (void *)android_media_SoundPool_load_FD + (void *)android_media_SoundPool_SoundPoolImpl_load_FD }, { "unload", "(I)Z", - (void *)android_media_SoundPool_unload + (void *)android_media_SoundPool_SoundPoolImpl_unload }, { "play", "(IFFIIF)I", - (void *)android_media_SoundPool_play + (void *)android_media_SoundPool_SoundPoolImpl_play }, { "pause", "(I)V", - (void *)android_media_SoundPool_pause + (void *)android_media_SoundPool_SoundPoolImpl_pause }, { "resume", "(I)V", - (void *)android_media_SoundPool_resume + (void *)android_media_SoundPool_SoundPoolImpl_resume }, { "autoPause", "()V", - (void *)android_media_SoundPool_autoPause + (void *)android_media_SoundPool_SoundPoolImpl_autoPause }, { "autoResume", "()V", - (void *)android_media_SoundPool_autoResume + (void *)android_media_SoundPool_SoundPoolImpl_autoResume }, { "stop", "(I)V", - (void *)android_media_SoundPool_stop + (void *)android_media_SoundPool_SoundPoolImpl_stop }, { "setVolume", "(IFF)V", - (void *)android_media_SoundPool_setVolume + (void *)android_media_SoundPool_SoundPoolImpl_setVolume }, { "setPriority", "(II)V", - (void *)android_media_SoundPool_setPriority + (void *)android_media_SoundPool_SoundPoolImpl_setPriority }, { "setLoop", "(II)V", - (void *)android_media_SoundPool_setLoop + (void *)android_media_SoundPool_SoundPoolImpl_setLoop }, { "setRate", "(IF)V", - (void *)android_media_SoundPool_setRate + (void *)android_media_SoundPool_SoundPoolImpl_setRate }, { "native_setup", "(Ljava/lang/Object;III)I", - (void*)android_media_SoundPool_native_setup + (void*)android_media_SoundPool_SoundPoolImpl_native_setup }, { "release", "()V", - (void*)android_media_SoundPool_release + (void*)android_media_SoundPool_SoundPoolImpl_release } }; -static const char* const kClassPathName = "android/media/SoundPool"; +static const char* const kClassPathName = "android/media/SoundPool$SoundPoolImpl"; jint JNI_OnLoad(JavaVM* vm, void* reserved) { @@ -301,14 +301,14 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved) fields.mNativeContext = env->GetFieldID(clazz, "mNativeContext", "I"); if (fields.mNativeContext == NULL) { - ALOGE("Can't find SoundPool.mNativeContext"); + ALOGE("Can't find SoundPoolImpl.mNativeContext"); goto bail; } fields.mPostEvent = env->GetStaticMethodID(clazz, "postEventFromNative", "(Ljava/lang/Object;IIILjava/lang/Object;)V"); if (fields.mPostEvent == NULL) { - ALOGE("Can't find android/media/SoundPool.postEventFromNative"); + ALOGE("Can't find android/media/SoundPoolImpl.postEventFromNative"); goto bail; } |