drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use enum track_state consistently"

Browse Source
This commit is contained in:
Glenn Kasten
2012-01-27 07:18:23 -08:00
committed by Android (Google) Code Review
parent 43f4dd4fa1 563562032d
commit 86012869b8
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/audioflinger/AudioFlinger.cpp
View File

@ -3550,7 +3550,7 @@ status_t AudioFlinger::PlaybackThread::Track::start()
sp<ThreadBase> 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) {
@ -3591,7 +3591,7 @@ void AudioFlinger::PlaybackThread::Track::stop()
sp<ThreadBase> 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

2
services/audioflinger/AudioFlinger.h
View File

@ -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;