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

Commit 659004c2 authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Add all-channel AudioTrack::setVolume() API"

parents 755e8e1d b1c0993b

include/media/AudioTrack.h

+6 −1
Original line number Diff line number Diff line
@@ -265,9 +265,14 @@ public: 


    /* Set volume for this track, mostly used for games' sound effects

     * left and right volumes. Levels must be >= 0.0 and <= 1.0.

     * This is the older API.  New applications should use setVolume(float) when possible.

     */

            status_t    setVolume(float left, float right);

            void        getVolume(float* left, float* right) const;



    /* Set volume for all channels.  This is the preferred API for new applications,

     * especially for multi-channel content.

     */

            status_t    setVolume(float volume);



    /* Set the send level for this track. An auxiliary effect should be attached

     * to the track with attachEffect(). Level must be >= 0.0 and <= 1.0.

media/libmedia/AudioTrack.cpp

+2 −7
Original line number Diff line number Diff line
@@ -509,14 +509,9 @@ status_t AudioTrack::setVolume(float left, float right) 
    return NO_ERROR;

}



void AudioTrack::getVolume(float* left, float* right) const

status_t AudioTrack::setVolume(float volume)

{

    if (left != NULL) {

        *left  = mVolume[LEFT];

    }

    if (right != NULL) {

        *right = mVolume[RIGHT];

    }

    return setVolume(volume, volume);

}



status_t AudioTrack::setAuxEffectSendLevel(float level)

media/libmedia/ToneGenerator.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1036,7 +1036,7 @@ bool ToneGenerator::initAudioTrack() { 
        goto initAudioTrack_exit;

    }



    mpAudioTrack->setVolume(mVolume, mVolume);

    mpAudioTrack->setVolume(mVolume);



    mState = TONE_INIT;