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

refine code, move default to config function.

Browse source
This commit is contained in:
winlin 2015-07-23 14:20:46 +08:00
parent 39a2d51c66
commit bc033d5de3
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -133,7 +133,6 @@ using namespace _srs_internal;
#define SRS_CONF_DEFAULT_TRANSCODE_IFORMAT "flv" #define SRS_CONF_DEFAULT_TRANSCODE_IFORMAT "flv"
#define SRS_CONF_DEFAULT_TRANSCODE_OFORMAT "flv" #define SRS_CONF_DEFAULT_TRANSCODE_OFORMAT "flv"
#define SRS_CONF_DEFAULT_EDGE_MODE false
#define SRS_CONF_DEFAULT_EDGE_TOKEN_TRAVERSE false #define SRS_CONF_DEFAULT_EDGE_TOKEN_TRAVERSE false
#define SRS_CONF_DEFAULT_EDGE_TRANSFORM_VHOST "[vhost]" #define SRS_CONF_DEFAULT_EDGE_TRANSFORM_VHOST "[vhost]"
@ -2743,15 +2742,16 @@ bool SrsConfig::get_vhost_is_edge(string vhost)
bool SrsConfig::get_vhost_is_edge(SrsConfDirective* vhost) bool SrsConfig::get_vhost_is_edge(SrsConfDirective* vhost)
{ {
static bool DEFAULT = false;
SrsConfDirective* conf = vhost; SrsConfDirective* conf = vhost;
if (!conf) { if (!conf) {
return SRS_CONF_DEFAULT_EDGE_MODE; return DEFAULT;
} }
conf = conf->get("mode"); conf = conf->get("mode");
if (!conf || conf->arg0().empty()) { if (!conf || conf->arg0().empty()) {
return SRS_CONF_DEFAULT_EDGE_MODE; return DEFAULT;
} }
return "remote" == conf->arg0(); return "remote" == conf->arg0();