diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-07-02 16:10:16 -0700 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2012-07-03 10:22:13 -0700 |
| commit | f1da96d8cf60842538e00a9c950cc451f7da2c10 (patch) | |
| tree | b64f770259b25809f5fa1820a686f1cafb8de0e1 /services | |
| parent | 415fa7599f48494f99206b8d6e1974abb52c5923 (diff) | |
| download | frameworks_av-f1da96d8cf60842538e00a9c950cc451f7da2c10.zip frameworks_av-f1da96d8cf60842538e00a9c950cc451f7da2c10.tar.gz frameworks_av-f1da96d8cf60842538e00a9c950cc451f7da2c10.tar.bz2 | |
Remove longStandbyExit
It was never set (the assignment was within an "if" that was never true).
Change-Id: I01cc68e9df6b190eece621b2aa9858b4361880ce
Diffstat (limited to 'services')
| -rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 13 | ||||
| -rw-r--r-- | services/audioflinger/AudioFlinger.h | 1 |
2 files changed, 2 insertions, 12 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index 540c9a3..1ea788e 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -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 } diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h index 1993860..ec3f2ca 100644 --- a/services/audioflinger/AudioFlinger.h +++ b/services/audioflinger/AudioFlinger.h @@ -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 |