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-01 10:51:45 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
b0d20f57e1730ffdd6badb82ec648f4b2a1c0133
b0d20f57
1 parent
44f9638f
move reload to kernel module
隐藏空白字符变更
内嵌
并排对比
正在显示
9 个修改的文件
包含
11 行增加
和
11 行删除
trunk/configure
trunk/src/app/srs_core_client.hpp
trunk/src/app/srs_core_config.hpp
trunk/src/app/srs_core_pithy_print.cpp
trunk/src/app/srs_core_server.hpp
trunk/src/app/srs_core_source.hpp
trunk/src/app/srs_core_reload.cpp → trunk/src/kernel/srs_kernel_reload.cpp
trunk/src/app/srs_core_reload.hpp → trunk/src/kernel/srs_kernel_reload.hpp
trunk/src/srs/srs.upp
trunk/configure
查看文件 @
b0d20f5
...
...
@@ -133,7 +133,7 @@ CORE_OBJS="${MODULE_OBJS[@]}"
MODULE_ID
=
"KERNEL"
MODULE_DEPENDS
=(
"CORE"
)
ModuleLibIncs
=(
${
SRS_OBJS
}
)
MODULE_FILES
=(
"srs_kernel_error"
"srs_kernel_log"
)
MODULE_FILES
=(
"srs_kernel_error"
"srs_kernel_log"
"srs_kernel_reload"
)
MODULE_DIR
=
"src/kernel"
. auto/modules.sh
KERNEL_OBJS
=
"
${
MODULE_OBJS
[@]
}
"
#
...
...
@@ -147,7 +147,7 @@ MODULE_FILES=("srs_core_server"
"srs_core_protocol"
"srs_core_amf0"
"srs_core_stream"
"srs_core_source"
"srs_core_codec"
"srs_core_handshake"
"srs_core_pithy_print"
"srs_core_config"
"srs_core_refer"
"srs_core_reload"
"srs_core_config"
"srs_core_refer"
"srs_core_hls"
"srs_core_forward"
"srs_core_encoder"
"srs_core_http"
"srs_core_thread"
"srs_core_bandwidth"
"srs_core_st"
"srs_core_log_context"
)
...
...
trunk/src/app/srs_core_client.hpp
查看文件 @
b0d20f5
...
...
@@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_core_st.hpp>
#include <srs_core_conn.hpp>
#include <srs_
core
_reload.hpp>
#include <srs_
kernel
_reload.hpp>
class
SrsRtmp
;
class
SrsRequest
;
...
...
trunk/src/app/srs_core_config.hpp
查看文件 @
b0d20f5
...
...
@@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <vector>
#include <string>
#include <srs_
core
_reload.hpp>
#include <srs_
kernel
_reload.hpp>
// default vhost for rtmp
#define RTMP_VHOST_DEFAULT "__defaultVhost__"
...
...
trunk/src/app/srs_core_pithy_print.cpp
查看文件 @
b0d20f5
...
...
@@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_kernel_log.hpp>
#include <srs_core_config.hpp>
#include <srs_
core
_reload.hpp>
#include <srs_
kernel
_reload.hpp>
#include <srs_kernel_error.hpp>
#define SRS_STAGE_DEFAULT_INTERVAL_MS 1200
...
...
trunk/src/app/srs_core_server.hpp
查看文件 @
b0d20f5
...
...
@@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <vector>
#include <srs_core_st.hpp>
#include <srs_
core
_reload.hpp>
#include <srs_
kernel
_reload.hpp>
#include <srs_core_thread.hpp>
class
SrsServer
;
...
...
trunk/src/app/srs_core_source.hpp
查看文件 @
b0d20f5
...
...
@@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <string>
#include <srs_core_st.hpp>
#include <srs_
core
_reload.hpp>
#include <srs_
kernel
_reload.hpp>
class
SrsSource
;
class
SrsCommonMessage
;
...
...
trunk/src/
app/srs_core
_reload.cpp → trunk/src/
kernel/srs_kernel
_reload.cpp
查看文件 @
b0d20f5
...
...
@@ -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_
core
_reload.hpp>
#include <srs_
kernel
_reload.hpp>
using
namespace
std
;
...
...
trunk/src/
app/srs_core
_reload.hpp → trunk/src/
kernel/srs_kernel
_reload.hpp
查看文件 @
b0d20f5
...
...
@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define SRS_CORE_RELOAD_HPP
/*
#include <srs_
core
_reload.hpp>
#include <srs_
kernel
_reload.hpp>
*/
#include <srs_core.hpp>
...
...
trunk/src/srs/srs.upp
查看文件 @
b0d20f5
...
...
@@ -14,6 +14,8 @@ file
..\kernel\srs_kernel_error.cpp,
..\kernel\srs_kernel_log.hpp,
..\kernel\srs_kernel_log.cpp,
..\kernel\srs_kernel_reload.hpp,
..\kernel\srs_kernel_reload.cpp,
app readonly separator,
..\app\srs_core_amf0.hpp,
..\app\srs_core_amf0.cpp,
...
...
@@ -47,8 +49,6 @@ file
..\app\srs_core_protocol.cpp,
..\app\srs_core_refer.hpp,
..\app\srs_core_refer.cpp,
..\app\srs_core_reload.hpp,
..\app\srs_core_reload.cpp,
..\app\srs_core_rtmp.hpp,
..\app\srs_core_rtmp.cpp,
..\app\srs_core_thread.hpp,
...
...
请
注册
或
登录
后发表评论