diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2010-07-09 12:34:03 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-09 12:34:03 -0700 |
| commit | 90787e053aa71694dbe61f4c64b2632446fd4c5d (patch) | |
| tree | 97e27239fd9228a66b90133df6d5088b83cf58ac /media/libmedia | |
| parent | 020057bd534a41080af8edbe6c6565d478ef256c (diff) | |
| parent | bd3f8b711643a172703537e34a0fa7c21c5b953f (diff) | |
| download | frameworks_base-90787e053aa71694dbe61f4c64b2632446fd4c5d.zip frameworks_base-90787e053aa71694dbe61f4c64b2632446fd4c5d.tar.gz frameworks_base-90787e053aa71694dbe61f4c64b2632446fd4c5d.tar.bz2 | |
am bd3f8b71: am e7b790f1: Merge "Fix swap of sessionId and output in audio effect API." into gingerbread
Merge commit 'bd3f8b711643a172703537e34a0fa7c21c5b953f'
* commit 'bd3f8b711643a172703537e34a0fa7c21c5b953f':
Fix swap of sessionId and output in audio effect API.
Diffstat (limited to 'media/libmedia')
| -rw-r--r-- | media/libmedia/AudioEffect.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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, |