From 382fd127e40a8ae8f68d417251fec718eb645685 Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 1 Mar 2014 16:02:59 +0800 Subject: [PATCH] rename config and pithy-print to app module. --- trunk/configure | 2 +- trunk/src/app/srs_core_bandwidth.cpp | 2 +- trunk/src/app/srs_core_client.cpp | 4 ++-- .../app/{srs_kernel_config.cpp => srs_core_config.cpp} | 2 +- .../app/{srs_kernel_config.hpp => srs_core_config.hpp} | 6 +++--- trunk/src/app/srs_core_encoder.cpp | 4 ++-- trunk/src/app/srs_core_forward.cpp | 4 ++-- trunk/src/app/srs_core_hls.cpp | 4 ++-- ...rs_kernel_pithy_print.cpp => srs_core_pithy_print.cpp} | 4 ++-- ...rs_kernel_pithy_print.hpp => srs_core_pithy_print.hpp} | 6 +++--- trunk/src/app/srs_core_refer.cpp | 2 +- trunk/src/app/srs_core_server.cpp | 2 +- trunk/src/app/srs_core_source.cpp | 2 +- trunk/src/main/srs_main_server.cpp | 2 +- trunk/src/srs/srs.upp | 8 ++++---- 15 files changed, 27 insertions(+), 27 deletions(-) rename trunk/src/app/{srs_kernel_config.cpp => srs_core_config.cpp} (99%) rename trunk/src/app/{srs_kernel_config.hpp => srs_core_config.hpp} (98%) rename trunk/src/app/{srs_kernel_pithy_print.cpp => srs_core_pithy_print.cpp} (98%) rename trunk/src/app/{srs_kernel_pithy_print.hpp => srs_core_pithy_print.hpp} (95%) diff --git a/trunk/configure b/trunk/configure index 84a0642c9..06eb5c8d2 100755 --- a/trunk/configure +++ b/trunk/configure @@ -154,7 +154,7 @@ ModuleLibIncs=(${LibSTRoot} ${LibHttpParserRoot} ${SRS_OBJS}) MODULE_FILES=("srs_core_server" "srs_core_conn" "srs_core_client" "srs_core_socket" "srs_core_source" "srs_core_codec" "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" - "srs_kernel_config" "srs_kernel_pithy_print") + "srs_core_config" "srs_core_pithy_print") MODULE_DIR="src/app" . auto/modules.sh APP_OBJS="${MODULE_OBJS[@]}" # diff --git a/trunk/src/app/srs_core_bandwidth.cpp b/trunk/src/app/srs_core_bandwidth.cpp index 180d7ca9b..43aade768 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 ca49e4d8e..01b44943b 100644 --- a/trunk/src/app/srs_core_client.cpp +++ b/trunk/src/app/srs_core_client.cpp @@ -35,8 +35,8 @@ using namespace std; #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/trunk/src/app/srs_kernel_config.cpp b/trunk/src/app/srs_core_config.cpp similarity index 99% rename from trunk/src/app/srs_kernel_config.cpp rename to trunk/src/app/srs_core_config.cpp index 2952f43f4..241c7c997 100644 --- a/trunk/src/app/srs_kernel_config.cpp +++ b/trunk/src/app/srs_core_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_kernel_config.hpp b/trunk/src/app/srs_core_config.hpp similarity index 98% rename from trunk/src/app/srs_kernel_config.hpp rename to trunk/src/app/srs_core_config.hpp index 12354dc66..918ce9a3f 100644 --- a/trunk/src/app/srs_kernel_config.hpp +++ b/trunk/src/app/srs_core_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_KERNEL_CONIFG_HPP -#define SRS_KERNEL_CONIFG_HPP +#ifndef SRS_CORE_CONIFG_HPP +#define SRS_CORE_CONIFG_HPP /* -#include +#include */ #include diff --git a/trunk/src/app/srs_core_encoder.cpp b/trunk/src/app/srs_core_encoder.cpp index 27ddad7e7..bfce24bcb 100644 --- a/trunk/src/app/srs_core_encoder.cpp +++ b/trunk/src/app/srs_core_encoder.cpp @@ -34,9 +34,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include -#include +#include #include -#include +#include #include #ifdef SRS_FFMPEG diff --git a/trunk/src/app/srs_core_forward.cpp b/trunk/src/app/srs_core_forward.cpp index 3e6182455..a06a91581 100644 --- a/trunk/src/app/srs_core_forward.cpp +++ b/trunk/src/app/srs_core_forward.cpp @@ -33,8 +33,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include #include -#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 9ce2c6f6e..35dcb15a9 100644 --- a/trunk/src/app/srs_core_hls.cpp +++ b/trunk/src/app/srs_core_hls.cpp @@ -37,11 +37,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include #include -#include +#include #include #include #include -#include +#include // max PES packets size to flush the video. #define SRS_HLS_AUDIO_CACHE_SIZE 512 * 1024 diff --git a/trunk/src/app/srs_kernel_pithy_print.cpp b/trunk/src/app/srs_core_pithy_print.cpp similarity index 98% rename from trunk/src/app/srs_kernel_pithy_print.cpp rename to trunk/src/app/srs_core_pithy_print.cpp index 824bb179e..77593c05b 100644 --- a/trunk/src/app/srs_kernel_pithy_print.cpp +++ b/trunk/src/app/srs_core_pithy_print.cpp @@ -21,13 +21,13 @@ 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 #include -#include +#include #include #include diff --git a/trunk/src/app/srs_kernel_pithy_print.hpp b/trunk/src/app/srs_core_pithy_print.hpp similarity index 95% rename from trunk/src/app/srs_kernel_pithy_print.hpp rename to trunk/src/app/srs_core_pithy_print.hpp index 973709e3e..c402f5a3c 100644 --- a/trunk/src/app/srs_kernel_pithy_print.hpp +++ b/trunk/src/app/srs_core_pithy_print.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_KERNEL_PITHY_PRINT_HPP -#define SRS_KERNEL_PITHY_PRINT_HPP +#ifndef SRS_CORE_PITHY_PRINT_HPP +#define SRS_CORE_PITHY_PRINT_HPP /* -#include +#include */ #include diff --git a/trunk/src/app/srs_core_refer.cpp b/trunk/src/app/srs_core_refer.cpp index 00b130c11..e891ef74e 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_server.cpp b/trunk/src/app/srs_core_server.cpp index 1f6a92d72..316f6ff4e 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 bad758919..121b5a660 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/main/srs_main_server.cpp b/trunk/src/main/srs_main_server.cpp index 095a8d13d..2b793ccd2 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 eb4db85af..858ab13ab 100755 --- a/trunk/src/srs/srs.upp +++ b/trunk/src/srs/srs.upp @@ -42,8 +42,8 @@ file ..\app\srs_core_codec.cpp, ..\app\srs_core_conn.hpp, ..\app\srs_core_conn.cpp, - ..\app\srs_kernel_config.hpp, - ..\app\srs_kernel_config.cpp, + ..\app\srs_core_config.hpp, + ..\app\srs_core_config.cpp, ..\app\srs_core_encoder.hpp, ..\app\srs_core_encoder.cpp, ..\app\srs_core_forward.hpp, @@ -56,8 +56,8 @@ file ..\app\srs_core_log_context.cpp, ..\app\srs_core_refer.hpp, ..\app\srs_core_refer.cpp, - ..\app\srs_kernel_pithy_print.hpp, - ..\app\srs_kernel_pithy_print.cpp, + ..\app\srs_core_pithy_print.hpp, + ..\app\srs_core_pithy_print.cpp, ..\app\srs_core_thread.hpp, ..\app\srs_core_thread.cpp, ..\app\srs_core_server.hpp,