diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2010-07-09 12:32:21 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-09 12:32:21 -0700 |
| commit | b2761bde67a46a0375e6b606f3ece1af83834e43 (patch) | |
| tree | c6827543787e5f293827bfd8b1ded21ce8756057 | |
| parent | 0a8358c171306cbe2f67339ee75eee80ab59a439 (diff) | |
| parent | a480a6f7f204fa1712e1484a6ba9e6c8772fa110 (diff) | |
| download | frameworks_av-b2761bde67a46a0375e6b606f3ece1af83834e43.zip frameworks_av-b2761bde67a46a0375e6b606f3ece1af83834e43.tar.gz frameworks_av-b2761bde67a46a0375e6b606f3ece1af83834e43.tar.bz2 | |
am e7b790f1: Merge "Fix swap of sessionId and output in audio effect API." into gingerbread
Merge commit 'e7b790f1f77a0950c163fc82d8833072ccf6f3c5' into gingerbread-plus-aosp
* commit 'e7b790f1f77a0950c163fc82d8833072ccf6f3c5':
Fix swap of sessionId and output in audio effect API.
| -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, |