From b19d2e8e2d1e15934df85853fcbf8011818e144a Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 26 Jul 2014 20:07:12 +0800 Subject: [PATCH] refine code, rename srs_app_socket.cpp to srs_app_st_socket.cpp --- trunk/configure | 2 +- trunk/src/app/srs_app_edge.cpp | 4 ++-- trunk/src/app/srs_app_forward.cpp | 2 +- trunk/src/app/srs_app_http.cpp | 2 +- trunk/src/app/srs_app_http_api.cpp | 2 +- trunk/src/app/srs_app_http_client.cpp | 2 +- trunk/src/app/srs_app_http_conn.cpp | 2 +- trunk/src/app/srs_app_http_hooks.cpp | 2 +- trunk/src/app/srs_app_rtmp_conn.cpp | 2 +- trunk/src/app/{srs_app_socket.cpp => srs_app_st_socket.cpp} | 2 +- trunk/src/app/{srs_app_socket.hpp => srs_app_st_socket.hpp} | 6 +++--- trunk/src/srs/srs.upp | 4 ++-- 12 files changed, 16 insertions(+), 16 deletions(-) rename trunk/src/app/{srs_app_socket.cpp => srs_app_st_socket.cpp} (99%) rename trunk/src/app/{srs_app_socket.hpp => srs_app_st_socket.hpp} (95%) diff --git a/trunk/configure b/trunk/configure index 5259b8f8b..5c35087c4 100755 --- a/trunk/configure +++ b/trunk/configure @@ -440,7 +440,7 @@ RTMP_OBJS="${MODULE_OBJS[@]}" MODULE_ID="APP" MODULE_DEPENDS=("CORE" "KERNEL" "RTMP") ModuleLibIncs=(${LibSTRoot} ${LibHttpParserRoot} ${SRS_OBJS}) -MODULE_FILES=("srs_app_server" "srs_app_conn" "srs_app_rtmp_conn" "srs_app_socket" "srs_app_source" +MODULE_FILES=("srs_app_server" "srs_app_conn" "srs_app_rtmp_conn" "srs_app_st_socket" "srs_app_source" "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" "srs_app_http_api" "srs_app_http_conn" "srs_app_http_hooks" diff --git a/trunk/src/app/srs_app_edge.cpp b/trunk/src/app/srs_app_edge.cpp index 25452b6e3..2dc6211e2 100644 --- a/trunk/src/app/srs_app_edge.cpp +++ b/trunk/src/app/srs_app_edge.cpp @@ -36,12 +36,12 @@ 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 diff --git a/trunk/src/app/srs_app_forward.cpp b/trunk/src/app/srs_app_forward.cpp index f40331971..bbec67539 100644 --- a/trunk/src/app/srs_app_forward.cpp +++ b/trunk/src/app/srs_app_forward.cpp @@ -30,7 +30,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_app_http.cpp b/trunk/src/app/srs_app_http.cpp index cf5c0dc9a..4710ebb1b 100644 --- a/trunk/src/app/srs_app_http.cpp +++ b/trunk/src/app/srs_app_http.cpp @@ -31,7 +31,7 @@ using namespace std; #include #include -#include +#include #include #include #include diff --git a/trunk/src/app/srs_app_http_api.cpp b/trunk/src/app/srs_app_http_api.cpp index 9695d3e90..d54779159 100644 --- a/trunk/src/app/srs_app_http_api.cpp +++ b/trunk/src/app/srs_app_http_api.cpp @@ -31,7 +31,7 @@ using namespace std; #include #include #include -#include +#include #include #include #include diff --git a/trunk/src/app/srs_app_http_client.cpp b/trunk/src/app/srs_app_http_client.cpp index 589bc9538..d1e0c1bce 100644 --- a/trunk/src/app/srs_app_http_client.cpp +++ b/trunk/src/app/srs_app_http_client.cpp @@ -32,7 +32,7 @@ using namespace std; #include #include #include -#include +#include #include #include diff --git a/trunk/src/app/srs_app_http_conn.cpp b/trunk/src/app/srs_app_http_conn.cpp index a91cd4e07..cb19518e6 100644 --- a/trunk/src/app/srs_app_http_conn.cpp +++ b/trunk/src/app/srs_app_http_conn.cpp @@ -35,7 +35,7 @@ using namespace std; #include #include -#include +#include #include #include #include diff --git a/trunk/src/app/srs_app_http_hooks.cpp b/trunk/src/app/srs_app_http_hooks.cpp index 69a557a57..a41fbfe51 100644 --- a/trunk/src/app/srs_app_http_hooks.cpp +++ b/trunk/src/app/srs_app_http_hooks.cpp @@ -31,7 +31,7 @@ using namespace std; #include #include #include -#include +#include #include #include #include diff --git a/trunk/src/app/srs_app_rtmp_conn.cpp b/trunk/src/app/srs_app_rtmp_conn.cpp index 486610c12..deb1f60ac 100644 --- a/trunk/src/app/srs_app_rtmp_conn.cpp +++ b/trunk/src/app/srs_app_rtmp_conn.cpp @@ -43,7 +43,7 @@ using namespace std; #include #include #include -#include +#include #include #include #include diff --git a/trunk/src/app/srs_app_socket.cpp b/trunk/src/app/srs_app_st_socket.cpp similarity index 99% rename from trunk/src/app/srs_app_socket.cpp rename to trunk/src/app/srs_app_st_socket.cpp index 51ea2b95f..885360d84 100644 --- a/trunk/src/app/srs_app_socket.cpp +++ b/trunk/src/app/srs_app_st_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 #include diff --git a/trunk/src/app/srs_app_socket.hpp b/trunk/src/app/srs_app_st_socket.hpp similarity index 95% rename from trunk/src/app/srs_app_socket.hpp rename to trunk/src/app/srs_app_st_socket.hpp index 393daa454..a267f558e 100644 --- a/trunk/src/app/srs_app_socket.hpp +++ b/trunk/src/app/srs_app_st_socket.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_APP_SOCKET_HPP -#define SRS_APP_SOCKET_HPP +#ifndef SRS_APP_ST_SOCKET_HPP +#define SRS_APP_ST_SOCKET_HPP /* -#include +#include */ #include diff --git a/trunk/src/srs/srs.upp b/trunk/src/srs/srs.upp index 5b9d66dc9..f77f8763a 100755 --- a/trunk/src/srs/srs.upp +++ b/trunk/src/srs/srs.upp @@ -104,8 +104,8 @@ file ..\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_st_socket.hpp, + ..\app\srs_app_st_socket.cpp, ..\app\srs_app_source.hpp, ..\app\srs_app_source.cpp, ..\app\srs_app_thread.hpp,