From a3eb07adfc2ee2edd0b0442d7ac4bcf1021bd7f0 Mon Sep 17 00:00:00 2001
From: mtdxc <mtdxc@126.com>
Date: Wed, 24 Sep 2025 16:45:35 +0800
Subject: [PATCH] move srt src like webrtc (#4471)

---
 src/CMakeLists.txt              | 18 +-----------------
 src/Player/PlayerBase.cpp       |  2 +-
 src/Pusher/PusherBase.cpp       |  2 +-
 {src/Srt => srt}/SrtCaller.cpp  |  0
 {src/Srt => srt}/SrtCaller.h    |  0
 {src/Srt => srt}/SrtPlayer.cpp  |  0
 {src/Srt => srt}/SrtPlayer.h    |  0
 {src/Srt => srt}/SrtPlayerImp.h |  0
 {src/Srt => srt}/SrtPusher.cpp  |  0
 {src/Srt => srt}/SrtPusher.h    |  0
 10 files changed, 3 insertions(+), 19 deletions(-)
 rename {src/Srt => srt}/SrtCaller.cpp (100%)
 rename {src/Srt => srt}/SrtCaller.h (100%)
 rename {src/Srt => srt}/SrtPlayer.cpp (100%)
 rename {src/Srt => srt}/SrtPlayer.h (100%)
 rename {src/Srt => srt}/SrtPlayerImp.h (100%)
 rename {src/Srt => srt}/SrtPusher.cpp (100%)
 rename {src/Srt => srt}/SrtPusher.h (100%)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6601eb99..2feae7e5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -26,14 +26,6 @@ file(GLOB MediaKit_SRC_LIST
   ${CMAKE_CURRENT_SOURCE_DIR}/*/*.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/*/*.h)
 
-if(NOT ENABLE_SRT)
-    file(GLOB SRT_SRC_LIST
-        ${CMAKE_CURRENT_SOURCE_DIR}/Srt/*.c
-        ${CMAKE_CURRENT_SOURCE_DIR}/Srt/*.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/Srt/*.h)
-    list(REMOVE_ITEM MediaKit_SRC_LIST ${SRT_SRC_LIST})
-endif()
-
 if(USE_SOLUTION_FOLDERS AND (NOT GROUP_BY_EXPLORER))
   # 在 IDE 中对文件进行分组, 源文件和头文件分开
   set_file_group("${CMAKE_CURRENT_SOURCE_DIR}" ${MediaKit_SRC_LIST})
@@ -66,18 +58,10 @@ update_cached_list(MK_LINK_LIBRARIES ZLMediaKit::MediaKit)
 # 未在使用
 if(ENABLE_CXX_API)
   # 保留目录结构
-  if(ENABLE_SRT)
-    install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/
+  install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/
       DESTINATION ${INSTALL_PATH_INCLUDE}/ZLMediaKit
       FILES_MATCHING
         PATTERN "*.h")
-  else()
-    install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/
-      DESTINATION ${INSTALL_PATH_INCLUDE}/ZLMediaKit
-      FILES_MATCHING 
-        REGEX ".*/Srt.*" EXCLUDE
-        PATTERN "*.h")
-  endif()
   install(TARGETS zlmediakit
     DESTINATION ${INSTALL_PATH_LIB})
 endif ()
diff --git a/src/Player/PlayerBase.cpp b/src/Player/PlayerBase.cpp
index 949c555c..58a31cfc 100644
--- a/src/Player/PlayerBase.cpp
+++ b/src/Player/PlayerBase.cpp
@@ -16,7 +16,7 @@
 #include "Http/HlsPlayer.h"
 #include "Http/TsPlayerImp.h"
 #ifdef ENABLE_SRT
-#include "Srt/SrtPlayerImp.h"
+#include "../srt/SrtPlayerImp.h"
 #endif // ENABLE_SRT
 #ifdef ENABLE_WEBRTC
 #include "../webrtc/WebRtcProxyPlayerImp.h"
diff --git a/src/Pusher/PusherBase.cpp b/src/Pusher/PusherBase.cpp
index 055f5629..496a726f 100644
--- a/src/Pusher/PusherBase.cpp
+++ b/src/Pusher/PusherBase.cpp
@@ -13,7 +13,7 @@
 #include "Rtsp/RtspPusher.h"
 #include "Rtmp/RtmpPusher.h"
 #ifdef ENABLE_SRT
-#include "Srt/SrtPusher.h"
+#include "../srt/SrtPusher.h"
 #endif // ENABLE_SRT
 #ifdef ENABLE_WEBRTC
 #include "../webrtc/WebRtcProxyPusher.h"
diff --git a/src/Srt/SrtCaller.cpp b/srt/SrtCaller.cpp
similarity index 100%
rename from src/Srt/SrtCaller.cpp
rename to srt/SrtCaller.cpp
diff --git a/src/Srt/SrtCaller.h b/srt/SrtCaller.h
similarity index 100%
rename from src/Srt/SrtCaller.h
rename to srt/SrtCaller.h
diff --git a/src/Srt/SrtPlayer.cpp b/srt/SrtPlayer.cpp
similarity index 100%
rename from src/Srt/SrtPlayer.cpp
rename to srt/SrtPlayer.cpp
diff --git a/src/Srt/SrtPlayer.h b/srt/SrtPlayer.h
similarity index 100%
rename from src/Srt/SrtPlayer.h
rename to srt/SrtPlayer.h
diff --git a/src/Srt/SrtPlayerImp.h b/srt/SrtPlayerImp.h
similarity index 100%
rename from src/Srt/SrtPlayerImp.h
rename to srt/SrtPlayerImp.h
diff --git a/src/Srt/SrtPusher.cpp b/srt/SrtPusher.cpp
similarity index 100%
rename from src/Srt/SrtPusher.cpp
rename to srt/SrtPusher.cpp
diff --git a/src/Srt/SrtPusher.h b/srt/SrtPusher.h
similarity index 100%
rename from src/Srt/SrtPusher.h
rename to srt/SrtPusher.h