From bc033d5de309826c05b6bb7c7ff89c4415d7f3e7 Mon Sep 17 00:00:00 2001 From: winlin Date: Thu, 23 Jul 2015 14:20:46 +0800 Subject: [PATCH] refine code, move default to config function. --- trunk/src/app/srs_app_config.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/trunk/src/app/srs_app_config.cpp b/trunk/src/app/srs_app_config.cpp index b2cfec55f..a5fd507bf 100644 --- a/trunk/src/app/srs_app_config.cpp +++ b/trunk/src/app/srs_app_config.cpp @@ -133,7 +133,6 @@ using namespace _srs_internal; #define SRS_CONF_DEFAULT_TRANSCODE_IFORMAT "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_TRANSFORM_VHOST "[vhost]" @@ -2743,17 +2742,18 @@ bool SrsConfig::get_vhost_is_edge(string vhost) bool SrsConfig::get_vhost_is_edge(SrsConfDirective* vhost) { + static bool DEFAULT = false; SrsConfDirective* conf = vhost; - + if (!conf) { - return SRS_CONF_DEFAULT_EDGE_MODE; + return DEFAULT; } - + conf = conf->get("mode"); if (!conf || conf->arg0().empty()) { - return SRS_CONF_DEFAULT_EDGE_MODE; + return DEFAULT; } - + return "remote" == conf->arg0(); }