From 91ebb5db467aba2e59ea913dfca08b191fa5b766 Mon Sep 17 00:00:00 2001 From: xiongziliang <771730766@qq.com> Date: Mon, 14 Aug 2017 22:20:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=8B=BC=E5=86=99=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Player/PlayerBase.h | 8 ++++---- src/Rtmp/RtmpPlayerImp.h | 4 ++-- src/Rtsp/RtspPlayerImp.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Player/PlayerBase.h b/src/Player/PlayerBase.h index f68cfd0e..6cf0fde6 100644 --- a/src/Player/PlayerBase.h +++ b/src/Player/PlayerBase.h @@ -58,7 +58,7 @@ public: virtual bool containVideo() const { return false; }; virtual bool isInited() const { return true; }; virtual float getDuration() const { return 0;}; - virtual float getProgresss() const { return 0;}; + virtual float getProgress() const { return 0;}; virtual void seekTo(float fProgress) {}; @@ -184,11 +184,11 @@ public: } return PlayerBase::getDuration(); } - float getProgresss() const override{ + float getProgress() const override{ if (m_parser) { - return m_parser->getProgresss(); + return m_parser->getProgress(); } - return PlayerBase::getProgresss(); + return PlayerBase::getProgress(); }; void seekTo(float fProgress) override{ if (m_parser) { diff --git a/src/Rtmp/RtmpPlayerImp.h b/src/Rtmp/RtmpPlayerImp.h index f1b5d79f..720bd63c 100644 --- a/src/Rtmp/RtmpPlayerImp.h +++ b/src/Rtmp/RtmpPlayerImp.h @@ -27,11 +27,11 @@ public: typedef std::shared_ptr Ptr; RtmpPlayerImp(); virtual ~RtmpPlayerImp(); - float getProgresss() const override{ + float getProgress() const override{ if(getDuration() > 0){ return getProgressTime() / getDuration(); } - return PlayerBase::getProgresss(); + return PlayerBase::getProgress(); }; void seekTo(float fProgress) override{ fProgress = MAX(float(0),MIN(fProgress,float(1.0))); diff --git a/src/Rtsp/RtspPlayerImp.h b/src/Rtsp/RtspPlayerImp.h index e55d99a9..59b43a68 100644 --- a/src/Rtsp/RtspPlayerImp.h +++ b/src/Rtsp/RtspPlayerImp.h @@ -29,11 +29,11 @@ public: typedef std::shared_ptr Ptr; RtspPlayerImp(); virtual ~RtspPlayerImp(); - float getProgresss() const override{ + float getProgress() const override{ if(getDuration() > 0){ return getProgressTime() / getDuration(); } - return PlayerBase::getProgresss(); + return PlayerBase::getProgress(); }; void seekTo(float fProgress) override{