winlin

rename pro to rtmp protocol.

@@ -138,18 +138,18 @@ MODULE_FILES=("srs_kernel_error" "srs_kernel_log" "srs_kernel_reload" "srs_kerne @@ -138,18 +138,18 @@ MODULE_FILES=("srs_kernel_error" "srs_kernel_log" "srs_kernel_reload" "srs_kerne
138 MODULE_DIR="src/kernel" . auto/modules.sh 138 MODULE_DIR="src/kernel" . auto/modules.sh
139 KERNEL_OBJS="${MODULE_OBJS[@]}" 139 KERNEL_OBJS="${MODULE_OBJS[@]}"
140 # 140 #
141 -#Protocol, depends on core/kernel, provides rtmp/htttp protocol features.  
142 -MODULE_ID="PROTOCOL" 141 +#RTMP Protocol, depends on core/kernel, provides rtmp/htttp protocol features.
  142 +MODULE_ID="RTMP"
143 MODULE_DEPENDS=("CORE" "KERNEL") 143 MODULE_DEPENDS=("CORE" "KERNEL")
144 ModuleLibIncs=(${SRS_OBJS} ${LibSSLRoot}) 144 ModuleLibIncs=(${SRS_OBJS} ${LibSSLRoot})
145 MODULE_FILES=("srs_protocol_amf0" "srs_protocol_io" "srs_protocol_rtmp_stack" "srs_protocol_rtmp" 145 MODULE_FILES=("srs_protocol_amf0" "srs_protocol_io" "srs_protocol_rtmp_stack" "srs_protocol_rtmp"
146 "srs_protocol_handshake") 146 "srs_protocol_handshake")
147 -MODULE_DIR="src/pro" . auto/modules.sh  
148 -PROTOCOL_OBJS="${MODULE_OBJS[@]}" 147 +MODULE_DIR="src/rtmp" . auto/modules.sh
  148 +RTMP_OBJS="${MODULE_OBJS[@]}"
149 # 149 #
150 #App Module 150 #App Module
151 MODULE_ID="APP" 151 MODULE_ID="APP"
152 -MODULE_DEPENDS=("CORE" "KERNEL" "PROTOCOL") 152 +MODULE_DEPENDS=("CORE" "KERNEL" "RTMP")
153 ModuleLibIncs=(${LibSTRoot} ${LibHttpParserRoot} ${SRS_OBJS}) 153 ModuleLibIncs=(${LibSTRoot} ${LibHttpParserRoot} ${SRS_OBJS})
154 MODULE_FILES=("srs_core_server" 154 MODULE_FILES=("srs_core_server"
155 "srs_core_conn" "srs_core_client" 155 "srs_core_conn" "srs_core_client"
@@ -164,7 +164,7 @@ APP_OBJS="${MODULE_OBJS[@]}" @@ -164,7 +164,7 @@ APP_OBJS="${MODULE_OBJS[@]}"
164 # 164 #
165 #Main Module 165 #Main Module
166 MODULE_ID="MAIN" 166 MODULE_ID="MAIN"
167 -MODULE_DEPENDS=("CORE" "KERNEL" "PROTOCOL" "APP") 167 +MODULE_DEPENDS=("CORE" "KERNEL" "RTMP" "APP")
168 ModuleLibIncs=(${LibSTRoot} ${SRS_OBJS}) 168 ModuleLibIncs=(${LibSTRoot} ${SRS_OBJS})
169 MODULE_FILES=("srs_main_server" "srs_main_bandcheck") 169 MODULE_FILES=("srs_main_server" "srs_main_bandcheck")
170 MODULE_DIR="src/main" . auto/modules.sh 170 MODULE_DIR="src/main" . auto/modules.sh
@@ -180,7 +180,7 @@ MAIN_ENTRANCES=("srs_main_server" "srs_main_bandcheck") @@ -180,7 +180,7 @@ MAIN_ENTRANCES=("srs_main_server" "srs_main_bandcheck")
180 # all depends libraries 180 # all depends libraries
181 ModuleLibFiles=(${LibSTfile} ${LibHttpParserfile} ${LibSSLfile}) 181 ModuleLibFiles=(${LibSTfile} ${LibHttpParserfile} ${LibSSLfile})
182 # all depends objects 182 # all depends objects
183 -MODULE_OBJS="${CORE_OBJS[@]} ${KERNEL_OBJS[@]} ${PROTOCOL_OBJS[@]} ${APP_OBJS[@]} ${MAIN_OBJS[@]}" 183 +MODULE_OBJS="${CORE_OBJS[@]} ${KERNEL_OBJS[@]} ${RTMP_OBJS[@]} ${APP_OBJS[@]} ${MAIN_OBJS[@]}"
184 LINK_OPTIONS="-ldl" 184 LINK_OPTIONS="-ldl"
185 # 185 #
186 # srs: 186 # srs:
@@ -24,17 +24,17 @@ file @@ -24,17 +24,17 @@ file
24 ..\kernel\srs_kernel_reload.cpp, 24 ..\kernel\srs_kernel_reload.cpp,
25 ..\kernel\srs_kernel_stream.hpp, 25 ..\kernel\srs_kernel_stream.hpp,
26 ..\kernel\srs_kernel_stream.cpp, 26 ..\kernel\srs_kernel_stream.cpp,
27 - protocol readonly separator,  
28 - ..\pro\srs_protocol_amf0.hpp,  
29 - ..\pro\srs_protocol_amf0.cpp,  
30 - ..\app\srs_protocol_handshake.hpp,  
31 - ..\app\srs_protocol_handshake.cpp,  
32 - ..\pro\srs_protocol_io.hpp,  
33 - ..\pro\srs_protocol_io.cpp,  
34 - ..\pro\srs_protocol_rtmp.hpp,  
35 - ..\pro\srs_protocol_rtmp.cpp,  
36 - ..\pro\srs_protocol_rtmp_stack.hpp,  
37 - ..\pro\srs_protocol_rtmp_stack.cpp, 27 + rtmp protocol readonly separator,
  28 + ..\rtmp\srs_protocol_amf0.hpp,
  29 + ..\rtmp\srs_protocol_amf0.cpp,
  30 + ..\rtmp\srs_protocol_handshake.hpp,
  31 + ..\rtmp\srs_protocol_handshake.cpp,
  32 + ..\rtmp\srs_protocol_io.hpp,
  33 + ..\rtmp\srs_protocol_io.cpp,
  34 + ..\rtmp\srs_protocol_rtmp.hpp,
  35 + ..\rtmp\srs_protocol_rtmp.cpp,
  36 + ..\rtmp\srs_protocol_rtmp_stack.hpp,
  37 + ..\rtmp\srs_protocol_rtmp_stack.cpp,
38 app readonly separator, 38 app readonly separator,
39 ..\app\srs_core_bandwidth.hpp, 39 ..\app\srs_core_bandwidth.hpp,
40 ..\app\srs_core_bandwidth.cpp, 40 ..\app\srs_core_bandwidth.cpp,