summaryrefslogtreecommitdiffstats
path: root/Source/WebKit/android/plugins
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2011-06-01 15:20:03 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-06-01 15:20:03 -0700
commit131e4ececc5afb847b251dc85fff81e1cb41a94a (patch)
tree2bde65595ec9979b0126f433c4e28e8bde17a4b0 /Source/WebKit/android/plugins
parent8d0d3a015e5f96c7eb2101fba5abcdf76958ff41 (diff)
downloadexternal_webkit-131e4ececc5afb847b251dc85fff81e1cb41a94a.zip
external_webkit-131e4ececc5afb847b251dc85fff81e1cb41a94a.tar.gz
external_webkit-131e4ececc5afb847b251dc85fff81e1cb41a94a.tar.bz2
Revert "Use AudioTrack::event_type not int in callback"
This reverts commit 8d0d3a015e5f96c7eb2101fba5abcdf76958ff41
Diffstat (limited to 'Source/WebKit/android/plugins')
-rw-r--r--Source/WebKit/android/plugins/ANPSoundInterface.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebKit/android/plugins/ANPSoundInterface.cpp b/Source/WebKit/android/plugins/ANPSoundInterface.cpp
index fe08be8..c238872 100644
--- a/Source/WebKit/android/plugins/ANPSoundInterface.cpp
+++ b/Source/WebKit/android/plugins/ANPSoundInterface.cpp
@@ -60,7 +60,7 @@ static int fromANPFormat(ANPSampleFormat fm) {
}
}
-static void callbackProc(android::AudioTrack::event_type event, void* user, void* info) {
+static void callbackProc(int event, void* user, void* info) {
ANPAudioTrack* track = reinterpret_cast<ANPAudioTrack*>(user);
switch (event) {