diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-01-26 13:37:52 -0800 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2012-01-26 14:23:47 -0800 |
| commit | 789fef1f83bdf7b082a13d11a124797881ca62dc (patch) | |
| tree | f28e63f5f3e2ecceed0c0dea7fde151e3eed1830 /services | |
| parent | caaac348ed163f59cf1b8185bb14137050c18e7e (diff) | |
| download | frameworks_base-789fef1f83bdf7b082a13d11a124797881ca62dc.zip frameworks_base-789fef1f83bdf7b082a13d11a124797881ca62dc.tar.gz frameworks_base-789fef1f83bdf7b082a13d11a124797881ca62dc.tar.bz2 | |
Use enum mixer_state consistently
Change-Id: I5b71ed20f939dfc4b98143334b7aa064d282f584
Diffstat (limited to 'services')
| -rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 11 | ||||
| -rw-r--r-- | services/audioflinger/AudioFlinger.h | 5 |
2 files changed, 8 insertions, 8 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index 6701059..4a3b2b9 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -1866,7 +1866,7 @@ AudioFlinger::MixerThread::~MixerThread() bool AudioFlinger::MixerThread::threadLoop() { Vector< sp<Track> > tracksToRemove; - uint32_t mixerStatus = MIXER_IDLE; + mixer_state mixerStatus = MIXER_IDLE; nsecs_t standbyTime = systemTime(); size_t mixBufferSize = mFrameCount * mFrameSize; // FIXME: Relaxed timing because of a certain device that can't meet latency @@ -2085,10 +2085,11 @@ bool AudioFlinger::MixerThread::threadLoop() } // prepareTracks_l() must be called with ThreadBase::mLock held -uint32_t AudioFlinger::MixerThread::prepareTracks_l(const SortedVector< wp<Track> >& activeTracks, Vector< sp<Track> > *tracksToRemove) +AudioFlinger::PlaybackThread::mixer_state AudioFlinger::MixerThread::prepareTracks_l( + const SortedVector< wp<Track> >& activeTracks, Vector< sp<Track> > *tracksToRemove) { - uint32_t mixerStatus = MIXER_IDLE; + mixer_state mixerStatus = MIXER_IDLE; // find out which tracks need to be processed size_t count = activeTracks.size(); size_t mixedTracks = 0; @@ -2612,7 +2613,7 @@ void AudioFlinger::DirectOutputThread::applyVolume(uint16_t leftVol, uint16_t ri bool AudioFlinger::DirectOutputThread::threadLoop() { - uint32_t mixerStatus = MIXER_IDLE; + mixer_state mixerStatus = MIXER_IDLE; sp<Track> trackToRemove; sp<Track> activeTrack; nsecs_t standbyTime = systemTime(); @@ -3009,7 +3010,7 @@ AudioFlinger::DuplicatingThread::~DuplicatingThread() bool AudioFlinger::DuplicatingThread::threadLoop() { Vector< sp<Track> > tracksToRemove; - uint32_t mixerStatus = MIXER_IDLE; + mixer_state mixerStatus = MIXER_IDLE; nsecs_t standbyTime = systemTime(); size_t mixBufferSize = mFrameCount*mFrameSize; SortedVector< sp<OutputTrack> > outputTracks; diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h index 48edfcd..7f7cd39 100644 --- a/services/audioflinger/AudioFlinger.h +++ b/services/audioflinger/AudioFlinger.h @@ -828,7 +828,7 @@ private: virtual status_t dumpInternals(int fd, const Vector<String16>& args); protected: - uint32_t prepareTracks_l(const SortedVector< wp<Track> >& activeTracks, + mixer_state prepareTracks_l(const SortedVector< wp<Track> >& activeTracks, Vector< sp<Track> > *tracksToRemove); virtual int getTrackName_l(); virtual void deleteTrackName_l(int name); @@ -836,8 +836,7 @@ private: virtual uint32_t suspendSleepTimeUs(); AudioMixer* mAudioMixer; - uint32_t mPrevMixerStatus; // previous status (mixer_state) returned by - // prepareTracks_l() + mixer_state mPrevMixerStatus; // previous status returned by prepareTracks_l() }; class DirectOutputThread : public PlaybackThread { |