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 /media/libmedia | |
| 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 'media/libmedia')
| -rw-r--r-- | media/libmedia/ToneGenerator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmedia/ToneGenerator.cpp b/media/libmedia/ToneGenerator.cpp index 913a6db..9f1b3d6 100644 --- a/media/libmedia/ToneGenerator.cpp +++ b/media/libmedia/ToneGenerator.cpp @@ -1076,7 +1076,7 @@ initAudioTrack_exit: // returned value: always true. // //////////////////////////////////////////////////////////////////////////////// -void ToneGenerator::audioCallback(AudioTrack::event_type event, void* user, void *info) { +void ToneGenerator::audioCallback(int event, void* user, void *info) { if (event != AudioTrack::EVENT_MORE_DATA) return; |