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 | 66e6c1c85c33194b1a6fc5077bd78b53a5fe9d03 (patch) | |
| tree | 158c3288b8488031ef0803bd01c6cc998bd31fb6 /media/libmedia | |
| parent | 31e179a6f1c154f5b8c80c0fb9451703c6839c9c (diff) | |
| parent | b2761bde67a46a0375e6b606f3ece1af83834e43 (diff) | |
| download | frameworks_av-66e6c1c85c33194b1a6fc5077bd78b53a5fe9d03.zip frameworks_av-66e6c1c85c33194b1a6fc5077bd78b53a5fe9d03.tar.gz frameworks_av-66e6c1c85c33194b1a6fc5077bd78b53a5fe9d03.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, |