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-03-02 09:22:09 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
f8335e2c1fcf1564ce074ffd9a0a3b406b96c4f7
f8335e2c
1 parent
5e4b7d3a
extract simple socket to lib
隐藏空白字符变更
内嵌
并排对比
正在显示
5 个修改的文件
包含
77 行增加
和
18 行删除
trunk/configure
trunk/src/libs/srs_lib_simple_socket.cpp
trunk/src/libs/srs_lib_simple_socket.hpp
trunk/src/libs/srs_librtmp.cpp
trunk/src/srs/srs.upp
trunk/configure
查看文件 @
f8335e2
...
...
@@ -189,7 +189,7 @@ APP_OBJS="${MODULE_OBJS[@]}"
MODULE_ID
=
"LIBS"
MODULE_DEPENDS
=(
"CORE"
"KERNEL"
"RTMP"
)
ModuleLibIncs
=(
${
SRS_OBJS
}
)
MODULE_FILES
=(
"srs_librtmp"
)
MODULE_FILES
=(
"srs_librtmp"
"srs_lib_simple_socket"
)
MODULE_DIR
=
"src/libs"
. auto/modules.sh
LIBS_OBJS
=
"
${
MODULE_OBJS
[@]
}
"
#
...
...
trunk/src/libs/srs_lib_simple_socket.cpp
0 → 100644
查看文件 @
f8335e2
/*
The MIT License (MIT)
Copyright (c) 2013-2014 winlin
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
the Software, and to permit persons to whom the Software is furnished to do so,
subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
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_lib_simple_socket.hpp>
SimpleSocketStream
::
SimpleSocketStream
(
int
fd
)
{
}
SimpleSocketStream
::~
SimpleSocketStream
()
{
}
...
...
trunk/src/libs/srs_lib_simple_socket.hpp
0 → 100644
查看文件 @
f8335e2
/*
The MIT License (MIT)
Copyright (c) 2013-2014 winlin
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
the Software, and to permit persons to whom the Software is furnished to do so,
subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
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_LIB_SIMPLE_SOCKET_HPP
#define SRS_LIB_SIMPLE_SOCKET_HPP
/*
#include <srs_lib_simple_socket.hpp>
*/
/**
* the stream over epoll: never wait for data coming, that is async mode.
*/
class
SimpleSocketStream
{
public
:
SimpleSocketStream
(
int
fd
);
virtual
~
SimpleSocketStream
();
public
:
};
#endif
...
...
trunk/src/libs/srs_librtmp.cpp
查看文件 @
f8335e2
...
...
@@ -30,23 +30,7 @@ using namespace std;
#include <srs_kernel_error.hpp>
#include <srs_protocol_rtmp.hpp>
/**
* the stream over epoll: never wait for data coming, that is async mode.
*/
class
SimpleSocketStream
{
private
:
int
sock
;
public
:
SimpleSocketStream
(
int
fd
){
sock
=
fd
;
}
virtual
~
SimpleSocketStream
()
{
::
close
(
sock
);
}
public
:
};
#include <srs_lib_simple_socket.hpp>
/**
* export runtime context.
...
...
trunk/src/srs/srs.upp
查看文件 @
f8335e2
...
...
@@ -7,6 +7,8 @@ file
libs readonly separator,
..\libs\srs_librtmp.hpp,
..\libs\srs_librtmp.cpp,
..\libs\srs_lib_simple_socket.hpp,
..\libs\srs_lib_simple_socket.cpp,
core readonly separator,
..\core\srs_core.hpp,
..\core\srs_core.cpp,
...
...
请
注册
或
登录
后发表评论