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

Commit d10a5992 authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge "audio policy: use audio_devices_t when appropriate"

parents a4ef63f6 c9ab9f5c

include/media/AudioSystem.h

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ public: 
                                         audio_devices_t device);



    static uint32_t getStrategyForStream(audio_stream_type_t stream);

    static uint32_t getDevicesForStream(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,

include/media/IAudioPolicyService.h

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ public: 
                                          int *index,

                                          audio_devices_t device) = 0;

    virtual uint32_t getStrategyForStream(audio_stream_type_t stream) = 0;

    virtual uint32_t getDevicesForStream(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,

                                    audio_io_handle_t io,

media/libmedia/AudioSystem.cpp

+2 −2
Original line number Diff line number Diff line
@@ -701,10 +701,10 @@ uint32_t AudioSystem::getStrategyForStream(audio_stream_type_t stream) 
    return aps->getStrategyForStream(stream);

}



uint32_t AudioSystem::getDevicesForStream(audio_stream_type_t stream)

audio_devices_t AudioSystem::getDevicesForStream(audio_stream_type_t stream)

{

    const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();

    if (aps == 0) return 0;

    if (aps == 0) return (audio_devices_t)0;

    return aps->getDevicesForStream(stream);

}

media/libmedia/IAudioPolicyService.cpp

+2 −2
Original line number Diff line number Diff line
@@ -267,13 +267,13 @@ public: 
        return reply.readInt32();

    }



    virtual uint32_t getDevicesForStream(audio_stream_type_t stream)

    virtual audio_devices_t getDevicesForStream(audio_stream_type_t stream)

    {

        Parcel data, reply;

        data.writeInterfaceToken(IAudioPolicyService::getInterfaceDescriptor());

        data.writeInt32(static_cast <uint32_t>(stream));

        remote()->transact(GET_DEVICES_FOR_STREAM, data, &reply);

        return (uint32_t) reply.readInt32();

        return (audio_devices_t) reply.readInt32();

    }



    virtual audio_io_handle_t getOutputForEffect(effect_descriptor_t *desc)

services/audioflinger/AudioPolicyService.cpp

+4 −2
Original line number Diff line number Diff line
@@ -432,10 +432,12 @@ uint32_t AudioPolicyService::getStrategyForStream(audio_stream_type_t stream) 
    return mpAudioPolicy->get_strategy_for_stream(mpAudioPolicy, stream);

}



uint32_t AudioPolicyService::getDevicesForStream(audio_stream_type_t stream)

//audio policy: use audio_device_t appropriately



audio_devices_t AudioPolicyService::getDevicesForStream(audio_stream_type_t stream)

{

    if (mpAudioPolicy == NULL) {

        return 0;

        return (audio_devices_t)0;

    }

    return mpAudioPolicy->get_devices_for_stream(mpAudioPolicy, stream);

}