mirror of
https://github.com/ZLMediaKit/ZLMediaKit.git
synced 2024-11-25 12:11:36 +08:00
修复编译警告,格式化代码
This commit is contained in:
parent
4bd3fdabfb
commit
2f075f60ea
@ -27,13 +27,9 @@ public:
|
|||||||
|
|
||||||
~MediaHelper() = default;
|
~MediaHelper() = default;
|
||||||
|
|
||||||
void attachEvent(){
|
void attachEvent() { _channel->setMediaListener(shared_from_this()); }
|
||||||
_channel->setMediaListener(shared_from_this());
|
|
||||||
}
|
|
||||||
|
|
||||||
DevChannel::Ptr &getChannel(){
|
DevChannel::Ptr &getChannel() { return _channel; }
|
||||||
return _channel;
|
|
||||||
}
|
|
||||||
|
|
||||||
void setOnClose(on_mk_media_close cb, std::shared_ptr<void> user_data) {
|
void setOnClose(on_mk_media_close cb, std::shared_ptr<void> user_data) {
|
||||||
_on_close = cb;
|
_on_close = cb;
|
||||||
@ -103,9 +99,7 @@ protected:
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
toolkit::EventPoller::Ptr getOwnerPoller(MediaSource &sender) {
|
toolkit::EventPoller::Ptr getOwnerPoller(MediaSource &sender) override { return _poller; }
|
||||||
return _poller;
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
EventPoller::Ptr _poller;
|
EventPoller::Ptr _poller;
|
||||||
@ -290,7 +284,8 @@ API_EXPORT void API_CALL mk_media_start_send_rtp(mk_media ctx, const char *dst_u
|
|||||||
mk_media_start_send_rtp2(ctx, dst_url, dst_port, ssrc, is_udp, cb, user_data, nullptr);
|
mk_media_start_send_rtp2(ctx, dst_url, dst_port, ssrc, is_udp, cb, user_data, nullptr);
|
||||||
}
|
}
|
||||||
|
|
||||||
API_EXPORT void API_CALL mk_media_start_send_rtp2(mk_media ctx, const char *dst_url, uint16_t dst_port, const char *ssrc, int is_udp, on_mk_media_send_rtp_result cb, void *user_data, on_user_data_free user_data_free){
|
API_EXPORT void API_CALL mk_media_start_send_rtp2(mk_media ctx, const char *dst_url, uint16_t dst_port, const char *ssrc, int is_udp, on_mk_media_send_rtp_result cb, void *user_data,
|
||||||
|
on_user_data_free user_data_free) {
|
||||||
assert(ctx && dst_url && ssrc);
|
assert(ctx && dst_url && ssrc);
|
||||||
MediaHelper::Ptr* obj = (MediaHelper::Ptr*) ctx;
|
MediaHelper::Ptr* obj = (MediaHelper::Ptr*) ctx;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user