Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-06-14 12:05:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

适配ZLToolKit(更新定时器)

Browse Source
This commit is contained in:
xiongziliang
2019-01-30 17:00:28 +08:00
parent cc7556b5a8
commit b5ea9fac08
12 changed files with 42 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Player/MediaPlayer.cpp
View File

@@ -46,12 +46,12 @@ void MediaPlayer::play(const char* strUrl) {
_parser->play(strUrl);
}
TaskExecutor::Ptr MediaPlayer::getExecutor(){
EventPoller::Ptr MediaPlayer::getPoller(){
auto parser = dynamic_pointer_cast<SocketHelper>(_parser);
if(!parser){
return nullptr;
}
return parser->getExecutor();
return parser->getPoller();
}
void MediaPlayer::pause(bool bPause) {

2
src/Player/MediaPlayer.h
View File

@@ -46,7 +46,7 @@ public:
void play(const char* strUrl) override;
void pause(bool bPause) override;
void teardown() override;
TaskExecutor::Ptr getExecutor();
EventPoller::Ptr getPoller();
};

6
src/Player/PlayerProxy.cpp
View File

@@ -136,9 +136,9 @@ void PlayerProxy::rePlay(const string &strUrl,int iFailedCnt){
bool PlayerProxy::close() {
//通知其停止推流
weak_ptr<PlayerProxy> weakSlef = dynamic_pointer_cast<PlayerProxy>(shared_from_this());
auto executor = getExecutor();
if(executor) {
executor->async_first([weakSlef]() {
auto poller = getPoller();
if(poller) {
poller->async_first([weakSlef]() {
auto stronSelf = weakSlef.lock();
if (stronSelf) {
stronSelf->_mediaMuxer.reset();