diff options
| -rw-r--r-- | include/media/AudioSystem.h | 4 | ||||
| -rw-r--r-- | include/media/IAudioPolicyService.h | 4 | ||||
| -rw-r--r-- | media/libmedia/AudioSystem.cpp | 4 | ||||
| -rw-r--r-- | media/libmedia/IAudioPolicyService.cpp | 4 | ||||
| -rw-r--r-- | services/audioflinger/AudioFlinger.h | 4 | ||||
| -rw-r--r-- | services/audioflinger/AudioPolicyService.cpp | 4 | ||||
| -rw-r--r-- | services/audioflinger/AudioPolicyService.h | 4 |
7 files changed, 14 insertions, 14 deletions
diff --git a/include/media/AudioSystem.h b/include/media/AudioSystem.h index 61d62b0..932482b 100644 --- a/include/media/AudioSystem.h +++ b/include/media/AudioSystem.h @@ -219,8 +219,8 @@ public: static uint32_t getStrategyForStream(audio_stream_type_t stream); static audio_devices_t getDevicesForStream(audio_stream_type_t stream); - static audio_io_handle_t getOutputForEffect(effect_descriptor_t *desc); - static status_t registerEffect(effect_descriptor_t *desc, + static audio_io_handle_t getOutputForEffect(const effect_descriptor_t *desc); + static status_t registerEffect(const effect_descriptor_t *desc, audio_io_handle_t io, uint32_t strategy, int session, diff --git a/include/media/IAudioPolicyService.h b/include/media/IAudioPolicyService.h index bdc12db..fb556af 100644 --- a/include/media/IAudioPolicyService.h +++ b/include/media/IAudioPolicyService.h @@ -79,8 +79,8 @@ public: audio_devices_t device) = 0; virtual uint32_t getStrategyForStream(audio_stream_type_t stream) = 0; virtual audio_devices_t getDevicesForStream(audio_stream_type_t stream) = 0; - virtual audio_io_handle_t getOutputForEffect(effect_descriptor_t *desc) = 0; - virtual status_t registerEffect(effect_descriptor_t *desc, + virtual audio_io_handle_t getOutputForEffect(const effect_descriptor_t *desc) = 0; + virtual status_t registerEffect(const effect_descriptor_t *desc, audio_io_handle_t io, uint32_t strategy, int session, diff --git a/media/libmedia/AudioSystem.cpp b/media/libmedia/AudioSystem.cpp index d880989..6e0c620 100644 --- a/media/libmedia/AudioSystem.cpp +++ b/media/libmedia/AudioSystem.cpp @@ -694,14 +694,14 @@ audio_devices_t AudioSystem::getDevicesForStream(audio_stream_type_t stream) return aps->getDevicesForStream(stream); } -audio_io_handle_t AudioSystem::getOutputForEffect(effect_descriptor_t *desc) +audio_io_handle_t AudioSystem::getOutputForEffect(const effect_descriptor_t *desc) { const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service(); if (aps == 0) return PERMISSION_DENIED; return aps->getOutputForEffect(desc); } -status_t AudioSystem::registerEffect(effect_descriptor_t *desc, +status_t AudioSystem::registerEffect(const effect_descriptor_t *desc, audio_io_handle_t io, uint32_t strategy, int session, diff --git a/media/libmedia/IAudioPolicyService.cpp b/media/libmedia/IAudioPolicyService.cpp index f0c0f2e..31c5d27 100644 --- a/media/libmedia/IAudioPolicyService.cpp +++ b/media/libmedia/IAudioPolicyService.cpp @@ -274,7 +274,7 @@ public: return (audio_devices_t) reply.readInt32(); } - virtual audio_io_handle_t getOutputForEffect(effect_descriptor_t *desc) + virtual audio_io_handle_t getOutputForEffect(const effect_descriptor_t *desc) { Parcel data, reply; data.writeInterfaceToken(IAudioPolicyService::getInterfaceDescriptor()); @@ -283,7 +283,7 @@ public: return static_cast <audio_io_handle_t> (reply.readInt32()); } - virtual status_t registerEffect(effect_descriptor_t *desc, + virtual status_t registerEffect(const effect_descriptor_t *desc, audio_io_handle_t io, uint32_t strategy, int session, 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, |