diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-06-20 14:08:14 -0700 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2012-07-25 14:43:19 -0700 |
| commit | 58e5aa34f01d663654d8bafad65db1dda42161ff (patch) | |
| tree | 706a80113457f48feae3eab9f8720bcc3da2b397 /services | |
| parent | 1d491ff06f4b9c90ff24fe953b90d0843eaf1c04 (diff) | |
| download | frameworks_av-58e5aa34f01d663654d8bafad65db1dda42161ff.zip frameworks_av-58e5aa34f01d663654d8bafad65db1dda42161ff.tar.gz frameworks_av-58e5aa34f01d663654d8bafad65db1dda42161ff.tar.bz2 | |
effect_descriptor_t const correctness
Change-Id: Iad008f20d35a18acf500f773900164552fd0c19e
Diffstat (limited to 'services')
| -rw-r--r-- | services/audioflinger/AudioFlinger.h | 4 | ||||
| -rw-r--r-- | services/audioflinger/AudioPolicyService.cpp | 4 | ||||
| -rw-r--r-- | services/audioflinger/AudioPolicyService.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h index 2945417..5190ab1 100644 --- a/services/audioflinger/AudioFlinger.h +++ b/services/audioflinger/AudioFlinger.h @@ -1576,7 +1576,7 @@ private: size_t disconnect(EffectHandle *handle, bool unpinIfLast); size_t removeHandle(EffectHandle *handle); - effect_descriptor_t& desc() { return mDescriptor; } + const effect_descriptor_t& desc() const { return mDescriptor; } wp<EffectChain>& chain() { return mChain; } status_t setDevice(audio_devices_t device); @@ -1615,7 +1615,7 @@ mutable Mutex mLock; // mutex for process, commands and handl wp<EffectChain> mChain; // parent effect chain const int mId; // this instance unique ID const int mSessionId; // audio session ID - effect_descriptor_t mDescriptor;// effect descriptor received from effect engine + const effect_descriptor_t mDescriptor;// effect descriptor received from effect engine effect_config_t mConfig; // input and output audio configuration effect_handle_t mEffectInterface; // Effect module C API status_t mStatus; // initialization status diff --git a/services/audioflinger/AudioPolicyService.cpp b/services/audioflinger/AudioPolicyService.cpp index 1cf5448..3a2dbe2 100644 --- a/services/audioflinger/AudioPolicyService.cpp +++ b/services/audioflinger/AudioPolicyService.cpp @@ -441,7 +441,7 @@ audio_devices_t AudioPolicyService::getDevicesForStream(audio_stream_type_t stre return mpAudioPolicy->get_devices_for_stream(mpAudioPolicy, stream); } -audio_io_handle_t AudioPolicyService::getOutputForEffect(effect_descriptor_t *desc) +audio_io_handle_t AudioPolicyService::getOutputForEffect(const effect_descriptor_t *desc) { if (mpAudioPolicy == NULL) { return NO_INIT; @@ -450,7 +450,7 @@ audio_io_handle_t AudioPolicyService::getOutputForEffect(effect_descriptor_t *de return mpAudioPolicy->get_output_for_effect(mpAudioPolicy, desc); } -status_t AudioPolicyService::registerEffect(effect_descriptor_t *desc, +status_t AudioPolicyService::registerEffect(const effect_descriptor_t *desc, audio_io_handle_t io, uint32_t strategy, int session, diff --git a/services/audioflinger/AudioPolicyService.h b/services/audioflinger/AudioPolicyService.h index 7c6fa74..a086734 100644 --- a/services/audioflinger/AudioPolicyService.h +++ b/services/audioflinger/AudioPolicyService.h @@ -95,8 +95,8 @@ public: virtual uint32_t getStrategyForStream(audio_stream_type_t stream); virtual audio_devices_t getDevicesForStream(audio_stream_type_t stream); - virtual audio_io_handle_t getOutputForEffect(effect_descriptor_t *desc); - virtual status_t registerEffect(effect_descriptor_t *desc, + virtual audio_io_handle_t getOutputForEffect(const effect_descriptor_t *desc); + virtual status_t registerEffect(const effect_descriptor_t *desc, audio_io_handle_t io, uint32_t strategy, int session, |