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

Commit f1da96d8 authored by Glenn Kasten's avatar Glenn Kasten
Browse files

Remove longStandbyExit 

It was never set (the assignment was within an "if" that was never true).

Change-Id: I01cc68e9df6b190eece621b2aa9858b4361880ce
parent 415fa759

services/audioflinger/AudioFlinger.cpp

+2 −11
Original line number Diff line number Diff line
@@ -2508,9 +2508,6 @@ bool AudioFlinger::PlaybackThread::threadLoop() 


    // MIXER

    nsecs_t lastWarning = 0;

if (mType == MIXER) {

    longStandbyExit = false;

}



    // DUPLICATING

    // FIXME could this be made local to while loop?
@@ -2635,11 +2632,6 @@ if (mType == MIXER) { 
                            ns2ms(delta), mNumDelayedWrites, this);

                    lastWarning = now;

                }

                // FIXME this is broken: longStandbyExit should be handled out of the if() and with

                // a different threshold. Or completely removed for what it is worth anyway...

                if (mStandby) {

                    longStandbyExit = true;

                }

            }

}
@@ -2847,11 +2839,10 @@ void AudioFlinger::MixerThread::threadLoop_sleepTime() 
        } else {

            sleepTime = idleSleepTime;

        }

    } else if (mBytesWritten != 0 ||

               (mMixerStatus == MIXER_TRACKS_ENABLED && longStandbyExit)) {

    } else if (mBytesWritten != 0 || (mMixerStatus == MIXER_TRACKS_ENABLED)) {

        memset (mMixBuffer, 0, mixBufferSize);

        sleepTime = 0;

        ALOGV_IF((mBytesWritten == 0 && (mMixerStatus == MIXER_TRACKS_ENABLED && longStandbyExit)), "anticipated start");

        ALOGV_IF((mBytesWritten == 0 && (mMixerStatus == MIXER_TRACKS_ENABLED)), "anticipated start");

    }

    // TODO add standby time extension fct of effect tail

}

services/audioflinger/AudioFlinger.h

+0 −1
Original line number Diff line number Diff line
@@ -1102,7 +1102,6 @@ public: 


        // FIXME move these declarations into the specific sub-class that needs them

        // MIXER only

        bool                            longStandbyExit;

        uint32_t                        sleepTimeShift;



        // same as AudioFlinger::mStandbyTimeInNsecs except for DIRECT which uses a shorter value