external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

rename pro to rtmp protocol.

Browse source
This commit is contained in:
winlin 2014-03-01 14:05:58 +08:00
parent 8d5806154b
commit 4c498b67da
12 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

14
trunk/configure vendored
View file

@ -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:

0
trunk/src/pro/srs_protocol_amf0.cpp → trunk/src/rtmp/srs_protocol_amf0.cpp
View file

0
trunk/src/pro/srs_protocol_amf0.hpp → trunk/src/rtmp/srs_protocol_amf0.hpp
View file

0
trunk/src/pro/srs_protocol_handshake.cpp → trunk/src/rtmp/srs_protocol_handshake.cpp
View file

0
trunk/src/pro/srs_protocol_handshake.hpp → trunk/src/rtmp/srs_protocol_handshake.hpp
View file

0
trunk/src/pro/srs_protocol_io.cpp → trunk/src/rtmp/srs_protocol_io.cpp
View file

0
trunk/src/pro/srs_protocol_io.hpp → trunk/src/rtmp/srs_protocol_io.hpp
View file

0
trunk/src/pro/srs_protocol_rtmp.cpp → trunk/src/rtmp/srs_protocol_rtmp.cpp
View file

0
trunk/src/pro/srs_protocol_rtmp.hpp → trunk/src/rtmp/srs_protocol_rtmp.hpp
View file

0
trunk/src/pro/srs_protocol_rtmp_stack.cpp → trunk/src/rtmp/srs_protocol_rtmp_stack.cpp
View file

0
trunk/src/pro/srs_protocol_rtmp_stack.hpp → trunk/src/rtmp/srs_protocol_rtmp_stack.hpp
View file

22
trunk/src/srs/srs.upp
View file

@ -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,