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

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

Rename setStreamOutput to invalidateStream 

And simplify by removing the unused I/O handle parameter 'output'.

Change-Id: Ie9c4df17a7378066312d4ed8790fda7a9125c95e
parent 33ca5cf8

include/media/IAudioFlinger.h

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ public: 
                                        audio_channel_mask_t *pChannelMask) = 0;

    virtual status_t closeInput(audio_io_handle_t input) = 0;



    virtual status_t setStreamOutput(audio_stream_type_t stream, audio_io_handle_t output) = 0;

    virtual status_t invalidateStream(audio_stream_type_t stream) = 0;



    virtual status_t setVoiceVolume(float volume) = 0;

media/libmedia/IAudioFlinger.cpp

+6 −8
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ enum { 
    RESTORE_OUTPUT,

    OPEN_INPUT,

    CLOSE_INPUT,

    SET_STREAM_OUTPUT,

    INVALIDATE_STREAM,

    SET_VOICE_VOLUME,

    GET_RENDER_POSITION,

    GET_INPUT_FRAMES_LOST,
@@ -545,13 +545,12 @@ public: 
        return reply.readInt32();

    }



    virtual status_t setStreamOutput(audio_stream_type_t stream, audio_io_handle_t output)

    virtual status_t invalidateStream(audio_stream_type_t stream)

    {

        Parcel data, reply;

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

        data.writeInt32((int32_t) stream);

        data.writeInt32((int32_t) output);

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

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

        return reply.readInt32();

    }
@@ -1044,11 +1043,10 @@ status_t BnAudioFlinger::onTransact( 
            reply->writeInt32(closeInput((audio_io_handle_t) data.readInt32()));

            return NO_ERROR;

        } break;

        case SET_STREAM_OUTPUT: {

        case INVALIDATE_STREAM: {

            CHECK_INTERFACE(IAudioFlinger, data, reply);

            uint32_t stream = data.readInt32();

            audio_io_handle_t output = (audio_io_handle_t) data.readInt32();

            reply->writeInt32(setStreamOutput((audio_stream_type_t) stream, output));

            audio_stream_type_t stream = (audio_stream_type_t) data.readInt32();

            reply->writeInt32(invalidateStream(stream));

            return NO_ERROR;

        } break;

        case SET_VOICE_VOLUME: {

services/audioflinger/AudioFlinger.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1940,10 +1940,10 @@ status_t AudioFlinger::closeInput_nonvirtual(audio_io_handle_t input) 
    return NO_ERROR;

}



status_t AudioFlinger::setStreamOutput(audio_stream_type_t stream, audio_io_handle_t output)

status_t AudioFlinger::invalidateStream(audio_stream_type_t stream)

{

    Mutex::Autolock _l(mLock);

    ALOGV("setStreamOutput() stream %d to output %d", stream, output);

    ALOGV("invalidateStream() stream %d", stream);



    for (size_t i = 0; i < mPlaybackThreads.size(); i++) {

        PlaybackThread *thread = mPlaybackThreads.valueAt(i).get();

services/audioflinger/AudioFlinger.h

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ public: 


    virtual status_t closeInput(audio_io_handle_t input);



    virtual status_t setStreamOutput(audio_stream_type_t stream, audio_io_handle_t output);

    virtual status_t invalidateStream(audio_stream_type_t stream);



    virtual status_t setVoiceVolume(float volume);

services/audioflinger/AudioPolicyService.cpp

+3 −4
Original line number Diff line number Diff line
@@ -1598,15 +1598,14 @@ static int aps_close_input(void *service __unused, audio_io_handle_t input) 
    return af->closeInput(input);

}



static int aps_set_stream_output(void *service __unused, audio_stream_type_t stream,

                                     audio_io_handle_t output)

static int aps_invalidate_stream(void *service __unused, audio_stream_type_t stream)

{

    sp<IAudioFlinger> af = AudioSystem::get_audio_flinger();

    if (af == 0) {

        return PERMISSION_DENIED;

    }



    return af->setStreamOutput(stream, output);

    return af->invalidateStream(stream);

}



static int aps_move_effects(void *service __unused, int session,
@@ -1680,7 +1679,7 @@ namespace { 
        .open_input            = aps_open_input,

        .close_input           = aps_close_input,

        .set_stream_volume     = aps_set_stream_volume,

        .set_stream_output     = aps_set_stream_output,

        .invalidate_stream     = aps_invalidate_stream,

        .set_parameters        = aps_set_parameters,

        .get_parameters        = aps_get_parameters,

        .start_tone            = aps_start_tone,