diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2010-07-09 12:30:28 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-07-09 12:30:28 -0700 |
| commit | e7b790f1f77a0950c163fc82d8833072ccf6f3c5 (patch) | |
| tree | a88cd0562f5233bf77ee7b369a1d02d600487f7f | |
| parent | 6bb14e08da82e72197f35548ff77a2f817c52a58 (diff) | |
| parent | 4cb15cf15dfc9d9c6c8dc34911a4ed6bf53e8e4c (diff) | |
| download | frameworks_base-e7b790f1f77a0950c163fc82d8833072ccf6f3c5.zip frameworks_base-e7b790f1f77a0950c163fc82d8833072ccf6f3c5.tar.gz frameworks_base-e7b790f1f77a0950c163fc82d8833072ccf6f3c5.tar.bz2 | |
Merge "Fix swap of sessionId and output in audio effect API." into gingerbread
| -rw-r--r-- | media/jni/audioeffect/android_media_AudioEffect.cpp | 4 | ||||
| -rw-r--r-- | media/libmedia/AudioEffect.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/media/jni/audioeffect/android_media_AudioEffect.cpp b/media/jni/audioeffect/android_media_AudioEffect.cpp index 02474a4..beb3dfc 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 783249d..df0f73b 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, |