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

Commit 58e5aa34 authored by Glenn Kasten's avatar Glenn Kasten
Browse files

effect_descriptor_t const correctness 

Change-Id: Iad008f20d35a18acf500f773900164552fd0c19e
parent 1d491ff0

include/media/AudioSystem.h

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

include/media/IAudioPolicyService.h

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

media/libmedia/AudioSystem.cpp

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

media/libmedia/IAudioPolicyService.cpp

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

services/audioflinger/AudioFlinger.h

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