commit e7b790f1f77a0950c163fc82d8833072ccf6f3c5
author Jean-Michel Trivi <jmtrivi@google.com> Fri Jul 09 12:30:28 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 09 12:30:28 2010 -0700
tree a88cd0562f5233bf77ee7b369a1d02d600487f7f
parent 6bb14e08da82e72197f35548ff77a2f817c52a58
parent 4cb15cf15dfc9d9c6c8dc34911a4ed6bf53e8e4c

Merge "Fix swap of sessionId and output in audio effect API." into gingerbread

media/jni/audioeffect/android_media_AudioEffect.cpp

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 @@
                                     priority,
                                     effectCallback,
                                     &lpJniStorage->mCallbackData,
-                                    0,
-                                    sessionId);
+                                    sessionId,
+                                    0);
     if (lpAudioEffect == NULL) {
         LOGE("Error creating AudioEffect");
         goto setup_failure;

media/libmedia/AudioEffect.cpp

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 @@
                 )
     : 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 @@
         }
     }
 
-    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,