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 from get_ingest to get_ingest_by_id of config

Browse source
This commit is contained in:
winlin 2014-04-10 11:24:27 +08:00
parent e432fe931f
commit 9ed3421586
3 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
trunk/src/app/srs_app_config.cpp
View file

@ -624,6 +624,10 @@ int SrsConfig::reload()
} }
srs_trace("vhost %s reload transcode success.", vhost.c_str()); 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. // ingest, many per vhost.
if ((ret = reload_ingest(new_vhost, old_vhost)) != ERROR_SUCCESS) { if ((ret = reload_ingest(new_vhost, old_vhost)) != ERROR_SUCCESS) {
return ret; return ret;
@ -1768,7 +1772,7 @@ void SrsConfig::get_ingesters(std::string vhost, std::vector<SrsConfDirective*>&
return; 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); SrsConfDirective* conf = get_vhost(vhost);
if (!conf) { if (!conf) {

2
trunk/src/app/srs_app_config.hpp
View file

@ -194,7 +194,7 @@ public:
// ingest section // ingest section
public: public:
virtual void get_ingesters(std::string vhost, std::vector<SrsConfDirective*>& ingeters); 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 bool get_ingest_enabled(SrsConfDirective* ingest);
virtual std::string get_ingest_ffmpeg(SrsConfDirective* ingest); virtual std::string get_ingest_ffmpeg(SrsConfDirective* ingest);
virtual std::string get_ingest_input_type(SrsConfDirective* ingest); virtual std::string get_ingest_input_type(SrsConfDirective* ingest);

2
trunk/src/app/srs_app_ingest.cpp
View file

@ -429,7 +429,7 @@ int SrsIngester::on_reload_ingest_added(string vhost, string ingest_id)
int ret = ERROR_SUCCESS; int ret = ERROR_SUCCESS;
SrsConfDirective* _vhost = _srs_config->get_vhost(vhost); 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) { if ((ret = parse_engines(_vhost, _ingester)) != ERROR_SUCCESS) {
return ret; return ret;