From 4c498b67daad409d941c985263302fb4fb0c8ebb Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 1 Mar 2014 14:05:58 +0800 Subject: [PATCH] rename pro to rtmp protocol. --- trunk/configure | 14 ++++++------ trunk/src/{pro => rtmp}/srs_protocol_amf0.cpp | 0 trunk/src/{pro => rtmp}/srs_protocol_amf0.hpp | 0 .../{pro => rtmp}/srs_protocol_handshake.cpp | 0 .../{pro => rtmp}/srs_protocol_handshake.hpp | 0 trunk/src/{pro => rtmp}/srs_protocol_io.cpp | 0 trunk/src/{pro => rtmp}/srs_protocol_io.hpp | 0 trunk/src/{pro => rtmp}/srs_protocol_rtmp.cpp | 0 trunk/src/{pro => rtmp}/srs_protocol_rtmp.hpp | 0 .../{pro => rtmp}/srs_protocol_rtmp_stack.cpp | 0 .../{pro => rtmp}/srs_protocol_rtmp_stack.hpp | 0 trunk/src/srs/srs.upp | 22 +++++++++---------- 12 files changed, 18 insertions(+), 18 deletions(-) rename trunk/src/{pro => rtmp}/srs_protocol_amf0.cpp (100%) rename trunk/src/{pro => rtmp}/srs_protocol_amf0.hpp (100%) rename trunk/src/{pro => rtmp}/srs_protocol_handshake.cpp (100%) rename trunk/src/{pro => rtmp}/srs_protocol_handshake.hpp (100%) rename trunk/src/{pro => rtmp}/srs_protocol_io.cpp (100%) rename trunk/src/{pro => rtmp}/srs_protocol_io.hpp (100%) rename trunk/src/{pro => rtmp}/srs_protocol_rtmp.cpp (100%) rename trunk/src/{pro => rtmp}/srs_protocol_rtmp.hpp (100%) rename trunk/src/{pro => rtmp}/srs_protocol_rtmp_stack.cpp (100%) rename trunk/src/{pro => rtmp}/srs_protocol_rtmp_stack.hpp (100%) diff --git a/trunk/configure b/trunk/configure index 5ff6d1ac6..22505c189 100755 --- a/trunk/configure +++ b/trunk/configure @@ -138,18 +138,18 @@ MODULE_FILES=("srs_kernel_error" "srs_kernel_log" "srs_kernel_reload" "srs_kerne MODULE_DIR="src/kernel" . auto/modules.sh KERNEL_OBJS="${MODULE_OBJS[@]}" # -#Protocol, depends on core/kernel, provides rtmp/htttp protocol features. -MODULE_ID="PROTOCOL" +#RTMP Protocol, depends on core/kernel, provides rtmp/htttp protocol features. +MODULE_ID="RTMP" MODULE_DEPENDS=("CORE" "KERNEL") ModuleLibIncs=(${SRS_OBJS} ${LibSSLRoot}) MODULE_FILES=("srs_protocol_amf0" "srs_protocol_io" "srs_protocol_rtmp_stack" "srs_protocol_rtmp" "srs_protocol_handshake") -MODULE_DIR="src/pro" . auto/modules.sh -PROTOCOL_OBJS="${MODULE_OBJS[@]}" +MODULE_DIR="src/rtmp" . auto/modules.sh +RTMP_OBJS="${MODULE_OBJS[@]}" # #App Module MODULE_ID="APP" -MODULE_DEPENDS=("CORE" "KERNEL" "PROTOCOL") +MODULE_DEPENDS=("CORE" "KERNEL" "RTMP") ModuleLibIncs=(${LibSTRoot} ${LibHttpParserRoot} ${SRS_OBJS}) MODULE_FILES=("srs_core_server" "srs_core_conn" "srs_core_client" @@ -164,7 +164,7 @@ APP_OBJS="${MODULE_OBJS[@]}" # #Main Module MODULE_ID="MAIN" -MODULE_DEPENDS=("CORE" "KERNEL" "PROTOCOL" "APP") +MODULE_DEPENDS=("CORE" "KERNEL" "RTMP" "APP") ModuleLibIncs=(${LibSTRoot} ${SRS_OBJS}) MODULE_FILES=("srs_main_server" "srs_main_bandcheck") MODULE_DIR="src/main" . auto/modules.sh @@ -180,7 +180,7 @@ MAIN_ENTRANCES=("srs_main_server" "srs_main_bandcheck") # all depends libraries ModuleLibFiles=(${LibSTfile} ${LibHttpParserfile} ${LibSSLfile}) # all depends objects -MODULE_OBJS="${CORE_OBJS[@]} ${KERNEL_OBJS[@]} ${PROTOCOL_OBJS[@]} ${APP_OBJS[@]} ${MAIN_OBJS[@]}" +MODULE_OBJS="${CORE_OBJS[@]} ${KERNEL_OBJS[@]} ${RTMP_OBJS[@]} ${APP_OBJS[@]} ${MAIN_OBJS[@]}" LINK_OPTIONS="-ldl" # # srs: diff --git a/trunk/src/pro/srs_protocol_amf0.cpp b/trunk/src/rtmp/srs_protocol_amf0.cpp similarity index 100% rename from trunk/src/pro/srs_protocol_amf0.cpp rename to trunk/src/rtmp/srs_protocol_amf0.cpp diff --git a/trunk/src/pro/srs_protocol_amf0.hpp b/trunk/src/rtmp/srs_protocol_amf0.hpp similarity index 100% rename from trunk/src/pro/srs_protocol_amf0.hpp rename to trunk/src/rtmp/srs_protocol_amf0.hpp diff --git a/trunk/src/pro/srs_protocol_handshake.cpp b/trunk/src/rtmp/srs_protocol_handshake.cpp similarity index 100% rename from trunk/src/pro/srs_protocol_handshake.cpp rename to trunk/src/rtmp/srs_protocol_handshake.cpp diff --git a/trunk/src/pro/srs_protocol_handshake.hpp b/trunk/src/rtmp/srs_protocol_handshake.hpp similarity index 100% rename from trunk/src/pro/srs_protocol_handshake.hpp rename to trunk/src/rtmp/srs_protocol_handshake.hpp diff --git a/trunk/src/pro/srs_protocol_io.cpp b/trunk/src/rtmp/srs_protocol_io.cpp similarity index 100% rename from trunk/src/pro/srs_protocol_io.cpp rename to trunk/src/rtmp/srs_protocol_io.cpp diff --git a/trunk/src/pro/srs_protocol_io.hpp b/trunk/src/rtmp/srs_protocol_io.hpp similarity index 100% rename from trunk/src/pro/srs_protocol_io.hpp rename to trunk/src/rtmp/srs_protocol_io.hpp diff --git a/trunk/src/pro/srs_protocol_rtmp.cpp b/trunk/src/rtmp/srs_protocol_rtmp.cpp similarity index 100% rename from trunk/src/pro/srs_protocol_rtmp.cpp rename to trunk/src/rtmp/srs_protocol_rtmp.cpp diff --git a/trunk/src/pro/srs_protocol_rtmp.hpp b/trunk/src/rtmp/srs_protocol_rtmp.hpp similarity index 100% rename from trunk/src/pro/srs_protocol_rtmp.hpp rename to trunk/src/rtmp/srs_protocol_rtmp.hpp diff --git a/trunk/src/pro/srs_protocol_rtmp_stack.cpp b/trunk/src/rtmp/srs_protocol_rtmp_stack.cpp similarity index 100% rename from trunk/src/pro/srs_protocol_rtmp_stack.cpp rename to trunk/src/rtmp/srs_protocol_rtmp_stack.cpp diff --git a/trunk/src/pro/srs_protocol_rtmp_stack.hpp b/trunk/src/rtmp/srs_protocol_rtmp_stack.hpp similarity index 100% rename from trunk/src/pro/srs_protocol_rtmp_stack.hpp rename to trunk/src/rtmp/srs_protocol_rtmp_stack.hpp diff --git a/trunk/src/srs/srs.upp b/trunk/src/srs/srs.upp index 92c067ba3..e061b345c 100755 --- a/trunk/src/srs/srs.upp +++ b/trunk/src/srs/srs.upp @@ -24,17 +24,17 @@ file ..\kernel\srs_kernel_reload.cpp, ..\kernel\srs_kernel_stream.hpp, ..\kernel\srs_kernel_stream.cpp, - protocol readonly separator, - ..\pro\srs_protocol_amf0.hpp, - ..\pro\srs_protocol_amf0.cpp, - ..\app\srs_protocol_handshake.hpp, - ..\app\srs_protocol_handshake.cpp, - ..\pro\srs_protocol_io.hpp, - ..\pro\srs_protocol_io.cpp, - ..\pro\srs_protocol_rtmp.hpp, - ..\pro\srs_protocol_rtmp.cpp, - ..\pro\srs_protocol_rtmp_stack.hpp, - ..\pro\srs_protocol_rtmp_stack.cpp, + rtmp protocol readonly separator, + ..\rtmp\srs_protocol_amf0.hpp, + ..\rtmp\srs_protocol_amf0.cpp, + ..\rtmp\srs_protocol_handshake.hpp, + ..\rtmp\srs_protocol_handshake.cpp, + ..\rtmp\srs_protocol_io.hpp, + ..\rtmp\srs_protocol_io.cpp, + ..\rtmp\srs_protocol_rtmp.hpp, + ..\rtmp\srs_protocol_rtmp.cpp, + ..\rtmp\srs_protocol_rtmp_stack.hpp, + ..\rtmp\srs_protocol_rtmp_stack.cpp, app readonly separator, ..\app\srs_core_bandwidth.hpp, ..\app\srs_core_bandwidth.cpp,