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

Commit 61caee3c authored by Eric Laurent's avatar Eric Laurent Committed by android-build-merger
Browse files

Merge "soundpool: fix muted channel" into pi-dev 

am: a57290a4

Change-Id: I515daf6e8d2042f950fcf152242de90be6545a33
parents 3a8ddbcc a57290a4

media/jni/soundpool/SoundPool.cpp

+5 −1
Original line number Diff line number Diff line
@@ -809,7 +809,11 @@ void SoundChannel::play(const sp<Sample>& sample, int nextChannelID, float leftV 
            mAudioTrack = newTrack;

            ALOGV("using new track %p for sample %d", newTrack.get(), sample->sampleID());

        }

        if (mMuted) {

            newTrack->setVolume(0.0f, 0.0f);

        } else {

            newTrack->setVolume(leftVolume, rightVolume);

        }

        newTrack->setLoop(0, frameCount, loop);

        mPos = 0;

        mSample = sample;