diff options
| author | 2012-04-18 15:04:05 -0700 | |
|---|---|---|
| committer | 2012-04-18 15:04:05 -0700 | |
| commit | 3d6f95fac94ab1e30ac97c6776f05a67965b15bd (patch) | |
| tree | 596aebfdca66d70daea9e087c0fc24b40899ce12 | |
| parent | f01d3dd710e8b86b3e2846af62835158fd4e0db1 (diff) | |
| parent | 10536b657d306416dfec738c6538a1afcb7e078e (diff) | |
Merge "rename audio policy flags"
| -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 9fbc477a86fe..a46714e9b8bc 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, - AUDIO_POLICY_OUTPUT_FLAG_NONE, + AUDIO_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, - AUDIO_POLICY_OUTPUT_FLAG_NONE, + AUDIO_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 |