diff options
author | Glenn Kasten <gkasten@google.com> | 2012-01-27 07:18:23 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-27 07:18:23 -0800 |
commit | 114c458f2b80a252ec627add1d5fda2093c79068 (patch) | |
tree | 3f676423666da814f847dc7944d223cb5a5bbe9c /services | |
parent | 37770e47b63038178e1d8bdb9f14785a86e9e858 (diff) | |
parent | b853e986caf43408ad95b9014f194aadff385e3c (diff) | |
download | frameworks_av-114c458f2b80a252ec627add1d5fda2093c79068.zip frameworks_av-114c458f2b80a252ec627add1d5fda2093c79068.tar.gz frameworks_av-114c458f2b80a252ec627add1d5fda2093c79068.tar.bz2 |
Merge "Use enum track_state consistently"
Diffstat (limited to 'services')
-rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 4 | ||||
-rw-r--r-- | services/audioflinger/AudioFlinger.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index 4a3b2b9..840358a 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -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 diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h index 7f7cd39..a291113 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; |