Merge "Move declaration of mixerStatus to inner block" (db316b21) · Commits · e / os / android_frameworks_base

services/audioflinger/AudioFlinger.cpp

+3 −7

Original line number	Diff line number	Diff line
		@@ -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);