summaryrefslogtreecommitdiffstats
path: root/services/audioflinger/FastMixer.h
diff options
context:
space:
mode:
authorAndy Hung <hunga@google.com>2014-05-23 21:13:31 -0700
committerAndy Hung <hunga@google.com>2014-05-23 22:13:50 -0700
commit45d68d366d07b10733c1e8af6a6984befbc08ce1 (patch)
treeb79d525dc649db24fdbd4c11feb5f3d9eb12f17e /services/audioflinger/FastMixer.h
parentef7c7fbd0e3fb36af14cd7d39f64c949031516a5 (diff)
downloadframeworks_av-45d68d366d07b10733c1e8af6a6984befbc08ce1.zip
frameworks_av-45d68d366d07b10733c1e8af6a6984befbc08ce1.tar.gz
frameworks_av-45d68d366d07b10733c1e8af6a6984befbc08ce1.tar.bz2
Rename mixBuffer to mMixerBuffer in FastMixer
Likewise mixBufferState becomes mMixerBufferState. This harmonizes with the naming in AF::MixerThread. Change-Id: I1255d7c07cc2c6ee925d7430925236d2bd163122
Diffstat (limited to 'services/audioflinger/FastMixer.h')
-rw-r--r--services/audioflinger/FastMixer.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/audioflinger/FastMixer.h b/services/audioflinger/FastMixer.h
index 981c1a7..7be004a 100644
--- a/services/audioflinger/FastMixer.h
+++ b/services/audioflinger/FastMixer.h
@@ -63,8 +63,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;