From ece7186e6c370c04bc7d060c85004aebab947113 Mon Sep 17 00:00:00 2001
From: wxf <xiaofeng.wang@bqvision.com>
Date: Thu, 15 Jul 2021 11:25:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E4=B8=BA=E6=8C=89=20Session=20?=
 =?UTF-8?q?=E6=9F=A5=E6=89=BE=E5=AA=92=E4=BD=93=E6=BA=90=E4=BB=A5=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=20TCP/UDP=20Session?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Common/MediaSource.cpp | 6 +++---
 src/Common/MediaSource.h   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

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<TcpSession> &session, bool retry,
+static void findAsync_l(const MediaInfo &info, const std::shared_ptr<Session> &session, bool retry,
                         const function<void(const MediaSource::Ptr &src)> &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<TcpSession>
         NoticeCenter::Instance().delListener(listener_tag, Broadcast::kBroadcastMediaChanged);
     };
 
-    weak_ptr<TcpSession> weak_session = session;
+    weak_ptr<Session> 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<TcpSession>
     NoticeCenter::Instance().emitEvent(Broadcast::kBroadcastNotFoundStream, info, static_cast<SockInfo &>(*session), close_player);
 }
 
-void MediaSource::findAsync(const MediaInfo &info, const std::shared_ptr<TcpSession> &session,const function<void(const Ptr &src)> &cb){
+void MediaSource::findAsync(const MediaInfo &info, const std::shared_ptr<Session> &session, const function<void (const Ptr &)> &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<TcpSession> &session, const function<void(const Ptr &src)> &cb);
+    static void findAsync(const MediaInfo &info, const std::shared_ptr<Session> &session, const function<void(const Ptr &src)> &cb);
     // 遍历所有流
     static void for_each_media(const function<void(const Ptr &src)> &cb,
                                const string &schema = "",