Skip to content

Commit 0fccd35

Browse files
committed
AudioFlinger const methods and parameters
Change-Id: I93ec28024005ed23aa141518092a012a4a7c44c5
1 parent 2521a01 commit 0fccd35

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

services/audioflinger/AudioFlinger.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3281,7 +3281,7 @@ void AudioFlinger::DuplicatingThread::updateWaitTime()
32813281
}
32823282

32833283

3284-
bool AudioFlinger::DuplicatingThread::outputsReady(SortedVector< sp<OutputTrack> > &outputTracks)
3284+
bool AudioFlinger::DuplicatingThread::outputsReady(const SortedVector< sp<OutputTrack> > &outputTracks)
32853285
{
32863286
for (size_t i = 0; i < outputTracks.size(); i++) {
32873287
sp <ThreadBase> thread = outputTracks[i]->thread().promote();
@@ -5859,7 +5859,7 @@ uint32_t AudioFlinger::nextUniqueId()
58595859
return android_atomic_inc(&mNextUniqueId);
58605860
}
58615861

5862-
AudioFlinger::PlaybackThread *AudioFlinger::primaryPlaybackThread_l()
5862+
AudioFlinger::PlaybackThread *AudioFlinger::primaryPlaybackThread_l() const
58635863
{
58645864
for (size_t i = 0; i < mPlaybackThreads.size(); i++) {
58655865
PlaybackThread *thread = mPlaybackThreads.valueAt(i).get();
@@ -5871,7 +5871,7 @@ AudioFlinger::PlaybackThread *AudioFlinger::primaryPlaybackThread_l()
58715871
return NULL;
58725872
}
58735873

5874-
uint32_t AudioFlinger::primaryOutputDevice_l()
5874+
uint32_t AudioFlinger::primaryOutputDevice_l() const
58755875
{
58765876
PlaybackThread *thread = primaryPlaybackThread_l();
58775877

@@ -6366,7 +6366,7 @@ void AudioFlinger::ThreadBase::lockEffectChains_l(
63666366
}
63676367

63686368
void AudioFlinger::ThreadBase::unlockEffectChains(
6369-
Vector<sp <AudioFlinger::EffectChain> >& effectChains)
6369+
const Vector<sp <AudioFlinger::EffectChain> >& effectChains)
63706370
{
63716371
for (size_t i = 0; i < effectChains.size(); i++) {
63726372
effectChains[i]->unlock();

services/audioflinger/AudioFlinger.h

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -424,8 +424,8 @@ class AudioFlinger :
424424
void sendConfigEvent_l(int event, int param = 0);
425425
void processConfigEvents();
426426
audio_io_handle_t id() const { return mId;}
427-
bool standby() { return mStandby; }
428-
uint32_t device() { return mDevice; }
427+
bool standby() const { return mStandby; }
428+
uint32_t device() const { return mDevice; }
429429
virtual audio_stream_t* stream() = 0;
430430

431431
sp<EffectHandle> createEffect_l(
@@ -461,7 +461,7 @@ class AudioFlinger :
461461
// integrity of the chains during the process.
462462
void lockEffectChains_l(Vector<sp <EffectChain> >& effectChains);
463463
// unlock effect chains after process
464-
void unlockEffectChains(Vector<sp <EffectChain> >& effectChains);
464+
void unlockEffectChains(const Vector<sp<EffectChain> >& effectChains);
465465
// set audio mode to all effect chains
466466
void setMode(audio_mode_t mode);
467467
// get effect module with corresponding ID on specified audio session
@@ -968,7 +968,7 @@ class AudioFlinger :
968968
virtual uint32_t activeSleepTimeUs();
969969

970970
private:
971-
bool outputsReady(SortedVector< sp<OutputTrack> > &outputTracks);
971+
bool outputsReady(const SortedVector<sp<OutputTrack> > &outputTracks);
972972
void updateWaitTime();
973973

974974
SortedVector < sp<OutputTrack> > mOutputTracks;
@@ -993,8 +993,9 @@ class AudioFlinger :
993993
PlaybackThread *srcThread,
994994
PlaybackThread *dstThread,
995995
bool reRegister);
996-
PlaybackThread *primaryPlaybackThread_l();
997-
uint32_t primaryOutputDevice_l();
996+
// return thread associated with primary hardware device, or NULL
997+
PlaybackThread *primaryPlaybackThread_l() const;
998+
uint32_t primaryOutputDevice_l() const;
998999

9991000
friend class AudioBuffer;
10001001

0 commit comments

Comments
 (0)