summaryrefslogtreecommitdiffstats
path: root/Source/WebKit/android
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2012-01-04 09:32:18 -0800
committerGlenn Kasten <gkasten@google.com>2012-01-05 13:27:43 -0800
commitaec70f340dd665e5c3bf3ef7aed3bae2fe55996d (patch)
tree8eff2847e50370d70dab4cfee9d98baf2dd6dd53 /Source/WebKit/android
parent4b3746d420dc2fb562643d5bd28b5dd6b00abad4 (diff)
downloadexternal_webkit-aec70f340dd665e5c3bf3ef7aed3bae2fe55996d.zip
external_webkit-aec70f340dd665e5c3bf3ef7aed3bae2fe55996d.tar.gz
external_webkit-aec70f340dd665e5c3bf3ef7aed3bae2fe55996d.tar.bz2
Use audio_format_t consistently
Change-Id: I1e5f10adb2d4cd2b5421505761fe02bb6d638ab6
Diffstat (limited to 'Source/WebKit/android')
-rw-r--r--Source/WebKit/android/plugins/ANPSoundInterface.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebKit/android/plugins/ANPSoundInterface.cpp b/Source/WebKit/android/plugins/ANPSoundInterface.cpp
index c238872..a4f192f 100644
--- a/Source/WebKit/android/plugins/ANPSoundInterface.cpp
+++ b/Source/WebKit/android/plugins/ANPSoundInterface.cpp
@@ -38,7 +38,7 @@ struct ANPAudioTrack {
android::AudioTrack* mTrack;
};
-static ANPSampleFormat toANPFormat(int fm) {
+static ANPSampleFormat toANPFormat(audio_format_t fm) {
switch (fm) {
case AUDIO_FORMAT_PCM_16_BIT:
return kPCM16Bit_ANPSampleFormat;
@@ -49,7 +49,7 @@ static ANPSampleFormat toANPFormat(int fm) {
}
}
-static int fromANPFormat(ANPSampleFormat fm) {
+static audio_format_t fromANPFormat(ANPSampleFormat fm) {
switch (fm) {
case kPCM16Bit_ANPSampleFormat:
return AUDIO_FORMAT_PCM_16_BIT;