From: Glenn Kasten Date: Thu, 26 Jan 2012 21:39:18 +0000 (-0800) Subject: Use enum track_state consistently X-Git-Tag: android-x86-4.4-r1~1579^2~260^2 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b853e986caf43408ad95b9014f194aadff385e3c;p=android-x86%2Fframeworks-av.git Use enum track_state consistently Change-Id: Ie5ebb7befa092e1de1e4df9c6e2d51e6bcfd176a --- diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index 6701059c22..b305ee2e85 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -3549,7 +3549,7 @@ status_t AudioFlinger::PlaybackThread::Track::start() sp thread = mThread.promote(); if (thread != 0) { Mutex::Autolock _l(thread->mLock); - int state = mState; + track_state state = mState; // here the track could be either new, or restarted // in both cases "unstop" the track if (mState == PAUSED) { @@ -3590,7 +3590,7 @@ void AudioFlinger::PlaybackThread::Track::stop() sp thread = mThread.promote(); if (thread != 0) { Mutex::Autolock _l(thread->mLock); - int state = mState; + track_state state = mState; if (mState > STOPPED) { mState = STOPPED; // If the track is not active (PAUSED and buffers full), flush buffers diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h index 48edfcd428..c12dc42aa9 100644 --- a/services/audioflinger/AudioFlinger.h +++ b/services/audioflinger/AudioFlinger.h @@ -375,7 +375,7 @@ private: void* mBufferEnd; uint32_t mFrameCount; // we don't really need a lock for these - int mState; + track_state mState; int mClientTid; audio_format_t mFormat; uint32_t mFlags;