amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-23 03:10:04 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

MediaPusher: 整理代码风格

Browse Source
This commit is contained in:
ziyue 2021-11-09 15:32:48 +08:00
parent b42072405e
commit b96a2291eb
2 changed files with 19 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Pusher/MediaPusher.cpp
View File

@ -44,8 +44,8 @@ void MediaPusher::publish(const string &url) {
_delegate = PusherBase::createPusher(_poller, _src.lock(), url); _delegate = PusherBase::createPusher(_poller, _src.lock(), url);
assert(_delegate); assert(_delegate);
setOnCreateSocket_l(_delegate, _on_create_socket); setOnCreateSocket_l(_delegate, _on_create_socket);
_delegate->setOnShutdown(_shutdownCB); _delegate->setOnShutdown(_on_shutdown);
_delegate->setOnPublished(_publishCB); _delegate->setOnPublished(_on_publish);
_delegate->mINI::operator=(*this); _delegate->mINI::operator=(*this);
_delegate->publish(url); _delegate->publish(url);
} }

26
src/Pusher/PusherBase.h
View File

@ -22,18 +22,17 @@ using namespace toolkit;
namespace mediakit { namespace mediakit {
class PusherBase : public mINI { class PusherBase : public mINI {
public: public:
typedef std::shared_ptr<PusherBase> Ptr; using Ptr = std::shared_ptr<PusherBase>;
typedef std::function<void(const SockException &ex)> Event; using Event = std::function<void(const SockException &ex)>;
static Ptr createPusher(const EventPoller::Ptr &poller, static Ptr createPusher(const EventPoller::Ptr &poller,
const MediaSource::Ptr &src, const MediaSource::Ptr &src,
const string &strUrl); const string &strUrl);
PusherBase(); PusherBase();
virtual ~PusherBase(){} virtual ~PusherBase() = default;
/** /**
* 开始推流 * 开始推流
@ -48,13 +47,11 @@ public:
/** /**
* 摄像推流结果回调 * 摄像推流结果回调
* @param onPublished
*/ */
virtual void setOnPublished(const Event &cb) = 0; virtual void setOnPublished(const Event &cb) = 0;
/** /**
* 设置断开回调 * 设置断开回调
* @param onShutdown
*/ */
virtual void setOnShutdown(const Event &cb) = 0; virtual void setOnShutdown(const Event &cb) = 0;
}; };
@ -62,12 +59,11 @@ public:
template<typename Parent, typename Delegate> template<typename Parent, typename Delegate>
class PusherImp : public Parent { class PusherImp : public Parent {
public: public:
typedef std::shared_ptr<PusherImp> Ptr; using Ptr = std::shared_ptr<PusherImp>;
template<typename ...ArgsType> template<typename ...ArgsType>
PusherImp(ArgsType &&...args) : Parent(std::forward<ArgsType>(args)...) {} PusherImp(ArgsType &&...args) : Parent(std::forward<ArgsType>(args)...) {}
~PusherImp() override = default;
virtual ~PusherImp(){}
/** /**
* 开始推流 * 开始推流
@ -90,24 +86,22 @@ public:
/** /**
* 摄像推流结果回调 * 摄像推流结果回调
* @param onPublished
*/ */
void setOnPublished(const PusherBase::Event &cb) override { void setOnPublished(const PusherBase::Event &cb) override {
if (_delegate) { if (_delegate) {
_delegate->setOnPublished(cb); _delegate->setOnPublished(cb);
} }
_publishCB = cb; _on_publish = cb;
} }
/** /**
* 设置断开回调 * 设置断开回调
* @param onShutdown
*/ */
void setOnShutdown(const PusherBase::Event &cb) override { void setOnShutdown(const PusherBase::Event &cb) override {
if (_delegate) { if (_delegate) {
_delegate->setOnShutdown(cb); _delegate->setOnShutdown(cb);
} }
_shutdownCB = cb; _on_shutdown = cb;
} }
std::shared_ptr<SockInfo> getSockInfo() const { std::shared_ptr<SockInfo> getSockInfo() const {
@ -115,12 +109,10 @@ public:
} }
protected: protected:
PusherBase::Event _shutdownCB; PusherBase::Event _on_shutdown;
PusherBase::Event _publishCB; PusherBase::Event _on_publish;
std::shared_ptr<Delegate> _delegate; std::shared_ptr<Delegate> _delegate;
}; };
} /* namespace mediakit */ } /* namespace mediakit */
#endif /* SRC_PUSHER_PUSHERBASE_H_ */ #endif /* SRC_PUSHER_PUSHERBASE_H_ */