diff options
| author | Glenn Kasten <gkasten@google.com> | 2011-06-01 15:20:35 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-01 15:20:35 -0700 |
| commit | e46a86fcb6a0849fc05c4cade6cb94aad0325295 (patch) | |
| tree | 6e56bb08bc09a3e73d1b7e6b0cab5d7d226d6463 /core/jni/android_media_AudioTrack.cpp | |
| parent | 2225e4b7049fa3fb9d39a068b8268b63c952d7c1 (diff) | |
| download | frameworks_base-e46a86fcb6a0849fc05c4cade6cb94aad0325295.zip frameworks_base-e46a86fcb6a0849fc05c4cade6cb94aad0325295.tar.gz frameworks_base-e46a86fcb6a0849fc05c4cade6cb94aad0325295.tar.bz2 | |
Revert "Use AudioTrack::event_type not int in callback"
This reverts commit 2225e4b7049fa3fb9d39a068b8268b63c952d7c1
Diffstat (limited to 'core/jni/android_media_AudioTrack.cpp')
| -rw-r--r-- | core/jni/android_media_AudioTrack.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/android_media_AudioTrack.cpp b/core/jni/android_media_AudioTrack.cpp index 59d9869..bd70dad 100644 --- a/core/jni/android_media_AudioTrack.cpp +++ b/core/jni/android_media_AudioTrack.cpp @@ -127,7 +127,7 @@ jint android_media_translateErrorCode(int code) { // ---------------------------------------------------------------------------- -static void audioCallback(AudioTrack::event_type event, void* user, void *info) { +static void audioCallback(int event, void* user, void *info) { if (event == AudioTrack::EVENT_MORE_DATA) { // set size to 0 to signal we're not using the callback to write more data AudioTrack::Buffer* pBuff = (AudioTrack::Buffer*)info; |