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

Commit c22b754f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "mediaplayer2: rename getMediaPlayer2State to getState"

parents d20ad8ff 1f043e44

media/libmediaplayer2/include/mediaplayer2/MediaPlayer2Types.h

+5 −5
Original line number Diff line number Diff line
@@ -150,11 +150,11 @@ enum media2_info_type { 


// Do not change these values without updating their counterparts in MediaPlayer2.java

enum mediaplayer2_states {

    MEDIAPLAYER2_STATE_IDLE         = 1,

    MEDIAPLAYER2_STATE_PREPARED     = 2,

    MEDIAPLAYER2_STATE_PLAYING      = 3,

    MEDIAPLAYER2_STATE_PAUSED       = 4,

    MEDIAPLAYER2_STATE_ERROR        = 5,

    MEDIAPLAYER2_STATE_IDLE         = 1001,

    MEDIAPLAYER2_STATE_PREPARED     = 1002,

    MEDIAPLAYER2_STATE_PLAYING      = 1003,

    MEDIAPLAYER2_STATE_PAUSED       = 1004,

    MEDIAPLAYER2_STATE_ERROR        = 1005,

};



enum media_player2_internal_states {

media/libmediaplayer2/include/mediaplayer2/mediaplayer2.h

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ public: 
            status_t        stop();

            status_t        pause();

            bool            isPlaying();

            mediaplayer2_states getMediaPlayer2State();

            mediaplayer2_states getState();

            status_t        setPlaybackSettings(const AudioPlaybackRate& rate);

            status_t        getPlaybackSettings(AudioPlaybackRate* rate /* nonnull */);

            status_t        setSyncSettings(const AVSyncSettings& sync, float videoFpsHint);

media/libmediaplayer2/mediaplayer2.cpp

+1 −1
Original line number Diff line number Diff line
@@ -860,7 +860,7 @@ bool MediaPlayer2::isPlaying() { 
    return false;

}



mediaplayer2_states MediaPlayer2::getMediaPlayer2State() {

mediaplayer2_states MediaPlayer2::getState() {

    Mutex::Autolock _l(mLock);

    if (mCurrentState & MEDIA_PLAYER2_STATE_ERROR) {

        return MEDIAPLAYER2_STATE_ERROR;