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

Commit 980a962d authored by Tomislav Novak's avatar Tomislav Novak
Browse files

libaudioclient: Add accessors for AudioTrack to TrackPlayerBase 

This allows us to change the type of mAudioTrack later without breaking
the build.

Test: trackplayerbase_tests
Change-Id: If4d5731adb0e6ad3d7f10d9f73bb1a0d3e33662b
parent 97138efc

media/libaudioclient/include/media/TrackPlayerBase.h

+5 −1
Original line number Diff line number Diff line
@@ -37,7 +37,11 @@ public: 
            const media::VolumeShaperConfiguration& configuration,

            const media::VolumeShaperOperation& operation);



    //FIXME move to protected field, so far made public to minimize changes to AudioTrack logic

    sp<AudioTrack> getAudioTrack() { return mAudioTrack; }



    void clearAudioTrack() { mAudioTrack.clear(); }



    // FIXME: make private once all users switch to getAudioTrack()

    sp<AudioTrack> mAudioTrack;



            void setPlayerVolume(float vl, float vr);

media/libaudioclient/tests/trackplayerbase_tests.cpp

+2 −2
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ class TrackPlayerBaseTest 
        mPlayer = new TrackPlayer();

        mPlayer->init(track.get(), mPlayer, PLAYER_TYPE_AAUDIO, AUDIO_USAGE_MEDIA,

                      AUDIO_SESSION_NONE);

        sp<AudioTrack> playerTrack = mPlayer->mAudioTrack;

        sp<AudioTrack> playerTrack = mPlayer->getAudioTrack();

        ASSERT_EQ(playerTrack->initCheck(), NO_ERROR);



        mBufferSize = mFrameCount * playerTrack->frameSize();
@@ -74,7 +74,7 @@ class TrackPlayerBaseTest 


    void playBuffer() {

        bool blocking = true;

        ssize_t nbytes = mPlayer->mAudioTrack->write(mBuffer.data(), mBufferSize, blocking);

        ssize_t nbytes = mPlayer->getAudioTrack()->write(mBuffer.data(), mBufferSize, blocking);

        EXPECT_EQ(nbytes, mBufferSize) << "Did not write all data in blocking mode";

    }