diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-23 13:49:41 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-23 13:49:41 -0700 |
| commit | c0da1bf9e21ccf92def9fc187c8eb51f23c4d01c (patch) | |
| tree | 814bd28de72eb979770711de8d7b7aaeac025281 /libs/audioflinger/AudioFlinger.cpp | |
| parent | 35d7a94c334076dc66daff9d567139c595011c89 (diff) | |
| parent | 2c817f5d52478453a1bd7e451fa14c1b7fe4802b (diff) | |
| download | frameworks_base-c0da1bf9e21ccf92def9fc187c8eb51f23c4d01c.zip frameworks_base-c0da1bf9e21ccf92def9fc187c8eb51f23c4d01c.tar.gz frameworks_base-c0da1bf9e21ccf92def9fc187c8eb51f23c4d01c.tar.bz2 | |
Merge change 8383
* changes:
Fix the sim build.
Diffstat (limited to 'libs/audioflinger/AudioFlinger.cpp')
| -rw-r--r-- | libs/audioflinger/AudioFlinger.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libs/audioflinger/AudioFlinger.cpp b/libs/audioflinger/AudioFlinger.cpp index c05ab77..bc0854e 100644 --- a/libs/audioflinger/AudioFlinger.cpp +++ b/libs/audioflinger/AudioFlinger.cpp @@ -781,9 +781,8 @@ void AudioFlinger::ThreadBase::processConfigEvents() AudioFlinger::PlaybackThread::PlaybackThread(const sp<AudioFlinger>& audioFlinger, AudioStreamOut* output) : ThreadBase(audioFlinger), - mOutput(output), - mLastWriteTime(0), mNumWrites(0), mNumDelayedWrites(0), - mInWrite(false), mMixBuffer(0), mSuspended(false), mBytesWritten(0) + mMixBuffer(0), mSuspended(false), mBytesWritten(0), mOutput(output), + mLastWriteTime(0), mNumWrites(0), mNumDelayedWrites(0), mInWrite(false) { readOutputParameters(); @@ -1007,7 +1006,7 @@ bool AudioFlinger::PlaybackThread::isMusicActive() const sp<Track> t = mActiveTracks[i].promote(); if (t == 0) continue; Track* const track = t.get(); - if (t->mStreamType == AudioSystem::MUSIC) + if (t->type() == AudioSystem::MUSIC) return true; } return false; |