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

bravo auto atc per stream. 0.9.84

Browse source
This commit is contained in:
winlin 2014-04-30 10:17:04 +08:00
parent f02ac02a50
commit 6ee49ee029
4 changed files with 1 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

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

@ -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);
};
/**

1
trunk/src/app/srs_app_source.cpp
View file

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

2
trunk/src/core/srs_core.hpp
View file

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