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

Commit ba0790bf authored by Marco Nelissen's avatar Marco Nelissen Committed by Android (Google) Code Review
Browse files

Merge "Don't autoloop notifications" into lmp-mr1-dev

parents 993d57ec 707eadef

media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp

+10 −0
Original line number Diff line number Diff line
@@ -628,6 +628,16 @@ void NuPlayerDriver::notifyListener_l( 
        case MEDIA_PLAYBACK_COMPLETE:

        {

            if (mState != STATE_RESET_IN_PROGRESS) {

                if (mAutoLoop) {

                    audio_stream_type_t streamType = AUDIO_STREAM_MUSIC;

                    if (mAudioSink != NULL) {

                        streamType = mAudioSink->getAudioStreamType();

                    }

                    if (streamType == AUDIO_STREAM_NOTIFICATION) {

                        ALOGW("disabling auto-loop for notification");

                        mAutoLoop = false;

                    }

                }

                if (mLooping || (mAutoLoop

                        && (mAudioSink == NULL || mAudioSink->realtime()))) {

                    mPlayer->seekToAsync(0);

media/libstagefright/AwesomePlayer.cpp

+10 −0
Original line number Diff line number Diff line
@@ -878,6 +878,16 @@ void AwesomePlayer::onStreamDone() { 
        return;

    }



    if (mFlags & AUTO_LOOPING) {

        audio_stream_type_t streamType = AUDIO_STREAM_MUSIC;

        if (mAudioSink != NULL) {

            streamType = mAudioSink->getAudioStreamType();

        }

        if (streamType == AUDIO_STREAM_NOTIFICATION) {

            ALOGW("disabling auto-loop for notification");

            modifyFlags(AUTO_LOOPING, CLEAR);

        }

    }

    if ((mFlags & LOOPING)

            || ((mFlags & AUTO_LOOPING)

                && (mAudioSink == NULL || mAudioSink->realtime()))) {