From 4cb15cf15dfc9d9c6c8dc34911a4ed6bf53e8e4c Mon Sep 17 00:00:00 2001 From: Jean-Michel Trivi Date: Fri, 9 Jul 2010 12:11:49 -0700 Subject: Fix swap of sessionId and output in audio effect API. Change-Id: Idc93415efef92087507401e50cfb235a6f1f7ed7 --- media/jni/audioeffect/android_media_AudioEffect.cpp | 4 ++-- media/libmedia/AudioEffect.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'media') diff --git a/media/jni/audioeffect/android_media_AudioEffect.cpp b/media/jni/audioeffect/android_media_AudioEffect.cpp index 02474a490829..beb3dfc5f3bc 100644 --- a/media/jni/audioeffect/android_media_AudioEffect.cpp +++ b/media/jni/audioeffect/android_media_AudioEffect.cpp @@ -323,8 +323,8 @@ android_media_AudioEffect_native_setup(JNIEnv *env, jobject thiz, jobject weak_t priority, effectCallback, &lpJniStorage->mCallbackData, - 0, - sessionId); + sessionId, + 0); if (lpAudioEffect == NULL) { LOGE("Error creating AudioEffect"); goto setup_failure; diff --git a/media/libmedia/AudioEffect.cpp b/media/libmedia/AudioEffect.cpp index 783249d82a4e..df0f73bc87b2 100644 --- a/media/libmedia/AudioEffect.cpp +++ b/media/libmedia/AudioEffect.cpp @@ -52,7 +52,7 @@ AudioEffect::AudioEffect(const effect_uuid_t *type, ) : mStatus(NO_INIT) { - mStatus = set(type, uuid, priority, cbf, user, output, sessionId); + mStatus = set(type, uuid, priority, cbf, user, sessionId, output); } AudioEffect::AudioEffect(const char *typeStr, @@ -84,7 +84,7 @@ AudioEffect::AudioEffect(const char *typeStr, } } - mStatus = set(pType, pUuid, priority, cbf, user, output, sessionId); + mStatus = set(pType, pUuid, priority, cbf, user, sessionId, output); } status_t AudioEffect::set(const effect_uuid_t *type, -- cgit v1.2.3-59-g8ed1b