Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 8383

Browse Source 
* changes:
  Fix the sim build.
This commit is contained in:
Android (Google) Code Review
2009-07-23 13:49:41 -07:00
parent 35d7a94c33 2c817f5d52
commit c0da1bf9e2
2 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libs/audioflinger/AudioFlinger.cpp
View File

@@ -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;

27
libs/audioflinger/AudioFlinger.h
View File

@@ -251,6 +251,10 @@ private:
protected:
friend class ThreadBase;
friend class RecordHandle;
friend class PlaybackThread;
friend class RecordThread;
friend class MixerThread;
friend class DirectOutputThread;
TrackBase(const TrackBase&);
TrackBase& operator = (const TrackBase&);
@@ -318,6 +322,8 @@ private:
void sendConfigEvent(int event, int param = 0);
void processConfigEvents();
mutable Mutex mLock;
protected:
friend class Track;
@@ -329,7 +335,6 @@ private:
friend class RecordThread;
friend class RecordTrack;
mutable Mutex mLock;
Condition mWaitWorkCV;
sp<AudioFlinger> mAudioFlinger;
uint32_t mSampleRate;
@@ -388,7 +393,10 @@ private:
protected:
friend class ThreadBase;
friend class AudioFlinger;
friend class AudioFlinger::TrackHandle;
friend class TrackHandle;
friend class PlaybackThread;
friend class MixerThread;
friend class DirectOutputThread;
Track(const Track&);
Track& operator = (const Track&);
@@ -510,6 +518,14 @@ private:
bool mute;
};
protected:
int mType;
int16_t* mMixBuffer;
bool mSuspended;
int mBytesWritten;
bool mMasterMute;
SortedVector< wp<Track> > mActiveTracks;
private:
friend class AudioFlinger;
@@ -531,21 +547,15 @@ private:
virtual status_t dumpInternals(int fd, const Vector<String16>& args);
status_t dumpTracks(int fd, const Vector<String16>& args);
SortedVector< wp<Track> > mActiveTracks;
SortedVector< sp<Track> > mTracks;
// mStreamTypes[] uses 1 additionnal stream type internally for the OutputTrack used by DuplicatingThread
stream_type_t mStreamTypes[AudioSystem::NUM_STREAM_TYPES + 1];
AudioStreamOut* mOutput;
float mMasterVolume;
bool mMasterMute;
nsecs_t mLastWriteTime;
int mNumWrites;
int mNumDelayedWrites;
bool mInWrite;
int16_t* mMixBuffer;
bool mSuspended;
int mType;
int mBytesWritten;
int mMinBytesToWrite;
};
@@ -661,6 +671,7 @@ private:
private:
friend class AudioFlinger;
friend class RecordThread;
RecordTrack(const RecordTrack&);
RecordTrack& operator = (const RecordTrack&);