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-04-10 11:24:27 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
9ed342158605601faaa80661d6a1ab7f9636bcba
9ed34215
1 parent
e432fe93
rename from get_ingest to get_ingest_by_id of config
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
7 行增加
和
3 行删除
trunk/src/app/srs_app_config.cpp
trunk/src/app/srs_app_config.hpp
trunk/src/app/srs_app_ingest.cpp
trunk/src/app/srs_app_config.cpp
查看文件 @
9ed3421
...
...
@@ -624,6 +624,10 @@ int SrsConfig::reload()
}
srs_trace
(
"vhost %s reload transcode success."
,
vhost
.
c_str
());
}
// transcode, many per vhost.
/*if ((ret = reload_transcode(new_vhost, old_vhost)) != ERROR_SUCCESS) {
return ret;
}*/
// ingest, many per vhost.
if
((
ret
=
reload_ingest
(
new_vhost
,
old_vhost
))
!=
ERROR_SUCCESS
)
{
return
ret
;
...
...
@@ -1768,7 +1772,7 @@ void SrsConfig::get_ingesters(std::string vhost, std::vector<SrsConfDirective*>&
return
;
}
SrsConfDirective
*
SrsConfig
::
get_ingest
(
std
::
string
vhost
,
std
::
string
ingest_id
)
SrsConfDirective
*
SrsConfig
::
get_ingest
_by_id
(
std
::
string
vhost
,
std
::
string
ingest_id
)
{
SrsConfDirective
*
conf
=
get_vhost
(
vhost
);
if
(
!
conf
)
{
...
...
trunk/src/app/srs_app_config.hpp
查看文件 @
9ed3421
...
...
@@ -194,7 +194,7 @@ public:
// ingest section
public:
virtual
void
get_ingesters
(
std
::
string
vhost
,
std
::
vector
<
SrsConfDirective
*>&
ingeters
);
virtual
SrsConfDirective
*
get_ingest
(
std
::
string
vhost
,
std
::
string
ingest_id
);
virtual
SrsConfDirective
*
get_ingest
_by_id
(
std
::
string
vhost
,
std
::
string
ingest_id
);
virtual
bool
get_ingest_enabled
(
SrsConfDirective
*
ingest
);
virtual
std
::
string
get_ingest_ffmpeg
(
SrsConfDirective
*
ingest
);
virtual
std
::
string
get_ingest_input_type
(
SrsConfDirective
*
ingest
);
...
...
trunk/src/app/srs_app_ingest.cpp
查看文件 @
9ed3421
...
...
@@ -429,7 +429,7 @@ int SrsIngester::on_reload_ingest_added(string vhost, string ingest_id)
int
ret
=
ERROR_SUCCESS
;
SrsConfDirective
*
_vhost
=
_srs_config
->
get_vhost
(
vhost
);
SrsConfDirective
*
_ingester
=
_srs_config
->
get_ingest
(
vhost
,
ingest_id
);
SrsConfDirective
*
_ingester
=
_srs_config
->
get_ingest
_by_id
(
vhost
,
ingest_id
);
if
((
ret
=
parse_engines
(
_vhost
,
_ingester
))
!=
ERROR_SUCCESS
)
{
return
ret
;
...
...
请
注册
或
登录
后发表评论