summaryrefslogtreecommitdiffstats
path: root/media/libmedia/ToneGenerator.cpp
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2011-06-01 15:20:35 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-06-01 15:20:35 -0700
commitd217a8c4632b3e3065f8c2a26b9ce4dc4c97171f (patch)
tree36ea6300b9a3e5412d45ddaa5e5d6a38117c30c0 /media/libmedia/ToneGenerator.cpp
parent013b5a67d6f8e12a1b06e74863daec1bee4d99c1 (diff)
downloadframeworks_av-d217a8c4632b3e3065f8c2a26b9ce4dc4c97171f.zip
frameworks_av-d217a8c4632b3e3065f8c2a26b9ce4dc4c97171f.tar.gz
frameworks_av-d217a8c4632b3e3065f8c2a26b9ce4dc4c97171f.tar.bz2
Revert "Use AudioTrack::event_type not int in callback"
This reverts commit 2225e4b7049fa3fb9d39a068b8268b63c952d7c1
Diffstat (limited to 'media/libmedia/ToneGenerator.cpp')
-rw-r--r--media/libmedia/ToneGenerator.cpp2
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;