From 6ee49ee029cede4212e20c5e75d8f2be348c9195 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Wed, 30 Apr 2014 10:17:04 +0800
Subject: [PATCH] bravo auto atc per stream. 0.9.84

---
 trunk/src/app/srs_app_config.cpp | 23 -----------------------
 trunk/src/app/srs_app_config.hpp |  3 ---
 trunk/src/app/srs_app_source.cpp |  1 -
 trunk/src/core/srs_core.hpp      |  2 +-
 4 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/trunk/src/app/srs_app_config.cpp b/trunk/src/app/srs_app_config.cpp
index c82963fb7..ccc4738c7 100644
--- a/trunk/src/app/srs_app_config.cpp
+++ b/trunk/src/app/srs_app_config.cpp
@@ -2656,29 +2656,6 @@ string SrsConfig::get_vhost_http_dir(string vhost)
     return conf->arg0();
 }
 
-void SrsConfig::set_atc(std::string vhost, bool atc)
-{
-    SrsConfDirective* conf = get_vhost(vhost);
-    if (!conf) {
-        return;
-    }
-    
-    // create if not exists
-    if (conf->get("atc") == NULL) {
-        SrsConfDirective* o = new SrsConfDirective();
-        o->name = "atc";
-        conf->directives.push_back(o);
-    }
-    
-    // get the atc node
-    conf = conf->get("atc");
-    srs_assert(conf);
-    
-    // refresh
-    conf->directives.clear();
-    conf->args.push_back((atc? "true":"false"));
-}
-
 bool srs_directive_equals(SrsConfDirective* a, SrsConfDirective* b)
 {
     // both NULL, equal.
diff --git a/trunk/src/app/srs_app_config.hpp b/trunk/src/app/srs_app_config.hpp
index 330a193d9..d5d43f98b 100644
--- a/trunk/src/app/srs_app_config.hpp
+++ b/trunk/src/app/srs_app_config.hpp
@@ -269,9 +269,6 @@ public:
     virtual bool                get_vhost_http_enabled(std::string vhost);
     virtual std::string         get_vhost_http_mount(std::string vhost);
     virtual std::string         get_vhost_http_dir(std::string vhost);
-// setter in memory
-public:
-    virtual void                set_atc(std::string vhost, bool atc);
 };
 
 /**
diff --git a/trunk/src/app/srs_app_source.cpp b/trunk/src/app/srs_app_source.cpp
index f660abf6c..0ddd5b2a3 100644
--- a/trunk/src/app/srs_app_source.cpp
+++ b/trunk/src/app/srs_app_source.cpp
@@ -826,7 +826,6 @@ int SrsSource::on_meta_data(SrsMessage* msg, SrsOnMetaDataPacket* metadata)
     if ((prop = metadata->metadata->get_property("bravo_atc")) != NULL) {
         if (prop->is_string() && prop->to_str() == "true") {
             atc = true;
-            _srs_config->set_atc(_req->vhost, true);
         }
     }
     
diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp
index 6f213c446..6f385f4e3 100644
--- a/trunk/src/core/srs_core.hpp
+++ b/trunk/src/core/srs_core.hpp
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // current release version
 #define VERSION_MAJOR "0"
 #define VERSION_MINOR "9"
-#define VERSION_REVISION "83"
+#define VERSION_REVISION "84"
 #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
 // server info.
 #define RTMP_SIG_SRS_KEY "srs"