diff options
| author | Glenn Kasten <gkasten@google.com> | 2011-06-01 14:40:39 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-01 14:40:39 -0700 |
| commit | 38a46aadb822a04a8e7765736d2cc51ea4122c0b (patch) | |
| tree | a67d4c870ef8d17f96785a91a9fb73592c9a4ba0 | |
| parent | 0bc8a6f1de48da432733e2bd21c5c793b7a0393d (diff) | |
| parent | 8d0d3a015e5f96c7eb2101fba5abcdf76958ff41 (diff) | |
| download | external_webkit-38a46aadb822a04a8e7765736d2cc51ea4122c0b.zip external_webkit-38a46aadb822a04a8e7765736d2cc51ea4122c0b.tar.gz external_webkit-38a46aadb822a04a8e7765736d2cc51ea4122c0b.tar.bz2 | |
Merge "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 c238872..fe08be8 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(int event, void* user, void* info) { +static void callbackProc(android::AudioTrack::event_type event, void* user, void* info) { ANPAudioTrack* track = reinterpret_cast<ANPAudioTrack*>(user); switch (event) { |