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

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

Merge "Remove unused code"

parents aedd3daf e096621f

include/media/mediaplayer.h

+0 −1
Original line number Diff line number Diff line
@@ -215,7 +215,6 @@ public: 
                    const KeyedVector<String8, String8> *headers);



            status_t        setDataSource(int fd, int64_t offset, int64_t length);

            status_t        setDataSource(const sp<IStreamSource> &source);

            status_t        setDataSource(const sp<IDataSource> &source);

            status_t        setVideoSurfaceTexture(

                                    const sp<IGraphicBufferProducer>& bufferProducer);

media/libmedia/mediaplayer.cpp

+0 −16
Original line number Diff line number Diff line
@@ -181,22 +181,6 @@ status_t MediaPlayer::setDataSource(int fd, int64_t offset, int64_t length) 
    return err;

}



status_t MediaPlayer::setDataSource(const sp<IStreamSource> &source)

{

    ALOGV("setDataSource");

    status_t err = UNKNOWN_ERROR;

    const sp<IMediaPlayerService>& service(getMediaPlayerService());

    if (service != 0) {

        sp<IMediaPlayer> player(service->create(this, mAudioSessionId));

        if ((NO_ERROR != doSetRetransmitEndpoint(player)) ||

            (NO_ERROR != player->setDataSource(source))) {

            player.clear();

        }

        err = attachNewPlayer(player);

    }

    return err;

}



status_t MediaPlayer::setDataSource(const sp<IDataSource> &source)

{

    ALOGV("setDataSource(IDataSource)");