diff options
author | Glenn Kasten <gkasten@google.com> | 2012-03-20 16:46:41 -0700 |
---|---|---|
committer | Glenn Kasten <gkasten@google.com> | 2012-07-10 08:28:31 -0700 |
commit | 9f34a36d9cdb9595c288e50ffe00da038bc8abb9 (patch) | |
tree | 6b7e7720d4856de8d88b44f5eae3f62993761b2e /services | |
parent | 7d6c35bf132a46c0a8a9826491882495fc98bd8c (diff) | |
download | frameworks_av-9f34a36d9cdb9595c288e50ffe00da038bc8abb9.zip frameworks_av-9f34a36d9cdb9595c288e50ffe00da038bc8abb9.tar.gz frameworks_av-9f34a36d9cdb9595c288e50ffe00da038bc8abb9.tar.bz2 |
Whitespace and indentation
Change-Id: I424052b4ff9218147a5cfc8e6dcd67fe8105d229
Diffstat (limited to 'services')
-rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 20 | ||||
-rw-r--r-- | services/audioflinger/AudioFlinger.h | 5 |
2 files changed, 11 insertions, 14 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index fe84893..ad0a533 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -2488,9 +2488,9 @@ bool AudioFlinger::PlaybackThread::threadLoop() cacheParameters_l(); sleepTime = idleSleepTime; -if (mType == MIXER) { - sleepTimeShift = 0; -} + if (mType == MIXER) { + sleepTimeShift = 0; + } CpuStats cpuStats; const String8 myName(String8::format("thread %p type %d TID %d", this, mType, gettid())); @@ -2631,15 +2631,13 @@ if (mType == MIXER) { // is now local to this block, but will keep it for now (at least until merge done). } -if (mType == MIXER || mType == DIRECT) { - // put output stream into standby mode - if (!mStandby) { - mOutput->stream->common.standby(&mOutput->stream->common); + // for DuplicatingThread, standby mode is handled by the outputTracks, otherwise ... + if (mType == MIXER || mType == DIRECT) { + // put output stream into standby mode + if (!mStandby) { + mOutput->stream->common.standby(&mOutput->stream->common); + } } -} -if (mType == DUPLICATING) { - // for DuplicatingThread, standby mode is handled by the outputTracks -} releaseWakeLock(); diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h index 56d5a15..30915a8 100644 --- a/services/audioflinger/AudioFlinger.h +++ b/services/audioflinger/AudioFlinger.h @@ -732,9 +732,7 @@ private: void flush(); void destroy(); void mute(bool); - int name() const { - return mName; - } + int name() const { return mName; } audio_stream_type_t streamType() const { return mStreamType; @@ -1102,6 +1100,7 @@ public: // mStreamTypes[] uses 1 additional stream type internally for the OutputTrack used by DuplicatingThread stream_type_t mStreamTypes[AUDIO_STREAM_CNT + 1]; AudioStreamOut *mOutput; + float mMasterVolume; nsecs_t mLastWriteTime; int mNumWrites; |