summaryrefslogtreecommitdiffstats
path: root/services/audioflinger/AudioMixer.h
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2012-01-09 11:59:17 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-01-09 11:59:17 -0800
commit5f29ca38b71506ad7c7cb9925efbddf588e9655b (patch)
treee67bef8a10e8705ebe0f43fbf49d27764a362040 /services/audioflinger/AudioMixer.h
parent25b248eb52a0a16adaef6b79c9d92cb88b9a2bc2 (diff)
parent54c3b66444ebfb9f2265ee70ac3b76ccefa0506a (diff)
downloadframeworks_av-5f29ca38b71506ad7c7cb9925efbddf588e9655b.zip
frameworks_av-5f29ca38b71506ad7c7cb9925efbddf588e9655b.tar.gz
frameworks_av-5f29ca38b71506ad7c7cb9925efbddf588e9655b.tar.bz2
Merge "By convention const goes before the type specifier"
Diffstat (limited to 'services/audioflinger/AudioMixer.h')
-rw-r--r--services/audioflinger/AudioMixer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/audioflinger/AudioMixer.h b/services/audioflinger/AudioMixer.h
index 4ba6845..84f6330 100644
--- a/services/audioflinger/AudioMixer.h
+++ b/services/audioflinger/AudioMixer.h
@@ -145,7 +145,7 @@ private:
mutable AudioBufferProvider::Buffer buffer;
hook_t hook;
- void const* in; // current location in buffer
+ const void* in; // current location in buffer
AudioResampler* resampler;
uint32_t sampleRate;