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

Commit 1a5d8bb0 authored by Shunkai Yao's avatar Shunkai Yao Committed by Gerrit Code Review
Browse files

Merge "EffectModule: Add isEffect to check effect by uuid" into main

parents aaafa175 e90c1e4a

services/audioflinger/Effects.cpp

+5 −0
Original line number Diff line number Diff line
@@ -1578,6 +1578,11 @@ bool EffectModule::isSpatializer() const { 
    return IAfEffectModule::isSpatializer(&mDescriptor.type);

}



bool EffectModule::isEffect(const effect_uuid_t &uuid) const {

    using android::effect::utils::operator==;

    return mDescriptor.uuid == uuid;

}



status_t EffectModule::setHapticScale_l(int id, os::HapticScale hapticScale) {

    if (mStatus != NO_ERROR) {

        return mStatus;

services/audioflinger/Effects.h

+1 −0
Original line number Diff line number Diff line
@@ -235,6 +235,7 @@ public: 


    bool isHapticGenerator() const final;

    bool isSpatializer() const final;

    bool isEffect(const effect_uuid_t &uuid) const;



    status_t setHapticScale_l(int id, os::HapticScale hapticScale) final

            REQUIRES(audio_utils::EffectChain_Mutex) EXCLUDES_EffectBase_Mutex;

services/audioflinger/IAfEffect.h

+1 −0
Original line number Diff line number Diff line
@@ -181,6 +181,7 @@ public: 
    virtual bool isHapticGenerator() const = 0;

    static bool isSpatializer(const effect_uuid_t* type);

    virtual bool isSpatializer() const = 0;

    virtual bool isEffect(const effect_uuid_t &uuid) const = 0;



    virtual status_t setHapticScale_l(int id, os::HapticScale hapticScale)

            REQUIRES(audio_utils::EffectChain_Mutex) EXCLUDES_EffectBase_Mutex = 0;