diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-02-22 13:22:13 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-22 13:22:13 -0800 |
| commit | d6fd85a157ce2054b2304e6d171fa87ae09c363d (patch) | |
| tree | dfba92cafe7500bd06aa5e7927405285ca662ecc /services/audioflinger/AudioFlinger.h | |
| parent | 42539cb5d02f0cbaedba2de6ad6be42a0d7a9a9a (diff) | |
| parent | 9eaa55756c5b245970447019250ce852f5189525 (diff) | |
| download | frameworks_av-d6fd85a157ce2054b2304e6d171fa87ae09c363d.zip frameworks_av-d6fd85a157ce2054b2304e6d171fa87ae09c363d.tar.gz frameworks_av-d6fd85a157ce2054b2304e6d171fa87ae09c363d.tar.bz2 | |
Merge "Avoid wp<>::unsafe_get() with a few exceptions"
Diffstat (limited to 'services/audioflinger/AudioFlinger.h')
| -rw-r--r-- | services/audioflinger/AudioFlinger.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h index 50712cf..1a52de5 100644 --- a/services/audioflinger/AudioFlinger.h +++ b/services/audioflinger/AudioFlinger.h @@ -318,7 +318,7 @@ private: // The upper 16 bits are used for track-specific flags. }; - TrackBase(const wp<ThreadBase>& thread, + TrackBase(ThreadBase *thread, const sp<Client>& client, uint32_t sampleRate, audio_format_t format, @@ -591,7 +591,7 @@ private: // playback track class Track : public TrackBase { public: - Track( const wp<ThreadBase>& thread, + Track( PlaybackThread *thread, const sp<Client>& client, audio_stream_type_t streamType, uint32_t sampleRate, @@ -674,7 +674,7 @@ private: class TimedTrack : public Track { public: - static sp<TimedTrack> create(const wp<ThreadBase>& thread, + static sp<TimedTrack> create(PlaybackThread *thread, const sp<Client>& client, audio_stream_type_t streamType, uint32_t sampleRate, @@ -719,7 +719,7 @@ private: void trimTimedBufferQueue_l(); private: - TimedTrack(const wp<ThreadBase>& thread, + TimedTrack(PlaybackThread *thread, const sp<Client>& client, audio_stream_type_t streamType, uint32_t sampleRate, @@ -755,7 +755,7 @@ private: int16_t *mBuffer; }; - OutputTrack( const wp<ThreadBase>& thread, + OutputTrack(PlaybackThread *thread, DuplicatingThread *sourceThread, uint32_t sampleRate, audio_format_t format, @@ -1042,7 +1042,7 @@ private: // record track class RecordTrack : public TrackBase { public: - RecordTrack(const wp<ThreadBase>& thread, + RecordTrack(RecordThread *thread, const sp<Client>& client, uint32_t sampleRate, audio_format_t format, @@ -1168,7 +1168,7 @@ private: // the attached track(s) to accumulate their auxiliary channel. class EffectModule: public RefBase { public: - EffectModule(const wp<ThreadBase>& wThread, + EffectModule(ThreadBase *thread, const wp<AudioFlinger::EffectChain>& chain, effect_descriptor_t *desc, int id, @@ -1353,6 +1353,7 @@ mutable Mutex mLock; // mutex for process, commands and handl class EffectChain: public RefBase { public: EffectChain(const wp<ThreadBase>& wThread, int sessionId); + EffectChain(ThreadBase *thread, int sessionId); virtual ~EffectChain(); // special key used for an entry in mSuspendedEffects keyed vector |