diff options
| author | Eric Laurent <elaurent@google.com> | 2010-07-28 07:53:24 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-28 07:53:24 -0700 |
| commit | ba2709583d9b759ca7b2aad05dcbeeb2a6c4083e (patch) | |
| tree | 0e85650de31c297f352bee2643435266bc64dcd7 /media/jni | |
| parent | d8aad91d8cdc64e00eec94a87b8dd3cc4d05c032 (diff) | |
| parent | 6fa8888254deb4961dc64c6ac03dc103c9cd8bcf (diff) | |
| download | frameworks_base-ba2709583d9b759ca7b2aad05dcbeeb2a6c4083e.zip frameworks_base-ba2709583d9b759ca7b2aad05dcbeeb2a6c4083e.tar.gz frameworks_base-ba2709583d9b759ca7b2aad05dcbeeb2a6c4083e.tar.bz2 | |
am 6fa88882: am 62d83a0c: Merge "Audio effects: modified command() parameter types." into gingerbread
Merge commit '6fa8888254deb4961dc64c6ac03dc103c9cd8bcf'
* commit '6fa8888254deb4961dc64c6ac03dc103c9cd8bcf':
Audio effects: modified command() parameter types.
Diffstat (limited to 'media/jni')
| -rw-r--r-- | media/jni/audioeffect/android_media_AudioEffect.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/media/jni/audioeffect/android_media_AudioEffect.cpp b/media/jni/audioeffect/android_media_AudioEffect.cpp index e3b9e36..8d9f4fe 100644 --- a/media/jni/audioeffect/android_media_AudioEffect.cpp +++ b/media/jni/audioeffect/android_media_AudioEffect.cpp @@ -698,8 +698,11 @@ static jint android_media_AudioEffect_native_command(JNIEnv *env, jobject thiz, } } - lStatus = translateError(lpAudioEffect->command(cmdCode, cmdSize, pCmdData, - pReplySize, pReplyData)); + lStatus = translateError(lpAudioEffect->command((uint32_t)cmdCode, + (uint32_t)cmdSize, + pCmdData, + (uint32_t *)pReplySize, + pReplyData)); command_Exit: |