From dd2abd7924569af7f1161a0bbc1c42bf933f3bb2 Mon Sep 17 00:00:00 2001 From: xiongziliang <771730766@qq.com> Date: Sat, 24 Oct 2020 23:30:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=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/MediaPlayer.cpp | 2 +- src/Player/PlayerBase.h | 6 +++--- src/Player/PlayerProxy.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Player/MediaPlayer.cpp b/src/Player/MediaPlayer.cpp index e77888f3..d766bf77 100644 --- a/src/Player/MediaPlayer.cpp +++ b/src/Player/MediaPlayer.cpp @@ -37,7 +37,7 @@ void MediaPlayer::play(const string &url) { _delegate->setOnShutdown(_shutdownCB); _delegate->setOnPlayResult(_playResultCB); _delegate->setOnResume(_resumeCB); - _delegate->setMediaSouce(_pMediaSrc); + _delegate->setMediaSource(_pMediaSrc); _delegate->mINI::operator=(*this); _delegate->play(url); } diff --git a/src/Player/PlayerBase.h b/src/Player/PlayerBase.h index 749a86aa..72a79b80 100644 --- a/src/Player/PlayerBase.h +++ b/src/Player/PlayerBase.h @@ -103,7 +103,7 @@ public: * 设置一个MediaSource,直接生产rtsp/rtmp代理 * @param src */ - virtual void setMediaSouce(const MediaSource::Ptr & src) {} + virtual void setMediaSource(const MediaSource::Ptr & src) {} /** * 获取丢包率,只支持rtsp @@ -181,9 +181,9 @@ public: return Parent::seekTo(fProgress); } - void setMediaSouce(const MediaSource::Ptr & src) override { + void setMediaSource(const MediaSource::Ptr & src) override { if (_delegate) { - _delegate->setMediaSouce(src); + _delegate->setMediaSource(src); } _pMediaSrc = src; } diff --git a/src/Player/PlayerProxy.cpp b/src/Player/PlayerProxy.cpp index 78b8d5d6..f2a4b236 100644 --- a/src/Player/PlayerProxy.cpp +++ b/src/Player/PlayerProxy.cpp @@ -126,7 +126,7 @@ void PlayerProxy::play(const string &strUrlTmp) { mediaSource = std::make_shared(_vhost, _app, _stream_id); } if(mediaSource){ - setMediaSouce(mediaSource); + setMediaSource(mediaSource); mediaSource->setListener(shared_from_this()); } } @@ -163,7 +163,7 @@ bool PlayerProxy::close(MediaSource &sender,bool force) { return; } strongSelf->_muxer.reset(); - strongSelf->setMediaSouce(nullptr); + strongSelf->setMediaSource(nullptr); strongSelf->teardown(); if (strongSelf->_on_close) { strongSelf->_on_close();