diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-02-28 07:21:09 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-28 07:21:09 -0800 |
| commit | a17c820c556fddf7ddd96b82b3e9874e340ffafd (patch) | |
| tree | 410130682b9d03614ce01e3e5af6bb0a2073d25d /services | |
| parent | 3f791be1032e6c4cc499598dd2be116db6fb33c3 (diff) | |
| parent | 02fe1bf923bbe5789202dbd5810e2c04794562e6 (diff) | |
| download | frameworks_av-a17c820c556fddf7ddd96b82b3e9874e340ffafd.zip frameworks_av-a17c820c556fddf7ddd96b82b3e9874e340ffafd.tar.gz frameworks_av-a17c820c556fddf7ddd96b82b3e9874e340ffafd.tar.bz2 | |
Merge "AudioFlinger const methods and parameters"
Diffstat (limited to 'services')
| -rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 8 | ||||
| -rw-r--r-- | services/audioflinger/AudioFlinger.h | 13 |
2 files changed, 11 insertions, 10 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index 3fe5500..30f0244 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -3285,7 +3285,7 @@ void AudioFlinger::DuplicatingThread::updateWaitTime() } -bool AudioFlinger::DuplicatingThread::outputsReady(SortedVector< sp<OutputTrack> > &outputTracks) +bool AudioFlinger::DuplicatingThread::outputsReady(const SortedVector< sp<OutputTrack> > &outputTracks) { for (size_t i = 0; i < outputTracks.size(); i++) { sp <ThreadBase> thread = outputTracks[i]->thread().promote(); @@ -5870,7 +5870,7 @@ uint32_t AudioFlinger::nextUniqueId() return android_atomic_inc(&mNextUniqueId); } -AudioFlinger::PlaybackThread *AudioFlinger::primaryPlaybackThread_l() +AudioFlinger::PlaybackThread *AudioFlinger::primaryPlaybackThread_l() const { for (size_t i = 0; i < mPlaybackThreads.size(); i++) { PlaybackThread *thread = mPlaybackThreads.valueAt(i).get(); @@ -5882,7 +5882,7 @@ AudioFlinger::PlaybackThread *AudioFlinger::primaryPlaybackThread_l() return NULL; } -uint32_t AudioFlinger::primaryOutputDevice_l() +uint32_t AudioFlinger::primaryOutputDevice_l() const { PlaybackThread *thread = primaryPlaybackThread_l(); @@ -6377,7 +6377,7 @@ void AudioFlinger::ThreadBase::lockEffectChains_l( } void AudioFlinger::ThreadBase::unlockEffectChains( - Vector<sp <AudioFlinger::EffectChain> >& effectChains) + const Vector<sp <AudioFlinger::EffectChain> >& effectChains) { for (size_t i = 0; i < effectChains.size(); i++) { effectChains[i]->unlock(); diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h index d8aa7da..e908d3f 100644 --- a/services/audioflinger/AudioFlinger.h +++ b/services/audioflinger/AudioFlinger.h @@ -423,8 +423,8 @@ private: void sendConfigEvent_l(int event, int param = 0); void processConfigEvents(); audio_io_handle_t id() const { return mId;} - bool standby() { return mStandby; } - uint32_t device() { return mDevice; } + bool standby() const { return mStandby; } + uint32_t device() const { return mDevice; } virtual audio_stream_t* stream() = 0; sp<EffectHandle> createEffect_l( @@ -460,7 +460,7 @@ private: // integrity of the chains during the process. void lockEffectChains_l(Vector<sp <EffectChain> >& effectChains); // unlock effect chains after process - void unlockEffectChains(Vector<sp <EffectChain> >& effectChains); + void unlockEffectChains(const Vector<sp<EffectChain> >& effectChains); // set audio mode to all effect chains void setMode(audio_mode_t mode); // get effect module with corresponding ID on specified audio session @@ -969,7 +969,7 @@ private: virtual uint32_t activeSleepTimeUs(); private: - bool outputsReady(SortedVector< sp<OutputTrack> > &outputTracks); + bool outputsReady(const SortedVector<sp<OutputTrack> > &outputTracks); void updateWaitTime(); SortedVector < sp<OutputTrack> > mOutputTracks; @@ -994,8 +994,9 @@ private: PlaybackThread *srcThread, PlaybackThread *dstThread, bool reRegister); - PlaybackThread *primaryPlaybackThread_l(); - uint32_t primaryOutputDevice_l(); + // return thread associated with primary hardware device, or NULL + PlaybackThread *primaryPlaybackThread_l() const; + uint32_t primaryOutputDevice_l() const; friend class AudioBuffer; |