From cb99de4462ca07f7045c70abce0e151332bf6761 Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 1 Mar 2014 10:55:43 +0800 Subject: [PATCH] move config to kernel module --- trunk/configure | 4 ++-- trunk/src/app/srs_core_bandwidth.cpp | 2 +- trunk/src/app/srs_core_client.cpp | 2 +- trunk/src/app/srs_core_encoder.cpp | 2 +- trunk/src/app/srs_core_forward.cpp | 2 +- trunk/src/app/srs_core_hls.cpp | 2 +- trunk/src/app/srs_core_pithy_print.cpp | 2 +- trunk/src/app/srs_core_refer.cpp | 2 +- trunk/src/app/srs_core_rtmp.cpp | 2 +- trunk/src/app/srs_core_server.cpp | 2 +- trunk/src/app/srs_core_source.cpp | 2 +- .../srs_core_config.cpp => kernel/srs_kernel_config.cpp} | 2 +- .../srs_core_config.hpp => kernel/srs_kernel_config.hpp} | 6 +++--- trunk/src/main/srs_main_server.cpp | 2 +- trunk/src/srs/srs.upp | 4 ++-- 15 files changed, 19 insertions(+), 19 deletions(-) rename trunk/src/{app/srs_core_config.cpp => kernel/srs_kernel_config.cpp} (99%) rename trunk/src/{app/srs_core_config.hpp => kernel/srs_kernel_config.hpp} (98%) diff --git a/trunk/configure b/trunk/configure index 89587b884..fcde4d3ff 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" "srs_kernel_reload") +MODULE_FILES=("srs_kernel_error" "srs_kernel_log" "srs_kernel_reload" "srs_kernel_config") 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_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_bandwidth.cpp b/trunk/src/app/srs_core_bandwidth.cpp index 3ec565a94..e68ff98cc 100644 --- a/trunk/src/app/srs_core_bandwidth.cpp +++ b/trunk/src/app/srs_core_bandwidth.cpp @@ -32,7 +32,7 @@ using namespace std; #include #include #include -#include +#include #include SrsBandwidth::SrsBandwidth() diff --git a/trunk/src/app/srs_core_client.cpp b/trunk/src/app/srs_core_client.cpp index 6e5d8f01e..cffe11ec6 100644 --- a/trunk/src/app/srs_core_client.cpp +++ b/trunk/src/app/srs_core_client.cpp @@ -36,7 +36,7 @@ using namespace std; #include #include #include -#include +#include #include #include #include diff --git a/trunk/src/app/srs_core_encoder.cpp b/trunk/src/app/srs_core_encoder.cpp index 778bfa810..47f4b95df 100644 --- a/trunk/src/app/srs_core_encoder.cpp +++ b/trunk/src/app/srs_core_encoder.cpp @@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include -#include +#include #include #include #include diff --git a/trunk/src/app/srs_core_forward.cpp b/trunk/src/app/srs_core_forward.cpp index 9e4818b18..57d205dc2 100644 --- a/trunk/src/app/srs_core_forward.cpp +++ b/trunk/src/app/srs_core_forward.cpp @@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include #include -#include +#include #include #include diff --git a/trunk/src/app/srs_core_hls.cpp b/trunk/src/app/srs_core_hls.cpp index d9f5f6a84..d59d2a3b0 100644 --- a/trunk/src/app/srs_core_hls.cpp +++ b/trunk/src/app/srs_core_hls.cpp @@ -37,7 +37,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include #include -#include +#include #include #include #include diff --git a/trunk/src/app/srs_core_pithy_print.cpp b/trunk/src/app/srs_core_pithy_print.cpp index 77593c05b..2a09c1124 100644 --- a/trunk/src/app/srs_core_pithy_print.cpp +++ b/trunk/src/app/srs_core_pithy_print.cpp @@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include -#include +#include #include #include diff --git a/trunk/src/app/srs_core_refer.cpp b/trunk/src/app/srs_core_refer.cpp index e891ef74e..00b130c11 100644 --- a/trunk/src/app/srs_core_refer.cpp +++ b/trunk/src/app/srs_core_refer.cpp @@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include -#include +#include int SrsRefer::check(std::string page_url, SrsConfDirective* refer) { diff --git a/trunk/src/app/srs_core_rtmp.cpp b/trunk/src/app/srs_core_rtmp.cpp index 1b6a67c9e..66ac5a26f 100644 --- a/trunk/src/app/srs_core_rtmp.cpp +++ b/trunk/src/app/srs_core_rtmp.cpp @@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include #include -#include +#include using namespace std; diff --git a/trunk/src/app/srs_core_server.cpp b/trunk/src/app/srs_core_server.cpp index 316f6ff4e..1f6a92d72 100644 --- a/trunk/src/app/srs_core_server.cpp +++ b/trunk/src/app/srs_core_server.cpp @@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include #include -#include +#include #define SERVER_LISTEN_BACKLOG 512 #define SRS_TIME_RESOLUTION_MS 500 diff --git a/trunk/src/app/srs_core_source.cpp b/trunk/src/app/srs_core_source.cpp index 3c95f062c..9585128e1 100644 --- a/trunk/src/app/srs_core_source.cpp +++ b/trunk/src/app/srs_core_source.cpp @@ -33,7 +33,7 @@ using namespace std; #include #include #include -#include +#include #include #include diff --git a/trunk/src/app/srs_core_config.cpp b/trunk/src/kernel/srs_kernel_config.cpp similarity index 99% rename from trunk/src/app/srs_core_config.cpp rename to trunk/src/kernel/srs_kernel_config.cpp index f9118b0df..764ad5860 100644 --- a/trunk/src/app/srs_core_config.cpp +++ b/trunk/src/kernel/srs_kernel_config.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 #include #include diff --git a/trunk/src/app/srs_core_config.hpp b/trunk/src/kernel/srs_kernel_config.hpp similarity index 98% rename from trunk/src/app/srs_core_config.hpp rename to trunk/src/kernel/srs_kernel_config.hpp index 735e0e86d..0f535ced0 100644 --- a/trunk/src/app/srs_core_config.hpp +++ b/trunk/src/kernel/srs_kernel_config.hpp @@ -21,11 +21,11 @@ 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. */ -#ifndef SRS_CORE_CONIFG_HPP -#define SRS_CORE_CONIFG_HPP +#ifndef SRS_KERNEL_CONIFG_HPP +#define SRS_KERNEL_CONIFG_HPP /* -#include +#include */ #include diff --git a/trunk/src/main/srs_main_server.cpp b/trunk/src/main/srs_main_server.cpp index 2b793ccd2..095a8d13d 100644 --- a/trunk/src/main/srs_main_server.cpp +++ b/trunk/src/main/srs_main_server.cpp @@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include #include -#include +#include #include #include diff --git a/trunk/src/srs/srs.upp b/trunk/src/srs/srs.upp index 58e60fef3..ee3b8c39b 100755 --- a/trunk/src/srs/srs.upp +++ b/trunk/src/srs/srs.upp @@ -10,6 +10,8 @@ file ..\core\srs_core_autofree.hpp, ..\core\srs_core_autofree.cpp, kernel readonly separator, + ..\kernel\srs_kernel_config.hpp, + ..\kernel\srs_kernel_config.cpp, ..\kernel\srs_kernel_error.hpp, ..\kernel\srs_kernel_error.cpp, ..\kernel\srs_kernel_log.hpp, @@ -27,8 +29,6 @@ file ..\app\srs_core_client.cpp, ..\app\srs_core_codec.hpp, ..\app\srs_core_codec.cpp, - ..\app\srs_core_config.hpp, - ..\app\srs_core_config.cpp, ..\app\srs_core_conn.hpp, ..\app\srs_core_conn.cpp, ..\app\srs_core_encoder.hpp,