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

Commit 41d8d8e7 authored by Glenn Kasten's avatar Glenn Kasten Committed by Android Git Automerger
Browse files

am 57216ca4: Merge "Track volume should be maintained even if track is restored" into lmp-mr1-dev 

* commit '57216ca4':
  Track volume should be maintained even if track is restored
parents 668b0550 57216ca4

media/libmedia/AudioTrack.cpp

+5 −1
Original line number Diff line number Diff line
@@ -1226,7 +1226,11 @@ status_t AudioTrack::createTrack_l() 
        mStaticProxy = new StaticAudioTrackClientProxy(cblk, buffers, frameCount, mFrameSizeAF);

        mProxy = mStaticProxy;

    }

    mProxy->setVolumeLR(GAIN_MINIFLOAT_PACKED_UNITY);



    mProxy->setVolumeLR(gain_minifloat_pack(

            gain_from_float(mVolume[AUDIO_INTERLEAVE_LEFT]),

            gain_from_float(mVolume[AUDIO_INTERLEAVE_RIGHT])));



    mProxy->setSendLevel(mSendLevel);

    mProxy->setSampleRate(mSampleRate);

    mProxy->setMinimum(mNotificationFramesAct);