diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-03-09 16:02:08 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-09 16:02:08 -0800 |
| commit | dc4bb3fcae3b828a0d0ea82424b2b9e7cda40c5d (patch) | |
| tree | 02a71c918e56419add08a4f746700591cc238834 /core | |
| parent | 559c4841a631321efc2284de9187dbaccce50550 (diff) | |
| parent | 28b269f3418c27275bbf635e524ed501bfac6518 (diff) | |
| download | frameworks_base-dc4bb3fcae3b828a0d0ea82424b2b9e7cda40c5d.zip frameworks_base-dc4bb3fcae3b828a0d0ea82424b2b9e7cda40c5d.tar.gz frameworks_base-dc4bb3fcae3b828a0d0ea82424b2b9e7cda40c5d.tar.bz2 | |
Merge "Use audio_policy_output_flags_t consistently"
Diffstat (limited to 'core')
| -rw-r--r-- | core/jni/android_media_AudioTrack.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/jni/android_media_AudioTrack.cpp b/core/jni/android_media_AudioTrack.cpp index 26c9435..57f5d3d 100644 --- a/core/jni/android_media_AudioTrack.cpp +++ b/core/jni/android_media_AudioTrack.cpp @@ -279,7 +279,7 @@ android_media_AudioTrack_native_setup(JNIEnv *env, jobject thiz, jobject weak_th format,// word length, PCM nativeChannelMask, frameCount, - 0,// flags + AUDIO_POLICY_OUTPUT_FLAG_NONE, audioCallback, &(lpJniStorage->mCallbackData),//callback, callback data (user) 0,// notificationFrames == 0 since not using EVENT_MORE_DATA to feed the AudioTrack 0,// shared mem @@ -300,7 +300,7 @@ android_media_AudioTrack_native_setup(JNIEnv *env, jobject thiz, jobject weak_th format,// word length, PCM nativeChannelMask, frameCount, - 0,// flags + AUDIO_POLICY_OUTPUT_FLAG_NONE, audioCallback, &(lpJniStorage->mCallbackData),//callback, callback data (user)); 0,// notificationFrames == 0 since not using EVENT_MORE_DATA to feed the AudioTrack lpJniStorage->mMemBase,// shared mem |