diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-02-27 07:21:00 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-27 07:21:00 -0800 |
| commit | db316b212f92a8bd3bb86cb0bf97388f5662a0b9 (patch) | |
| tree | 694abf4b773b8bb90b3592ef7ce0a4b7d6e9addc | |
| parent | 1d7b856a970777aed7cbe0aa1ad075e24bc0b860 (diff) | |
| parent | 26debac448dcc2f52c70ea082e2f5ede2a9ca91d (diff) | |
| download | frameworks_base-db316b212f92a8bd3bb86cb0bf97388f5662a0b9.zip frameworks_base-db316b212f92a8bd3bb86cb0bf97388f5662a0b9.tar.gz frameworks_base-db316b212f92a8bd3bb86cb0bf97388f5662a0b9.tar.bz2 | |
Merge "Move declaration of mixerStatus to inner block"
| -rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index d522091..a3689d4 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -1993,7 +1993,6 @@ void AudioFlinger::PlaybackThread::checkSilentMode_l() bool AudioFlinger::MixerThread::threadLoop() { Vector< sp<Track> > tracksToRemove; - mixer_state mixerStatus = MIXER_IDLE; nsecs_t standbyTime = systemTime(); size_t mixBufferSize = mFrameCount * mFrameSize; // FIXME: Relaxed timing because of a certain device that can't meet latency @@ -2017,7 +2016,7 @@ bool AudioFlinger::MixerThread::threadLoop() cpuStats.sample(); processConfigEvents(); - mixerStatus = MIXER_IDLE; + mixer_state mixerStatus = MIXER_IDLE; { // scope for mLock Mutex::Autolock _l(mLock); @@ -2702,7 +2701,6 @@ void AudioFlinger::DirectOutputThread::applyVolume(uint16_t leftVol, uint16_t ri bool AudioFlinger::DirectOutputThread::threadLoop() { - mixer_state mixerStatus = MIXER_IDLE; sp<Track> trackToRemove; sp<Track> activeTrack; nsecs_t standbyTime = systemTime(); @@ -2725,8 +2723,7 @@ bool AudioFlinger::DirectOutputThread::threadLoop() processConfigEvents(); - mixerStatus = MIXER_IDLE; - + mixer_state mixerStatus = MIXER_IDLE; { // scope for the mLock Mutex::Autolock _l(mLock); @@ -3092,7 +3089,6 @@ AudioFlinger::DuplicatingThread::~DuplicatingThread() bool AudioFlinger::DuplicatingThread::threadLoop() { Vector< sp<Track> > tracksToRemove; - mixer_state mixerStatus = MIXER_IDLE; nsecs_t standbyTime = systemTime(); size_t mixBufferSize = mFrameCount*mFrameSize; SortedVector< sp<OutputTrack> > outputTracks; @@ -3108,7 +3104,7 @@ bool AudioFlinger::DuplicatingThread::threadLoop() { processConfigEvents(); - mixerStatus = MIXER_IDLE; + mixer_state mixerStatus = MIXER_IDLE; { // scope for the mLock Mutex::Autolock _l(mLock); |