From b0d20f57e1730ffdd6badb82ec648f4b2a1c0133 Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 1 Mar 2014 10:51:45 +0800 Subject: [PATCH] move reload to kernel module --- trunk/configure | 4 ++-- trunk/src/app/srs_core_client.hpp | 2 +- trunk/src/app/srs_core_config.hpp | 2 +- trunk/src/app/srs_core_pithy_print.cpp | 2 +- trunk/src/app/srs_core_server.hpp | 2 +- trunk/src/app/srs_core_source.hpp | 2 +- .../{app/srs_core_reload.cpp => kernel/srs_kernel_reload.cpp} | 2 +- .../{app/srs_core_reload.hpp => kernel/srs_kernel_reload.hpp} | 2 +- trunk/src/srs/srs.upp | 4 ++-- 9 files changed, 11 insertions(+), 11 deletions(-) rename trunk/src/{app/srs_core_reload.cpp => kernel/srs_kernel_reload.cpp} (98%) rename trunk/src/{app/srs_core_reload.hpp => kernel/srs_kernel_reload.hpp} (97%) diff --git a/trunk/configure b/trunk/configure index a6d405735..89587b884 100755 --- a/trunk/configure +++ b/trunk/configure @@ -133,7 +133,7 @@ CORE_OBJS="${MODULE_OBJS[@]}" MODULE_ID="KERNEL" MODULE_DEPENDS=("CORE") ModuleLibIncs=(${SRS_OBJS}) -MODULE_FILES=("srs_kernel_error" "srs_kernel_log") +MODULE_FILES=("srs_kernel_error" "srs_kernel_log" "srs_kernel_reload") MODULE_DIR="src/kernel" . auto/modules.sh KERNEL_OBJS="${MODULE_OBJS[@]}" # @@ -147,7 +147,7 @@ MODULE_FILES=("srs_core_server" "srs_core_protocol" "srs_core_amf0" "srs_core_stream" "srs_core_source" "srs_core_codec" "srs_core_handshake" "srs_core_pithy_print" - "srs_core_config" "srs_core_refer" "srs_core_reload" + "srs_core_config" "srs_core_refer" "srs_core_hls" "srs_core_forward" "srs_core_encoder" "srs_core_http" "srs_core_thread" "srs_core_bandwidth" "srs_core_st" "srs_core_log_context") diff --git a/trunk/src/app/srs_core_client.hpp b/trunk/src/app/srs_core_client.hpp index e7a16f82a..f2c94edb1 100644 --- a/trunk/src/app/srs_core_client.hpp +++ b/trunk/src/app/srs_core_client.hpp @@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include -#include +#include class SrsRtmp; class SrsRequest; diff --git a/trunk/src/app/srs_core_config.hpp b/trunk/src/app/srs_core_config.hpp index 4bbe122eb..735e0e86d 100644 --- a/trunk/src/app/srs_core_config.hpp +++ b/trunk/src/app/srs_core_config.hpp @@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include -#include +#include // default vhost for rtmp #define RTMP_VHOST_DEFAULT "__defaultVhost__" diff --git a/trunk/src/app/srs_core_pithy_print.cpp b/trunk/src/app/srs_core_pithy_print.cpp index 7f827494e..77593c05b 100644 --- a/trunk/src/app/srs_core_pithy_print.cpp +++ b/trunk/src/app/srs_core_pithy_print.cpp @@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include -#include +#include #include #define SRS_STAGE_DEFAULT_INTERVAL_MS 1200 diff --git a/trunk/src/app/srs_core_server.hpp b/trunk/src/app/srs_core_server.hpp index 0e588ef1c..6272ed273 100644 --- a/trunk/src/app/srs_core_server.hpp +++ b/trunk/src/app/srs_core_server.hpp @@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include -#include +#include #include class SrsServer; diff --git a/trunk/src/app/srs_core_source.hpp b/trunk/src/app/srs_core_source.hpp index e280af9ee..4eec947cf 100644 --- a/trunk/src/app/srs_core_source.hpp +++ b/trunk/src/app/srs_core_source.hpp @@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include -#include +#include class SrsSource; class SrsCommonMessage; diff --git a/trunk/src/app/srs_core_reload.cpp b/trunk/src/kernel/srs_kernel_reload.cpp similarity index 98% rename from trunk/src/app/srs_core_reload.cpp rename to trunk/src/kernel/srs_kernel_reload.cpp index e2da1f2bb..7698ac7b3 100644 --- a/trunk/src/app/srs_core_reload.cpp +++ b/trunk/src/kernel/srs_kernel_reload.cpp @@ -21,7 +21,7 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include +#include using namespace std; diff --git a/trunk/src/app/srs_core_reload.hpp b/trunk/src/kernel/srs_kernel_reload.hpp similarity index 97% rename from trunk/src/app/srs_core_reload.hpp rename to trunk/src/kernel/srs_kernel_reload.hpp index 78f6effa6..d7b3e89a0 100644 --- a/trunk/src/app/srs_core_reload.hpp +++ b/trunk/src/kernel/srs_kernel_reload.hpp @@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define SRS_CORE_RELOAD_HPP /* -#include +#include */ #include diff --git a/trunk/src/srs/srs.upp b/trunk/src/srs/srs.upp index 290fa33e7..58e60fef3 100755 --- a/trunk/src/srs/srs.upp +++ b/trunk/src/srs/srs.upp @@ -14,6 +14,8 @@ file ..\kernel\srs_kernel_error.cpp, ..\kernel\srs_kernel_log.hpp, ..\kernel\srs_kernel_log.cpp, + ..\kernel\srs_kernel_reload.hpp, + ..\kernel\srs_kernel_reload.cpp, app readonly separator, ..\app\srs_core_amf0.hpp, ..\app\srs_core_amf0.cpp, @@ -47,8 +49,6 @@ file ..\app\srs_core_protocol.cpp, ..\app\srs_core_refer.hpp, ..\app\srs_core_refer.cpp, - ..\app\srs_core_reload.hpp, - ..\app\srs_core_reload.cpp, ..\app\srs_core_rtmp.hpp, ..\app\srs_core_rtmp.cpp, ..\app\srs_core_thread.hpp,