From c94dccc97cc3ed5171b45f46a0f7f8762d37156f Mon Sep 17 00:00:00 2001 From: Glenn Kasten Date: Tue, 24 Jul 2012 07:51:26 -0700 Subject: effect_descriptor_t const correctness Change-Id: I734155d4cebb22b180f25290332c7c48be1e2b36 --- audio/AudioPolicyManagerBase.cpp | 4 ++-- audio/audio_policy_hal.cpp | 4 ++-- include/hardware_legacy/AudioPolicyInterface.h | 4 ++-- include/hardware_legacy/AudioPolicyManagerBase.h | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/audio/AudioPolicyManagerBase.cpp b/audio/AudioPolicyManagerBase.cpp index d0adb3a..982114d 100644 --- a/audio/AudioPolicyManagerBase.cpp +++ b/audio/AudioPolicyManagerBase.cpp @@ -1007,7 +1007,7 @@ status_t AudioPolicyManagerBase::getStreamVolumeIndex(AudioSystem::stream_type s return NO_ERROR; } -audio_io_handle_t AudioPolicyManagerBase::getOutputForEffect(effect_descriptor_t *desc) +audio_io_handle_t AudioPolicyManagerBase::getOutputForEffect(const effect_descriptor_t *desc) { ALOGV("getOutputForEffect()"); // apply simple rule where global effects are attached to the same output as MUSIC streams @@ -1025,7 +1025,7 @@ audio_io_handle_t AudioPolicyManagerBase::getOutputForEffect(effect_descriptor_t return dstOutputs[outIdx]; } -status_t AudioPolicyManagerBase::registerEffect(effect_descriptor_t *desc, +status_t AudioPolicyManagerBase::registerEffect(const effect_descriptor_t *desc, audio_io_handle_t io, uint32_t strategy, int session, diff --git a/audio/audio_policy_hal.cpp b/audio/audio_policy_hal.cpp index e855c03..9e29bc4 100644 --- a/audio/audio_policy_hal.cpp +++ b/audio/audio_policy_hal.cpp @@ -266,14 +266,14 @@ static audio_devices_t ap_get_devices_for_stream(const struct audio_policy *pol, } static audio_io_handle_t ap_get_output_for_effect(struct audio_policy *pol, - struct effect_descriptor_s *desc) + const struct effect_descriptor_s *desc) { struct legacy_audio_policy *lap = to_lap(pol); return lap->apm->getOutputForEffect(desc); } static int ap_register_effect(struct audio_policy *pol, - struct effect_descriptor_s *desc, + const struct effect_descriptor_s *desc, audio_io_handle_t io, uint32_t strategy, int session, diff --git a/include/hardware_legacy/AudioPolicyInterface.h b/include/hardware_legacy/AudioPolicyInterface.h index 343f133..adb2db6 100644 --- a/include/hardware_legacy/AudioPolicyInterface.h +++ b/include/hardware_legacy/AudioPolicyInterface.h @@ -147,8 +147,8 @@ public: virtual audio_devices_t getDevicesForStream(AudioSystem::stream_type stream) = 0; // Audio effect management - 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/include/hardware_legacy/AudioPolicyManagerBase.h b/include/hardware_legacy/AudioPolicyManagerBase.h index 1ab9431..dab8b85 100644 --- a/include/hardware_legacy/AudioPolicyManagerBase.h +++ b/include/hardware_legacy/AudioPolicyManagerBase.h @@ -123,8 +123,8 @@ public: // return the enabled output devices for the given stream type virtual audio_devices_t getDevicesForStream(AudioSystem::stream_type 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, -- cgit v1.1