diff options
| author | Glenn Kasten <gkasten@google.com> | 2011-06-01 15:22:21 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-01 15:22:21 -0700 |
| commit | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (patch) | |
| tree | 418a64a17bcfcfd3934e0a15896b19f1a0605989 | |
| parent | 38a46aadb822a04a8e7765736d2cc51ea4122c0b (diff) | |
| parent | 131e4ececc5afb847b251dc85fff81e1cb41a94a (diff) | |
| download | external_webkit-94088a6d336c1dd80a1e734af51e96abcbb689a7.zip external_webkit-94088a6d336c1dd80a1e734af51e96abcbb689a7.tar.gz external_webkit-94088a6d336c1dd80a1e734af51e96abcbb689a7.tar.bz2 | |
Merge "Revert "Use AudioTrack::event_type not int in callback""
| -rw-r--r-- | Source/WebKit/android/plugins/ANPSoundInterface.cpp | 2 |
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) { |