Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 86012869 authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Use enum track_state consistently"

parents 43f4dd4f 56356203

services/audioflinger/AudioFlinger.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -3550,7 +3550,7 @@ status_t AudioFlinger::PlaybackThread::Track::start() 
    sp<ThreadBase> thread = mThread.promote();

    sp<ThreadBase> thread = mThread.promote();

    if (thread != 0) {

    if (thread != 0) {

        Mutex::Autolock _l(thread->mLock);

        Mutex::Autolock _l(thread->mLock);

        int state = mState;

        track_state state = mState;

        // here the track could be either new, or restarted

        // here the track could be either new, or restarted

        // in both cases "unstop" the track

        // in both cases "unstop" the track

        if (mState == PAUSED) {

        if (mState == PAUSED) {
@@ -3591,7 +3591,7 @@ void AudioFlinger::PlaybackThread::Track::stop() 
    sp<ThreadBase> thread = mThread.promote();

    sp<ThreadBase> thread = mThread.promote();

    if (thread != 0) {

    if (thread != 0) {

        Mutex::Autolock _l(thread->mLock);

        Mutex::Autolock _l(thread->mLock);

        int state = mState;

        track_state state = mState;

        if (mState > STOPPED) {

        if (mState > STOPPED) {

            mState = STOPPED;

            mState = STOPPED;

            // If the track is not active (PAUSED and buffers full), flush buffers

            // If the track is not active (PAUSED and buffers full), flush buffers

services/audioflinger/AudioFlinger.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -375,7 +375,7 @@ private: 
            void*               mBufferEnd;

            void*               mBufferEnd;

            uint32_t            mFrameCount;

            uint32_t            mFrameCount;

            // we don't really need a lock for these

            // we don't really need a lock for these

            int                 mState;

            track_state         mState;

            int                 mClientTid;

            int                 mClientTid;

            audio_format_t      mFormat;

            audio_format_t      mFormat;

            uint32_t            mFlags;

            uint32_t            mFlags;