From 5e92a7861196ddae14638d4b7a63fc4892b7ef59 Mon Sep 17 00:00:00 2001 From: Glenn Kasten Date: Mon, 30 Jan 2012 07:40:52 -0800 Subject: Effect UUID inputs passed by pointer are const Change-Id: I1f5c338bcb7368e3dd8cd5f804b2e6d9fbe087f8 --- include/media/AudioEffect.h | 2 +- include/media/EffectsFactoryApi.h | 6 +++--- include/media/IAudioFlinger.h | 2 +- media/libeffects/factory/EffectsFactory.c | 14 +++++++------- media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp | 4 ++-- media/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp | 4 ++-- media/libeffects/preprocessing/PreProcessing.cpp | 6 +++--- media/libeffects/testlibs/EffectEqualizer.cpp | 4 ++-- media/libeffects/testlibs/EffectReverb.c | 4 ++-- media/libeffects/testlibs/EffectReverb.h | 4 ++-- media/libeffects/visualizer/EffectVisualizer.cpp | 4 ++-- media/libmedia/AudioEffect.cpp | 2 +- media/libmedia/IAudioFlinger.cpp | 2 +- services/audioflinger/AudioFlinger.cpp | 2 +- services/audioflinger/AudioFlinger.h | 2 +- 15 files changed, 31 insertions(+), 31 deletions(-) diff --git a/include/media/AudioEffect.h b/include/media/AudioEffect.h index 4c57ed2..02dfc1b 100644 --- a/include/media/AudioEffect.h +++ b/include/media/AudioEffect.h @@ -108,7 +108,7 @@ public: * Returned value * *descriptor updated with effect descriptor */ - static status_t getEffectDescriptor(effect_uuid_t *uuid, + static status_t getEffectDescriptor(const effect_uuid_t *uuid, effect_descriptor_t *descriptor) /*const*/; diff --git a/include/media/EffectsFactoryApi.h b/include/media/EffectsFactoryApi.h index 8ae13cc..df83995 100644 --- a/include/media/EffectsFactoryApi.h +++ b/include/media/EffectsFactoryApi.h @@ -109,7 +109,7 @@ int EffectQueryEffect(uint32_t index, effect_descriptor_t *pDescriptor); // *pHandle: updated with the effect handle. // //////////////////////////////////////////////////////////////////////////////// -int EffectCreate(effect_uuid_t *pEffectUuid, int32_t sessionId, int32_t ioId, effect_handle_t *pHandle); +int EffectCreate(const effect_uuid_t *pEffectUuid, int32_t sessionId, int32_t ioId, effect_handle_t *pHandle); //////////////////////////////////////////////////////////////////////////////// // @@ -151,7 +151,7 @@ int EffectRelease(effect_handle_t handle); // *pDescriptor: updated with the effect descriptor. // //////////////////////////////////////////////////////////////////////////////// -int EffectGetDescriptor(effect_uuid_t *pEffectUuid, effect_descriptor_t *pDescriptor); +int EffectGetDescriptor(const effect_uuid_t *pEffectUuid, effect_descriptor_t *pDescriptor); //////////////////////////////////////////////////////////////////////////////// // @@ -167,7 +167,7 @@ int EffectGetDescriptor(effect_uuid_t *pEffectUuid, effect_descriptor_t *pDescri // 1 if uuid is equal to EFFECT_UUID_NULL. // //////////////////////////////////////////////////////////////////////////////// -int EffectIsNullUuid(effect_uuid_t *pEffectUuid); +int EffectIsNullUuid(const effect_uuid_t *pEffectUuid); #if __cplusplus } // extern "C" diff --git a/include/media/IAudioFlinger.h b/include/media/IAudioFlinger.h index ba94bad..361cee6 100644 --- a/include/media/IAudioFlinger.h +++ b/include/media/IAudioFlinger.h @@ -146,7 +146,7 @@ public: virtual status_t queryEffect(uint32_t index, effect_descriptor_t *pDescriptor) const = 0; - virtual status_t getEffectDescriptor(effect_uuid_t *pEffectUUID, + virtual status_t getEffectDescriptor(const effect_uuid_t *pEffectUUID, effect_descriptor_t *pDescriptor) const = 0; virtual sp createEffect(pid_t pid, diff --git a/media/libeffects/factory/EffectsFactory.c b/media/libeffects/factory/EffectsFactory.c index 9f6599f..59cd9e3 100644 --- a/media/libeffects/factory/EffectsFactory.c +++ b/media/libeffects/factory/EffectsFactory.c @@ -53,8 +53,8 @@ static int loadEffect(cnode *node); static lib_entry_t *getLibrary(const char *path); static void resetEffectEnumeration(); static uint32_t updateNumEffects(); -static int findEffect(effect_uuid_t *type, - effect_uuid_t *uuid, +static int findEffect(const effect_uuid_t *type, + const effect_uuid_t *uuid, lib_entry_t **lib, effect_descriptor_t **desc); static void dumpEffectDescriptor(effect_descriptor_t *desc, char *str, size_t len); @@ -236,7 +236,7 @@ int EffectQueryEffect(uint32_t index, effect_descriptor_t *pDescriptor) return ret; } -int EffectGetDescriptor(effect_uuid_t *uuid, effect_descriptor_t *pDescriptor) +int EffectGetDescriptor(const effect_uuid_t *uuid, effect_descriptor_t *pDescriptor) { lib_entry_t *l = NULL; effect_descriptor_t *d = NULL; @@ -257,7 +257,7 @@ int EffectGetDescriptor(effect_uuid_t *uuid, effect_descriptor_t *pDescriptor) return ret; } -int EffectCreate(effect_uuid_t *uuid, int32_t sessionId, int32_t ioId, effect_handle_t *pHandle) +int EffectCreate(const effect_uuid_t *uuid, int32_t sessionId, int32_t ioId, effect_handle_t *pHandle) { list_elem_t *e = gLibraryList; lib_entry_t *l = NULL; @@ -372,7 +372,7 @@ exit: return ret; } -int EffectIsNullUuid(effect_uuid_t *uuid) +int EffectIsNullUuid(const effect_uuid_t *uuid) { if (memcmp(uuid, EFFECT_UUID_NULL, sizeof(effect_uuid_t))) { return 0; @@ -628,8 +628,8 @@ uint32_t updateNumEffects() { return cnt; } -int findEffect(effect_uuid_t *type, - effect_uuid_t *uuid, +int findEffect(const effect_uuid_t *type, + const effect_uuid_t *uuid, lib_entry_t **lib, effect_descriptor_t **desc) { diff --git a/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp b/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp index 108d36a..3714283 100644 --- a/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp +++ b/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp @@ -195,7 +195,7 @@ extern "C" int EffectQueryEffect(uint32_t index, effect_descriptor_t *pDescripto return 0; } /* end EffectQueryEffect */ -extern "C" int EffectCreate(effect_uuid_t *uuid, +extern "C" int EffectCreate(const effect_uuid_t *uuid, int32_t sessionId, int32_t ioId, effect_handle_t *pHandle){ @@ -471,7 +471,7 @@ extern "C" int EffectRelease(effect_handle_t handle){ } /* end EffectRelease */ -extern "C" int EffectGetDescriptor(effect_uuid_t *uuid, +extern "C" int EffectGetDescriptor(const effect_uuid_t *uuid, effect_descriptor_t *pDescriptor) { const effect_descriptor_t *desc = NULL; diff --git a/media/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp b/media/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp index 09cd5cc..358357e 100755 --- a/media/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp +++ b/media/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp @@ -210,7 +210,7 @@ extern "C" int EffectQueryEffect(uint32_t index, return 0; } /* end EffectQueryEffect */ -extern "C" int EffectCreate(effect_uuid_t *uuid, +extern "C" int EffectCreate(const effect_uuid_t *uuid, int32_t sessionId, int32_t ioId, effect_handle_t *pHandle){ @@ -317,7 +317,7 @@ extern "C" int EffectRelease(effect_handle_t handle){ return 0; } /* end EffectRelease */ -extern "C" int EffectGetDescriptor(effect_uuid_t *uuid, +extern "C" int EffectGetDescriptor(const effect_uuid_t *uuid, effect_descriptor_t *pDescriptor) { int i; int length = sizeof(gDescriptors) / sizeof(const effect_descriptor_t *); diff --git a/media/libeffects/preprocessing/PreProcessing.cpp b/media/libeffects/preprocessing/PreProcessing.cpp index 9fd6764..4d94a75 100755 --- a/media/libeffects/preprocessing/PreProcessing.cpp +++ b/media/libeffects/preprocessing/PreProcessing.cpp @@ -1072,7 +1072,7 @@ int PreProc_Init() { return sInitStatus; } -const effect_descriptor_t *PreProc_GetDescriptor(effect_uuid_t *uuid) +const effect_descriptor_t *PreProc_GetDescriptor(const effect_uuid_t *uuid) { size_t i; for (i = 0; i < PREPROC_NUM_EFFECTS; i++) { @@ -1568,7 +1568,7 @@ int PreProcessingLib_QueryEffect(uint32_t index, effect_descriptor_t *pDescripto return 0; } -int PreProcessingLib_Create(effect_uuid_t *uuid, +int PreProcessingLib_Create(const effect_uuid_t *uuid, int32_t sessionId, int32_t ioId, effect_handle_t *pInterface) @@ -1620,7 +1620,7 @@ int PreProcessingLib_Release(effect_handle_t interface) return Session_ReleaseEffect(fx->session, fx); } -int PreProcessingLib_GetDescriptor(effect_uuid_t *uuid, +int PreProcessingLib_GetDescriptor(const effect_uuid_t *uuid, effect_descriptor_t *pDescriptor) { if (pDescriptor == NULL || uuid == NULL){ diff --git a/media/libeffects/testlibs/EffectEqualizer.cpp b/media/libeffects/testlibs/EffectEqualizer.cpp index 5241660..35a4a61 100644 --- a/media/libeffects/testlibs/EffectEqualizer.cpp +++ b/media/libeffects/testlibs/EffectEqualizer.cpp @@ -140,7 +140,7 @@ extern "C" int EffectQueryEffect(uint32_t index, return 0; } /* end EffectQueryNext */ -extern "C" int EffectCreate(effect_uuid_t *uuid, +extern "C" int EffectCreate(const effect_uuid_t *uuid, int32_t sessionId, int32_t ioId, effect_handle_t *pHandle) { @@ -195,7 +195,7 @@ extern "C" int EffectRelease(effect_handle_t handle) { return 0; } /* end EffectRelease */ -extern "C" int EffectGetDescriptor(effect_uuid_t *uuid, +extern "C" int EffectGetDescriptor(const effect_uuid_t *uuid, effect_descriptor_t *pDescriptor) { if (pDescriptor == NULL || uuid == NULL){ diff --git a/media/libeffects/testlibs/EffectReverb.c b/media/libeffects/testlibs/EffectReverb.c index ebb72c1..8351712 100644 --- a/media/libeffects/testlibs/EffectReverb.c +++ b/media/libeffects/testlibs/EffectReverb.c @@ -111,7 +111,7 @@ int EffectQueryEffect(uint32_t index, effect_descriptor_t *pDescriptor) { return 0; } -int EffectCreate(effect_uuid_t *uuid, +int EffectCreate(const effect_uuid_t *uuid, int32_t sessionId, int32_t ioId, effect_handle_t *pHandle) { @@ -182,7 +182,7 @@ int EffectRelease(effect_handle_t handle) { return 0; } -int EffectGetDescriptor(effect_uuid_t *uuid, +int EffectGetDescriptor(const effect_uuid_t *uuid, effect_descriptor_t *pDescriptor) { int i; int length = sizeof(gDescriptors) / sizeof(const effect_descriptor_t *); diff --git a/media/libeffects/testlibs/EffectReverb.h b/media/libeffects/testlibs/EffectReverb.h index 5137074..1fb14a7 100644 --- a/media/libeffects/testlibs/EffectReverb.h +++ b/media/libeffects/testlibs/EffectReverb.h @@ -303,12 +303,12 @@ typedef struct reverb_module_s { int EffectQueryNumberEffects(uint32_t *pNumEffects); int EffectQueryEffect(uint32_t index, effect_descriptor_t *pDescriptor); -int EffectCreate(effect_uuid_t *effectUID, +int EffectCreate(const effect_uuid_t *effectUID, int32_t sessionId, int32_t ioId, effect_handle_t *pHandle); int EffectRelease(effect_handle_t handle); -int EffectGetDescriptor(effect_uuid_t *uuid, +int EffectGetDescriptor(const effect_uuid_t *uuid, effect_descriptor_t *pDescriptor); static int Reverb_Process(effect_handle_t self, diff --git a/media/libeffects/visualizer/EffectVisualizer.cpp b/media/libeffects/visualizer/EffectVisualizer.cpp index 5d70a9b..51c8b68 100644 --- a/media/libeffects/visualizer/EffectVisualizer.cpp +++ b/media/libeffects/visualizer/EffectVisualizer.cpp @@ -190,7 +190,7 @@ int VisualizerLib_QueryEffect(uint32_t index, return 0; } -int VisualizerLib_Create(effect_uuid_t *uuid, +int VisualizerLib_Create(const effect_uuid_t *uuid, int32_t sessionId, int32_t ioId, effect_handle_t *pHandle) { @@ -240,7 +240,7 @@ int VisualizerLib_Release(effect_handle_t handle) { return 0; } -int VisualizerLib_GetDescriptor(effect_uuid_t *uuid, +int VisualizerLib_GetDescriptor(const effect_uuid_t *uuid, effect_descriptor_t *pDescriptor) { if (pDescriptor == NULL || uuid == NULL){ diff --git a/media/libmedia/AudioEffect.cpp b/media/libmedia/AudioEffect.cpp index bfa093d..6549ce6 100644 --- a/media/libmedia/AudioEffect.cpp +++ b/media/libmedia/AudioEffect.cpp @@ -412,7 +412,7 @@ status_t AudioEffect::queryEffect(uint32_t index, effect_descriptor_t *descripto return af->queryEffect(index, descriptor); } -status_t AudioEffect::getEffectDescriptor(effect_uuid_t *uuid, +status_t AudioEffect::getEffectDescriptor(const effect_uuid_t *uuid, effect_descriptor_t *descriptor) /*const*/ { const sp& af = AudioSystem::get_audio_flinger(); diff --git a/media/libmedia/IAudioFlinger.cpp b/media/libmedia/IAudioFlinger.cpp index 29b61df..f6cf5ae 100644 --- a/media/libmedia/IAudioFlinger.cpp +++ b/media/libmedia/IAudioFlinger.cpp @@ -582,7 +582,7 @@ public: return NO_ERROR; } - virtual status_t getEffectDescriptor(effect_uuid_t *pUuid, + virtual status_t getEffectDescriptor(const effect_uuid_t *pUuid, effect_descriptor_t *pDescriptor) const { if (pUuid == NULL || pDescriptor == NULL) { diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index 3cd094b..43b7245 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -5382,7 +5382,7 @@ status_t AudioFlinger::queryEffect(uint32_t index, effect_descriptor_t *descript return EffectQueryEffect(index, descriptor); } -status_t AudioFlinger::getEffectDescriptor(effect_uuid_t *pUuid, +status_t AudioFlinger::getEffectDescriptor(const effect_uuid_t *pUuid, effect_descriptor_t *descriptor) const { Mutex::Autolock _l(mLock); diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h index f63c9ec..eca7eb8 100644 --- a/services/audioflinger/AudioFlinger.h +++ b/services/audioflinger/AudioFlinger.h @@ -151,7 +151,7 @@ public: virtual status_t queryEffect(uint32_t index, effect_descriptor_t *descriptor) const; - virtual status_t getEffectDescriptor(effect_uuid_t *pUuid, + virtual status_t getEffectDescriptor(const effect_uuid_t *pUuid, effect_descriptor_t *descriptor) const; virtual sp createEffect(pid_t pid, -- cgit v1.1