From 880f4f5dc22058d37ca87064be989f4a792e85e2 Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 2 Mar 2014 21:49:09 +0800 Subject: [PATCH] final the modularity, rename the app module. --- trunk/configure | 8 +-- ...re_bandwidth.cpp => srs_app_bandwidth.cpp} | 4 +- ...re_bandwidth.hpp => srs_app_bandwidth.hpp} | 8 +-- ...srs_core_client.cpp => srs_app_client.cpp} | 20 +++--- ...srs_core_client.hpp => srs_app_client.hpp} | 12 ++-- .../{srs_core_codec.cpp => srs_app_codec.cpp} | 2 +- .../{srs_core_codec.hpp => srs_app_codec.hpp} | 6 +- ...srs_core_config.cpp => srs_app_config.cpp} | 2 +- ...srs_core_config.hpp => srs_app_config.hpp} | 8 +-- .../{srs_core_conn.cpp => srs_app_conn.cpp} | 4 +- .../{srs_core_conn.hpp => srs_app_conn.hpp} | 8 +-- ...s_core_encoder.cpp => srs_app_encoder.cpp} | 6 +- ...s_core_encoder.hpp => srs_app_encoder.hpp} | 8 +-- ...s_core_forward.cpp => srs_app_forward.cpp} | 10 +-- ...s_core_forward.hpp => srs_app_forward.hpp} | 10 +-- .../app/{srs_core_hls.cpp => srs_app_hls.cpp} | 10 +-- .../app/{srs_core_hls.hpp => srs_app_hls.hpp} | 6 +- .../{srs_core_http.cpp => srs_app_http.cpp} | 4 +- .../{srs_core_http.hpp => srs_app_http.hpp} | 8 +-- .../app/{srs_core_log.cpp => srs_app_log.cpp} | 2 +- .../app/{srs_core_log.hpp => srs_app_log.hpp} | 8 +-- ...ithy_print.cpp => srs_app_pithy_print.cpp} | 6 +- ...ithy_print.hpp => srs_app_pithy_print.hpp} | 6 +- .../{srs_core_refer.cpp => srs_app_refer.cpp} | 4 +- .../{srs_core_refer.hpp => srs_app_refer.hpp} | 6 +- ...srs_core_reload.cpp => srs_app_reload.cpp} | 2 +- ...srs_core_reload.hpp => srs_app_reload.hpp} | 6 +- ...srs_core_server.cpp => srs_app_server.cpp} | 6 +- ...srs_core_server.hpp => srs_app_server.hpp} | 12 ++-- ...srs_core_socket.cpp => srs_app_socket.cpp} | 2 +- ...srs_core_socket.hpp => srs_app_socket.hpp} | 8 +-- ...srs_core_source.cpp => srs_app_source.cpp} | 12 ++-- ...srs_core_source.hpp => srs_app_source.hpp} | 10 +-- .../app/{srs_core_st.cpp => srs_app_st.cpp} | 2 +- .../app/{srs_core_st.hpp => srs_app_st.hpp} | 6 +- ...srs_core_thread.cpp => srs_app_thread.cpp} | 2 +- ...srs_core_thread.hpp => srs_app_thread.hpp} | 8 +-- trunk/src/main/srs_main_bandcheck.cpp | 8 +-- trunk/src/main/srs_main_server.cpp | 6 +- trunk/src/srs/srs.upp | 72 +++++++++---------- 40 files changed, 169 insertions(+), 169 deletions(-) rename trunk/src/app/{srs_core_bandwidth.cpp => srs_app_bandwidth.cpp} (99%) rename trunk/src/app/{srs_core_bandwidth.hpp => srs_app_bandwidth.hpp} (96%) rename trunk/src/app/{srs_core_client.cpp => srs_app_client.cpp} (98%) rename trunk/src/app/{srs_core_client.hpp => srs_app_client.hpp} (93%) rename trunk/src/app/{srs_core_codec.cpp => srs_app_codec.cpp} (99%) rename trunk/src/app/{srs_core_codec.hpp => srs_app_codec.hpp} (98%) rename trunk/src/app/{srs_core_config.cpp => srs_app_config.cpp} (99%) rename trunk/src/app/{srs_core_config.hpp => srs_app_config.hpp} (98%) rename trunk/src/app/{srs_core_conn.cpp => srs_app_conn.cpp} (97%) rename trunk/src/app/{srs_core_conn.hpp => srs_app_conn.hpp} (92%) rename trunk/src/app/{srs_core_encoder.cpp => srs_app_encoder.cpp} (99%) rename trunk/src/app/{srs_core_encoder.hpp => srs_app_encoder.hpp} (95%) rename trunk/src/app/{srs_core_forward.cpp => srs_app_forward.cpp} (98%) rename trunk/src/app/{srs_core_forward.hpp => srs_app_forward.hpp} (93%) rename trunk/src/app/{srs_core_hls.cpp => srs_app_hls.cpp} (99%) rename trunk/src/app/{srs_core_hls.hpp => srs_app_hls.hpp} (98%) rename trunk/src/app/{srs_core_http.cpp => srs_app_http.cpp} (99%) rename trunk/src/app/{srs_core_http.hpp => srs_app_http.hpp} (97%) rename trunk/src/app/{srs_core_log.cpp => srs_app_log.cpp} (99%) rename trunk/src/app/{srs_core_log.hpp => srs_app_log.hpp} (96%) rename trunk/src/app/{srs_core_pithy_print.cpp => srs_app_pithy_print.cpp} (97%) rename trunk/src/app/{srs_core_pithy_print.hpp => srs_app_pithy_print.hpp} (95%) rename trunk/src/app/{srs_core_refer.cpp => srs_app_refer.cpp} (97%) rename trunk/src/app/{srs_core_refer.hpp => srs_app_refer.hpp} (94%) rename trunk/src/app/{srs_core_reload.cpp => srs_app_reload.cpp} (98%) rename trunk/src/app/{srs_core_reload.hpp => srs_app_reload.hpp} (94%) rename trunk/src/app/{srs_core_server.cpp => srs_app_server.cpp} (98%) rename trunk/src/app/{srs_core_server.hpp => srs_app_server.hpp} (92%) rename trunk/src/app/{srs_core_socket.cpp => srs_app_socket.cpp} (99%) rename trunk/src/app/{srs_core_socket.hpp => srs_app_socket.hpp} (94%) rename trunk/src/app/{srs_core_source.cpp => srs_app_source.cpp} (99%) rename trunk/src/app/{srs_core_source.hpp => srs_app_source.hpp} (97%) rename trunk/src/app/{srs_core_st.cpp => srs_app_st.cpp} (97%) rename trunk/src/app/{srs_core_st.hpp => srs_app_st.hpp} (94%) rename trunk/src/app/{srs_core_thread.cpp => srs_app_thread.cpp} (99%) rename trunk/src/app/{srs_core_thread.hpp => srs_app_thread.hpp} (96%) diff --git a/trunk/configure b/trunk/configure index 51621703f..f591a2968 100755 --- a/trunk/configure +++ b/trunk/configure @@ -185,10 +185,10 @@ RTMP_OBJS="${MODULE_OBJS[@]}" MODULE_ID="APP" MODULE_DEPENDS=("CORE" "KERNEL" "RTMP") 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" - "srs_core_config" "srs_core_pithy_print" "srs_core_reload") +MODULE_FILES=("srs_app_server" "srs_app_conn" "srs_app_client" "srs_app_socket" "srs_app_source" + "srs_app_codec" "srs_app_refer" "srs_app_hls" "srs_app_forward" "srs_app_encoder" + "srs_app_http" "srs_app_thread" "srs_app_bandwidth" "srs_app_st" "srs_app_log" + "srs_app_config" "srs_app_pithy_print" "srs_app_reload") 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_app_bandwidth.cpp similarity index 99% rename from trunk/src/app/srs_core_bandwidth.cpp rename to trunk/src/app/srs_app_bandwidth.cpp index 0d616908c..bca94a746 100644 --- a/trunk/src/app/srs_core_bandwidth.cpp +++ b/trunk/src/app/srs_app_bandwidth.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 @@ -32,7 +32,7 @@ using namespace std; #include #include #include -#include +#include #include SrsBandwidth::SrsBandwidth() diff --git a/trunk/src/app/srs_core_bandwidth.hpp b/trunk/src/app/srs_app_bandwidth.hpp similarity index 96% rename from trunk/src/app/srs_core_bandwidth.hpp rename to trunk/src/app/srs_app_bandwidth.hpp index 22543356f..9d9760117 100644 --- a/trunk/src/app/srs_core_bandwidth.hpp +++ b/trunk/src/app/srs_app_bandwidth.hpp @@ -21,15 +21,15 @@ 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_BANDWIDTH_HPP -#define SRS_CORE_BANDWIDTH_HPP +#ifndef SRS_APP_BANDWIDTH_HPP +#define SRS_APP_BANDWIDTH_HPP /* -#include +#include */ #include -#include +#include class SrsRequest; class SrsRtmpServer; diff --git a/trunk/src/app/srs_core_client.cpp b/trunk/src/app/srs_app_client.cpp similarity index 98% rename from trunk/src/app/srs_core_client.cpp rename to trunk/src/app/srs_app_client.cpp index a005bf817..01ef920e4 100644 --- a/trunk/src/app/srs_core_client.cpp +++ b/trunk/src/app/srs_app_client.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 @@ -33,15 +33,15 @@ using namespace std; #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include SrsClient::SrsClient(SrsServer* srs_server, st_netfd_t client_stfd) : SrsConnection(srs_server, client_stfd) diff --git a/trunk/src/app/srs_core_client.hpp b/trunk/src/app/srs_app_client.hpp similarity index 93% rename from trunk/src/app/srs_core_client.hpp rename to trunk/src/app/srs_app_client.hpp index 45f8f363b..e30f3f6d5 100644 --- a/trunk/src/app/srs_core_client.hpp +++ b/trunk/src/app/srs_app_client.hpp @@ -21,18 +21,18 @@ 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_CLIENT_HPP -#define SRS_CORE_CLIENT_HPP +#ifndef SRS_APP_CLIENT_HPP +#define SRS_APP_CLIENT_HPP /* -#include +#include */ #include -#include -#include -#include +#include +#include +#include class SrsRtmpServer; class SrsRequest; diff --git a/trunk/src/app/srs_core_codec.cpp b/trunk/src/app/srs_app_codec.cpp similarity index 99% rename from trunk/src/app/srs_core_codec.cpp rename to trunk/src/app/srs_app_codec.cpp index 91930b69d..6552e9b61 100644 --- a/trunk/src/app/srs_core_codec.cpp +++ b/trunk/src/app/srs_app_codec.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_codec.hpp b/trunk/src/app/srs_app_codec.hpp similarity index 98% rename from trunk/src/app/srs_core_codec.hpp rename to trunk/src/app/srs_app_codec.hpp index 5e700dafe..a31456d1f 100644 --- a/trunk/src/app/srs_core_codec.hpp +++ b/trunk/src/app/srs_app_codec.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_CODEC_HPP -#define SRS_CORE_CODEC_HPP +#ifndef SRS_APP_CODEC_HPP +#define SRS_APP_CODEC_HPP /* -#include +#include */ #include diff --git a/trunk/src/app/srs_core_config.cpp b/trunk/src/app/srs_app_config.cpp similarity index 99% rename from trunk/src/app/srs_core_config.cpp rename to trunk/src/app/srs_app_config.cpp index 7c02e6bcc..fd3fa330b 100644 --- a/trunk/src/app/srs_core_config.cpp +++ b/trunk/src/app/srs_app_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/app/srs_app_config.hpp similarity index 98% rename from trunk/src/app/srs_core_config.hpp rename to trunk/src/app/srs_app_config.hpp index 5629354cc..16bcd025e 100644 --- a/trunk/src/app/srs_core_config.hpp +++ b/trunk/src/app/srs_app_config.hpp @@ -21,18 +21,18 @@ 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_APP_CONIFG_HPP +#define SRS_APP_CONIFG_HPP /* -#include +#include */ #include #include #include -#include +#include // default vhost for rtmp #define RTMP_VHOST_DEFAULT "__defaultVhost__" diff --git a/trunk/src/app/srs_core_conn.cpp b/trunk/src/app/srs_app_conn.cpp similarity index 97% rename from trunk/src/app/srs_core_conn.cpp rename to trunk/src/app/srs_app_conn.cpp index 2476c417d..342e015d2 100644 --- a/trunk/src/app/srs_core_conn.cpp +++ b/trunk/src/app/srs_app_conn.cpp @@ -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. */ -#include +#include #include #include -#include +#include SrsConnection::SrsConnection(SrsServer* srs_server, st_netfd_t client_stfd) { diff --git a/trunk/src/app/srs_core_conn.hpp b/trunk/src/app/srs_app_conn.hpp similarity index 92% rename from trunk/src/app/srs_core_conn.hpp rename to trunk/src/app/srs_app_conn.hpp index b520f8e68..f6ae638cc 100644 --- a/trunk/src/app/srs_core_conn.hpp +++ b/trunk/src/app/srs_app_conn.hpp @@ -21,16 +21,16 @@ 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_CONN_HPP -#define SRS_CORE_CONN_HPP +#ifndef SRS_APP_CONN_HPP +#define SRS_APP_CONN_HPP /* -#include +#include */ #include -#include +#include class SrsServer; class SrsConnection diff --git a/trunk/src/app/srs_core_encoder.cpp b/trunk/src/app/srs_app_encoder.cpp similarity index 99% rename from trunk/src/app/srs_core_encoder.cpp rename to trunk/src/app/srs_app_encoder.cpp index 2915a5cfb..324420ee2 100644 --- a/trunk/src/app/srs_core_encoder.cpp +++ b/trunk/src/app/srs_app_encoder.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 @@ -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_encoder.hpp b/trunk/src/app/srs_app_encoder.hpp similarity index 95% rename from trunk/src/app/srs_core_encoder.hpp rename to trunk/src/app/srs_app_encoder.hpp index eb34572d1..6d8f028f7 100644 --- a/trunk/src/app/srs_core_encoder.hpp +++ b/trunk/src/app/srs_app_encoder.hpp @@ -21,18 +21,18 @@ 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_ENCODER_HPP -#define SRS_CORE_ENCODER_HPP +#ifndef SRS_APP_ENCODER_HPP +#define SRS_APP_ENCODER_HPP /* -#include +#include */ #include #include #include -#include +#include class SrsConfDirective; class SrsRequest; diff --git a/trunk/src/app/srs_core_forward.cpp b/trunk/src/app/srs_app_forward.cpp similarity index 98% rename from trunk/src/app/srs_core_forward.cpp rename to trunk/src/app/srs_app_forward.cpp index 16de20089..e5e827489 100644 --- a/trunk/src/app/srs_core_forward.cpp +++ b/trunk/src/app/srs_app_forward.cpp @@ -21,20 +21,20 @@ 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 -#include +#include #include #include -#include -#include +#include +#include #include #include #include diff --git a/trunk/src/app/srs_core_forward.hpp b/trunk/src/app/srs_app_forward.hpp similarity index 93% rename from trunk/src/app/srs_core_forward.hpp rename to trunk/src/app/srs_app_forward.hpp index 857e80356..7e93ff7dc 100644 --- a/trunk/src/app/srs_core_forward.hpp +++ b/trunk/src/app/srs_app_forward.hpp @@ -21,18 +21,18 @@ 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_FORWARD_HPP -#define SRS_CORE_FORWARD_HPP +#ifndef SRS_APP_FORWARD_HPP +#define SRS_APP_FORWARD_HPP /* -#include +#include */ #include #include -#include -#include +#include +#include class ISrsProtocolReaderWriter; class SrsSharedPtrMessage; diff --git a/trunk/src/app/srs_core_hls.cpp b/trunk/src/app/srs_app_hls.cpp similarity index 99% rename from trunk/src/app/srs_core_hls.cpp rename to trunk/src/app/srs_app_hls.cpp index 6cdb52f07..db70efc6e 100644 --- a/trunk/src/app/srs_core_hls.cpp +++ b/trunk/src/app/srs_app_hls.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 #ifdef SRS_HLS @@ -34,14 +34,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include -#include +#include #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_core_hls.hpp b/trunk/src/app/srs_app_hls.hpp similarity index 98% rename from trunk/src/app/srs_core_hls.hpp rename to trunk/src/app/srs_app_hls.hpp index 746d6e3c0..9c09ca3d6 100644 --- a/trunk/src/app/srs_core_hls.hpp +++ b/trunk/src/app/srs_app_hls.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_HLS_HPP -#define SRS_CORE_HLS_HPP +#ifndef SRS_APP_HLS_HPP +#define SRS_APP_HLS_HPP /* -#include +#include */ #include diff --git a/trunk/src/app/srs_core_http.cpp b/trunk/src/app/srs_app_http.cpp similarity index 99% rename from trunk/src/app/srs_core_http.cpp rename to trunk/src/app/srs_app_http.cpp index f6403550a..f710da64c 100644 --- a/trunk/src/app/srs_core_http.cpp +++ b/trunk/src/app/srs_app_http.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 #ifdef SRS_HTTP @@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include #include -#include +#include #define SRS_DEFAULT_HTTP_PORT 80 #define SRS_HTTP_RESPONSE_OK "0" diff --git a/trunk/src/app/srs_core_http.hpp b/trunk/src/app/srs_app_http.hpp similarity index 97% rename from trunk/src/app/srs_core_http.hpp rename to trunk/src/app/srs_app_http.hpp index c7250d430..81e4a2557 100644 --- a/trunk/src/app/srs_core_http.hpp +++ b/trunk/src/app/srs_app_http.hpp @@ -21,15 +21,15 @@ 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_HTTP_HPP -#define SRS_CORE_HTTP_HPP +#ifndef SRS_APP_HTTP_HPP +#define SRS_APP_HTTP_HPP /* -#include +#include */ #include -#include +#include #ifdef SRS_HTTP diff --git a/trunk/src/app/srs_core_log.cpp b/trunk/src/app/srs_app_log.cpp similarity index 99% rename from trunk/src/app/srs_core_log.cpp rename to trunk/src/app/srs_app_log.cpp index 205cad336..6709c7af5 100644 --- a/trunk/src/app/srs_core_log.cpp +++ b/trunk/src/app/srs_app_log.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_log.hpp b/trunk/src/app/srs_app_log.hpp similarity index 96% rename from trunk/src/app/srs_core_log.hpp rename to trunk/src/app/srs_app_log.hpp index 73b38201e..f6a8ee70d 100644 --- a/trunk/src/app/srs_core_log.hpp +++ b/trunk/src/app/srs_app_log.hpp @@ -21,16 +21,16 @@ 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_LOG_HPP -#define SRS_CORE_LOG_HPP +#ifndef SRS_APP_LOG_HPP +#define SRS_APP_LOG_HPP /* -#include +#include */ #include -#include +#include #include #include diff --git a/trunk/src/app/srs_core_pithy_print.cpp b/trunk/src/app/srs_app_pithy_print.cpp similarity index 97% rename from trunk/src/app/srs_core_pithy_print.cpp rename to trunk/src/app/srs_app_pithy_print.cpp index 0081782d2..134cbb115 100644 --- a/trunk/src/app/srs_core_pithy_print.cpp +++ b/trunk/src/app/srs_app_pithy_print.cpp @@ -21,14 +21,14 @@ 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 #include #define SRS_STAGE_DEFAULT_INTERVAL_MS 1200 diff --git a/trunk/src/app/srs_core_pithy_print.hpp b/trunk/src/app/srs_app_pithy_print.hpp similarity index 95% rename from trunk/src/app/srs_core_pithy_print.hpp rename to trunk/src/app/srs_app_pithy_print.hpp index c402f5a3c..f93b0acfc 100644 --- a/trunk/src/app/srs_core_pithy_print.hpp +++ b/trunk/src/app/srs_app_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_CORE_PITHY_PRINT_HPP -#define SRS_CORE_PITHY_PRINT_HPP +#ifndef SRS_APP_PITHY_PRINT_HPP +#define SRS_APP_PITHY_PRINT_HPP /* -#include +#include */ #include diff --git a/trunk/src/app/srs_core_refer.cpp b/trunk/src/app/srs_app_refer.cpp similarity index 97% rename from trunk/src/app/srs_core_refer.cpp rename to trunk/src/app/srs_app_refer.cpp index e891ef74e..1b157f015 100644 --- a/trunk/src/app/srs_core_refer.cpp +++ b/trunk/src/app/srs_app_refer.cpp @@ -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. */ -#include +#include #include #include -#include +#include int SrsRefer::check(std::string page_url, SrsConfDirective* refer) { diff --git a/trunk/src/app/srs_core_refer.hpp b/trunk/src/app/srs_app_refer.hpp similarity index 94% rename from trunk/src/app/srs_core_refer.hpp rename to trunk/src/app/srs_app_refer.hpp index 9b4e27b9c..7e26b6188 100644 --- a/trunk/src/app/srs_core_refer.hpp +++ b/trunk/src/app/srs_app_refer.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_REFER_HPP -#define SRS_CORE_REFER_HPP +#ifndef SRS_APP_REFER_HPP +#define SRS_APP_REFER_HPP /* -#include +#include */ #include diff --git a/trunk/src/app/srs_core_reload.cpp b/trunk/src/app/srs_app_reload.cpp similarity index 98% rename from trunk/src/app/srs_core_reload.cpp rename to trunk/src/app/srs_app_reload.cpp index e2da1f2bb..f69d24a3f 100644 --- a/trunk/src/app/srs_core_reload.cpp +++ b/trunk/src/app/srs_app_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/app/srs_app_reload.hpp similarity index 94% rename from trunk/src/app/srs_core_reload.hpp rename to trunk/src/app/srs_app_reload.hpp index 62bedb76c..1e2c64a90 100644 --- a/trunk/src/app/srs_core_reload.hpp +++ b/trunk/src/app/srs_app_reload.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_RELOAD_HPP -#define SRS_KERNEL_RELOAD_HPP +#ifndef SRS_APP_RELOAD_HPP +#define SRS_APP_RELOAD_HPP /* -#include +#include */ #include diff --git a/trunk/src/app/srs_core_server.cpp b/trunk/src/app/srs_app_server.cpp similarity index 98% rename from trunk/src/app/srs_core_server.cpp rename to trunk/src/app/srs_app_server.cpp index e52dd51a7..6b002ff74 100644 --- a/trunk/src/app/srs_core_server.cpp +++ b/trunk/src/app/srs_app_server.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 @@ -32,8 +32,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include -#include -#include +#include +#include #define SERVER_LISTEN_BACKLOG 512 #define SRS_TIME_RESOLUTION_MS 500 diff --git a/trunk/src/app/srs_core_server.hpp b/trunk/src/app/srs_app_server.hpp similarity index 92% rename from trunk/src/app/srs_core_server.hpp rename to trunk/src/app/srs_app_server.hpp index 41f4bc664..8f9d1349c 100644 --- a/trunk/src/app/srs_core_server.hpp +++ b/trunk/src/app/srs_app_server.hpp @@ -21,20 +21,20 @@ 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_SERVER_HPP -#define SRS_CORE_SERVER_HPP +#ifndef SRS_APP_SERVER_HPP +#define SRS_APP_SERVER_HPP /* -#include +#include */ #include #include -#include -#include -#include +#include +#include +#include class SrsServer; class SrsConnection; diff --git a/trunk/src/app/srs_core_socket.cpp b/trunk/src/app/srs_app_socket.cpp similarity index 99% rename from trunk/src/app/srs_core_socket.cpp rename to trunk/src/app/srs_app_socket.cpp index 6fab06020..b36c6ad74 100644 --- a/trunk/src/app/srs_core_socket.cpp +++ b/trunk/src/app/srs_app_socket.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 diff --git a/trunk/src/app/srs_core_socket.hpp b/trunk/src/app/srs_app_socket.hpp similarity index 94% rename from trunk/src/app/srs_core_socket.hpp rename to trunk/src/app/srs_app_socket.hpp index 31ee28742..bba5b1dfd 100644 --- a/trunk/src/app/srs_core_socket.hpp +++ b/trunk/src/app/srs_app_socket.hpp @@ -21,16 +21,16 @@ 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_SOCKET_HPP -#define SRS_CORE_SOCKET_HPP +#ifndef SRS_APP_SOCKET_HPP +#define SRS_APP_SOCKET_HPP /* -#include +#include */ #include -#include +#include #include /** diff --git a/trunk/src/app/srs_core_source.cpp b/trunk/src/app/srs_app_source.cpp similarity index 99% rename from trunk/src/app/srs_core_source.cpp rename to trunk/src/app/srs_app_source.cpp index 72eef4f66..f782f645b 100644 --- a/trunk/src/app/srs_core_source.cpp +++ b/trunk/src/app/srs_app_source.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 using namespace std; @@ -30,11 +30,11 @@ using namespace std; #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #define CONST_MAX_JITTER_MS 500 diff --git a/trunk/src/app/srs_core_source.hpp b/trunk/src/app/srs_app_source.hpp similarity index 97% rename from trunk/src/app/srs_core_source.hpp rename to trunk/src/app/srs_app_source.hpp index e280af9ee..39692c1c4 100644 --- a/trunk/src/app/srs_core_source.hpp +++ b/trunk/src/app/srs_app_source.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_SOURCE_HPP -#define SRS_CORE_SOURCE_HPP +#ifndef SRS_APP_SOURCE_HPP +#define SRS_APP_SOURCE_HPP /* -#include +#include */ #include @@ -34,8 +34,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include -#include -#include +#include +#include class SrsSource; class SrsCommonMessage; diff --git a/trunk/src/app/srs_core_st.cpp b/trunk/src/app/srs_app_st.cpp similarity index 97% rename from trunk/src/app/srs_core_st.cpp rename to trunk/src/app/srs_app_st.cpp index 761d56791..5b465d3a5 100644 --- a/trunk/src/app/srs_core_st.cpp +++ b/trunk/src/app/srs_app_st.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 void srs_close_stfd(st_netfd_t& stfd) { diff --git a/trunk/src/app/srs_core_st.hpp b/trunk/src/app/srs_app_st.hpp similarity index 94% rename from trunk/src/app/srs_core_st.hpp rename to trunk/src/app/srs_app_st.hpp index 473586b59..716e103e5 100644 --- a/trunk/src/app/srs_core_st.hpp +++ b/trunk/src/app/srs_app_st.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_ST_HPP -#define SRS_CORE_ST_HPP +#ifndef SRS_APP_ST_HPP +#define SRS_APP_ST_HPP /* -#include +#include */ #include diff --git a/trunk/src/app/srs_core_thread.cpp b/trunk/src/app/srs_app_thread.cpp similarity index 99% rename from trunk/src/app/srs_core_thread.cpp rename to trunk/src/app/srs_app_thread.cpp index 0abaa9246..621c6946a 100644 --- a/trunk/src/app/srs_core_thread.cpp +++ b/trunk/src/app/srs_app_thread.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_thread.hpp b/trunk/src/app/srs_app_thread.hpp similarity index 96% rename from trunk/src/app/srs_core_thread.hpp rename to trunk/src/app/srs_app_thread.hpp index 0db59f68b..f29f045ae 100644 --- a/trunk/src/app/srs_core_thread.hpp +++ b/trunk/src/app/srs_app_thread.hpp @@ -21,15 +21,15 @@ 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_THREAD_HPP -#define SRS_CORE_THREAD_HPP +#ifndef SRS_APP_THREAD_HPP +#define SRS_APP_THREAD_HPP /* -#include +#include */ #include -#include +#include /** * the handler for the thread, callback interface. diff --git a/trunk/src/main/srs_main_bandcheck.cpp b/trunk/src/main/srs_main_bandcheck.cpp index f353419f7..38c953da3 100644 --- a/trunk/src/main/srs_main_bandcheck.cpp +++ b/trunk/src/main/srs_main_bandcheck.cpp @@ -34,10 +34,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include // kernel module. ISrsLog* _srs_log = new SrsFastLog(); diff --git a/trunk/src/main/srs_main_server.cpp b/trunk/src/main/srs_main_server.cpp index 0e1a25661..2b9f90a3c 100644 --- a/trunk/src/main/srs_main_server.cpp +++ b/trunk/src/main/srs_main_server.cpp @@ -23,9 +23,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include -#include -#include -#include +#include +#include +#include // kernel module. ISrsLog* _srs_log = new SrsFastLog(); diff --git a/trunk/src/srs/srs.upp b/trunk/src/srs/srs.upp index 38465c180..5cb9aece4 100644 --- a/trunk/src/srs/srs.upp +++ b/trunk/src/srs/srs.upp @@ -37,42 +37,42 @@ file ..\rtmp\srs_protocol_utility.hpp, ..\rtmp\srs_protocol_utility.cpp, app readonly separator, - ..\app\srs_core_bandwidth.hpp, - ..\app\srs_core_bandwidth.cpp, - ..\app\srs_core_client.hpp, - ..\app\srs_core_client.cpp, - ..\app\srs_core_codec.hpp, - ..\app\srs_core_codec.cpp, - ..\app\srs_core_conn.hpp, - ..\app\srs_core_conn.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, - ..\app\srs_core_forward.cpp, - ..\app\srs_core_hls.hpp, - ..\app\srs_core_hls.cpp, - ..\app\srs_core_http.hpp, - ..\app\srs_core_http.cpp, - ..\app\srs_core_log.hpp, - ..\app\srs_core_log.cpp, - ..\app\srs_core_refer.hpp, - ..\app\srs_core_refer.cpp, - ..\app\srs_core_reload.hpp, - ..\app\srs_core_reload.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, - ..\app\srs_core_server.cpp, - ..\app\srs_core_st.hpp, - ..\app\srs_core_st.cpp, - ..\app\srs_core_socket.hpp, - ..\app\srs_core_socket.cpp, - ..\app\srs_core_source.hpp, - ..\app\srs_core_source.cpp, + ..\app\srs_app_bandwidth.hpp, + ..\app\srs_app_bandwidth.cpp, + ..\app\srs_app_client.hpp, + ..\app\srs_app_client.cpp, + ..\app\srs_app_codec.hpp, + ..\app\srs_app_codec.cpp, + ..\app\srs_app_conn.hpp, + ..\app\srs_app_conn.cpp, + ..\app\srs_app_config.hpp, + ..\app\srs_app_config.cpp, + ..\app\srs_app_encoder.hpp, + ..\app\srs_app_encoder.cpp, + ..\app\srs_app_forward.hpp, + ..\app\srs_app_forward.cpp, + ..\app\srs_app_hls.hpp, + ..\app\srs_app_hls.cpp, + ..\app\srs_app_http.hpp, + ..\app\srs_app_http.cpp, + ..\app\srs_app_log.hpp, + ..\app\srs_app_log.cpp, + ..\app\srs_app_refer.hpp, + ..\app\srs_app_refer.cpp, + ..\app\srs_app_reload.hpp, + ..\app\srs_app_reload.cpp, + ..\app\srs_app_pithy_print.hpp, + ..\app\srs_app_pithy_print.cpp, + ..\app\srs_app_thread.hpp, + ..\app\srs_app_thread.cpp, + ..\app\srs_app_server.hpp, + ..\app\srs_app_server.cpp, + ..\app\srs_app_st.hpp, + ..\app\srs_app_st.cpp, + ..\app\srs_app_socket.hpp, + ..\app\srs_app_socket.cpp, + ..\app\srs_app_source.hpp, + ..\app\srs_app_source.cpp, research readonly separator, ..\..\research\librtmp\srs_play.c, ..\..\research\librtmp\srs_publish.c,