diff options
| author | Andy Hung <hunga@google.com> | 2014-05-27 22:29:46 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-27 22:29:46 +0000 |
| commit | b9e722bdf00333557578497c5abfc77c5d779ecb (patch) | |
| tree | 358849da7593a03312599c17cb2c970b92eccd09 /services/audioflinger/FastMixer.h | |
| parent | 7b2b401a1decf286890171a6791b7a6aa8b80ca7 (diff) | |
| parent | 45d68d366d07b10733c1e8af6a6984befbc08ce1 (diff) | |
| download | frameworks_av-b9e722bdf00333557578497c5abfc77c5d779ecb.zip frameworks_av-b9e722bdf00333557578497c5abfc77c5d779ecb.tar.gz frameworks_av-b9e722bdf00333557578497c5abfc77c5d779ecb.tar.bz2 | |
Merge "Rename mixBuffer to mMixerBuffer in FastMixer"
Diffstat (limited to 'services/audioflinger/FastMixer.h')
| -rw-r--r-- | services/audioflinger/FastMixer.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/audioflinger/FastMixer.h b/services/audioflinger/FastMixer.h index db89ef4..db3e2c9 100644 --- a/services/audioflinger/FastMixer.h +++ b/services/audioflinger/FastMixer.h @@ -61,8 +61,8 @@ private: NBAIO_Sink *outputSink; int outputSinkGen; AudioMixer* mixer; - short *mixBuffer; - enum {UNDEFINED, MIXED, ZEROED} mixBufferState; + short *mMixerBuffer; + enum {UNDEFINED, MIXED, ZEROED} mMixerBufferState; NBAIO_Format format; unsigned sampleRate; int fastTracksGen; |