Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 67313335 authored by Glenn Kasten's avatar Glenn Kasten
Browse files

Effect UUID inputs passed by pointer are const 

Change-Id: I1f5c338bcb7368e3dd8cd5f804b2e6d9fbe087f8
parent a5a6580d

include/media/AudioEffect.h

+1 −1
Original line number Diff line number Diff line
@@ -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*/;

include/media/EffectsFactoryApi.h

+3 −3
Original line number Diff line number Diff line
@@ -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"

include/media/IAudioFlinger.h

+1 −1
Original line number Diff line number Diff line
@@ -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<IEffect> createEffect(pid_t pid,

media/libeffects/factory/EffectsFactory.c

+7 −7
Original line number Diff line number Diff line
@@ -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)

{

media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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;