rename from get_ingest to get_ingest_by_id of config

trunk/src/app/srs_app_config.cpp

@@ -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

@@ -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

@@ -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;