diff --git a/src/Common/MediaSource.cpp b/src/Common/MediaSource.cpp index 82e5544b..e5872880 100644 --- a/src/Common/MediaSource.cpp +++ b/src/Common/MediaSource.cpp @@ -280,7 +280,7 @@ static MediaSource::Ptr find_l(const string &schema, const string &vhost_in, con return ret; } -static void findAsync_l(const MediaInfo &info, const std::shared_ptr &session, bool retry, +static void findAsync_l(const MediaInfo &info, const std::shared_ptr &session, bool retry, const function &cb){ auto src = find_l(info._schema, info._vhost, info._app, info._streamid, true); if (src || !retry) { @@ -314,7 +314,7 @@ static void findAsync_l(const MediaInfo &info, const std::shared_ptr NoticeCenter::Instance().delListener(listener_tag, Broadcast::kBroadcastMediaChanged); }; - weak_ptr weak_session = session; + weak_ptr weak_session = session; auto on_register = [weak_session, info, cb_once, cancel_all, poller](BroadcastMediaChangedArgs) { if (!bRegist || sender.getSchema() != info._schema || @@ -352,7 +352,7 @@ static void findAsync_l(const MediaInfo &info, const std::shared_ptr NoticeCenter::Instance().emitEvent(Broadcast::kBroadcastNotFoundStream, info, static_cast(*session), close_player); } -void MediaSource::findAsync(const MediaInfo &info, const std::shared_ptr &session,const function &cb){ +void MediaSource::findAsync(const MediaInfo &info, const std::shared_ptr &session, const function &cb) { return findAsync_l(info, session, true, cb); } diff --git a/src/Common/MediaSource.h b/src/Common/MediaSource.h index 7f417bca..8d1667b6 100644 --- a/src/Common/MediaSource.h +++ b/src/Common/MediaSource.h @@ -32,7 +32,7 @@ using namespace std; using namespace toolkit; namespace toolkit{ - class TcpSession; + class Session; }// namespace toolkit namespace mediakit { @@ -271,7 +271,7 @@ public: static Ptr find(const string &vhost, const string &app, const string &stream_id); // 异步查找流 - static void findAsync(const MediaInfo &info, const std::shared_ptr &session, const function &cb); + static void findAsync(const MediaInfo &info, const std::shared_ptr &session, const function &cb); // 遍历所有流 static void for_each_media(const function &cb, const string &schema = "",