Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2014-07-26 20:07:12 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
b19d2e8e2d1e15934df85853fcbf8011818e144a
b19d2e8e
1 parent
13abb0d7
refine code, rename srs_app_socket.cpp to srs_app_st_socket.cpp
隐藏空白字符变更
内嵌
并排对比
正在显示
12 个修改的文件
包含
16 行增加
和
16 行删除
trunk/configure
trunk/src/app/srs_app_edge.cpp
trunk/src/app/srs_app_forward.cpp
trunk/src/app/srs_app_http.cpp
trunk/src/app/srs_app_http_api.cpp
trunk/src/app/srs_app_http_client.cpp
trunk/src/app/srs_app_http_conn.cpp
trunk/src/app/srs_app_http_hooks.cpp
trunk/src/app/srs_app_rtmp_conn.cpp
trunk/src/app/srs_app_socket.cpp → trunk/src/app/srs_app_st_socket.cpp
trunk/src/app/srs_app_socket.hpp → trunk/src/app/srs_app_st_socket.hpp
trunk/src/srs/srs.upp
trunk/configure
查看文件 @
b19d2e8
...
...
@@ -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_s
t_s
ocket"
"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"
...
...
trunk/src/app/srs_app_edge.cpp
查看文件 @
b19d2e8
...
...
@@ -36,12 +36,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_app_config.hpp>
#include <srs_protocol_utility.hpp>
#include <srs_protocol_rtmp.hpp>
#include <srs_app_socket.hpp>
#include <srs_app_s
t_s
ocket.hpp>
#include <srs_protocol_stack.hpp>
#include <srs_app_source.hpp>
#include <srs_app_pithy_print.hpp>
#include <srs_core_autofree.hpp>
#include <srs_app_socket.hpp>
#include <srs_app_s
t_s
ocket.hpp>
#include <srs_app_kbps.hpp>
#include <srs_kernel_utility.hpp>
#include <srs_protocol_msg_array.hpp>
...
...
trunk/src/app/srs_app_forward.cpp
查看文件 @
b19d2e8
...
...
@@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_app_source.hpp>
#include <srs_core_autofree.hpp>
#include <srs_app_socket.hpp>
#include <srs_app_s
t_s
ocket.hpp>
#include <srs_kernel_error.hpp>
#include <srs_kernel_log.hpp>
#include <srs_app_config.hpp>
...
...
trunk/src/app/srs_app_http.cpp
查看文件 @
b19d2e8
...
...
@@ -31,7 +31,7 @@ using namespace std;
#include <srs_kernel_error.hpp>
#include <srs_kernel_log.hpp>
#include <srs_app_socket.hpp>
#include <srs_app_s
t_s
ocket.hpp>
#include <srs_app_http_api.hpp>
#include <srs_app_http_conn.hpp>
#include <srs_app_json.hpp>
...
...
trunk/src/app/srs_app_http_api.cpp
查看文件 @
b19d2e8
...
...
@@ -31,7 +31,7 @@ using namespace std;
#include <srs_kernel_log.hpp>
#include <srs_kernel_error.hpp>
#include <srs_app_http.hpp>
#include <srs_app_socket.hpp>
#include <srs_app_s
t_s
ocket.hpp>
#include <srs_core_autofree.hpp>
#include <srs_app_json.hpp>
#include <srs_app_config.hpp>
...
...
trunk/src/app/srs_app_http_client.cpp
查看文件 @
b19d2e8
...
...
@@ -32,7 +32,7 @@ using namespace std;
#include <srs_app_http.hpp>
#include <srs_kernel_error.hpp>
#include <srs_kernel_log.hpp>
#include <srs_app_socket.hpp>
#include <srs_app_s
t_s
ocket.hpp>
#include <srs_kernel_utility.hpp>
#include <srs_app_utility.hpp>
...
...
trunk/src/app/srs_app_http_conn.cpp
查看文件 @
b19d2e8
...
...
@@ -35,7 +35,7 @@ using namespace std;
#include <srs_kernel_log.hpp>
#include <srs_kernel_error.hpp>
#include <srs_app_socket.hpp>
#include <srs_app_s
t_s
ocket.hpp>
#include <srs_app_http.hpp>
#include <srs_core_autofree.hpp>
#include <srs_app_json.hpp>
...
...
trunk/src/app/srs_app_http_hooks.cpp
查看文件 @
b19d2e8
...
...
@@ -31,7 +31,7 @@ using namespace std;
#include <srs_kernel_error.hpp>
#include <srs_protocol_rtmp.hpp>
#include <srs_kernel_log.hpp>
#include <srs_app_socket.hpp>
#include <srs_app_s
t_s
ocket.hpp>
#include <srs_app_http.hpp>
#include <srs_app_json.hpp>
#include <srs_app_dvr.hpp>
...
...
trunk/src/app/srs_app_rtmp_conn.cpp
查看文件 @
b19d2e8
...
...
@@ -43,7 +43,7 @@ using namespace std;
#include <srs_app_hls.hpp>
#include <srs_app_http.hpp>
#include <srs_app_bandwidth.hpp>
#include <srs_app_socket.hpp>
#include <srs_app_s
t_s
ocket.hpp>
#include <srs_app_http_hooks.hpp>
#include <srs_app_edge.hpp>
#include <srs_app_kbps.hpp>
...
...
trunk/src/app/srs_app_socket.cpp → trunk/src/app/srs_app_s
t_s
ocket.cpp
查看文件 @
b19d2e8
...
...
@@ -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 <srs_app_socket.hpp>
#include <srs_app_s
t_s
ocket.hpp>
#include <srs_kernel_error.hpp>
#include <srs_kernel_utility.hpp>
...
...
trunk/src/app/srs_app_socket.hpp → trunk/src/app/srs_app_s
t_s
ocket.hpp
查看文件 @
b19d2e8
...
...
@@ -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 <srs_app_socket.hpp>
#include <srs_app_s
t_s
ocket.hpp>
*/
#include <srs_core.hpp>
...
...
trunk/src/srs/srs.upp
查看文件 @
b19d2e8
...
...
@@ -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,
...
...
请
注册
或
登录
后发表评论