summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2012-04-18 15:04:13 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-04-18 15:04:13 -0700
commit9add259c5c5b1c4c8b77157a9b59f771d58a0864 (patch)
treee4fe98ebf602fbce379e226068aaf7206c226d3c
parente877997391f9b6c351b5dd5bbb46d2b64fcb4c3a (diff)
parent356edf790717717a9f3b88deb7b80941fb052923 (diff)
downloadexternal_webkit-9add259c5c5b1c4c8b77157a9b59f771d58a0864.zip
external_webkit-9add259c5c5b1c4c8b77157a9b59f771d58a0864.tar.gz
external_webkit-9add259c5c5b1c4c8b77157a9b59f771d58a0864.tar.bz2
Merge "rename audio policy output flags."
-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 41893f9..9d19443 100644
--- a/Source/WebKit/android/plugins/ANPSoundInterface.cpp
+++ b/Source/WebKit/android/plugins/ANPSoundInterface.cpp
@@ -102,7 +102,7 @@ static ANPAudioTrack* ANPCreateTrack(uint32_t sampleRate,
fromANPFormat(format),
(channelCount > 1) ? AUDIO_CHANNEL_OUT_STEREO : AUDIO_CHANNEL_OUT_MONO,
0, // frameCount
- (audio_policy_output_flags_t) 0, // AUDIO_POLICY_OUTPUT_FLAG_NONE,
+ (audio_output_flags_t) 0, // AUDIO_OUTPUT_FLAG_NONE,
callbackProc,
track,
0);