winlin

refine code, move default to config function.

@@ -133,7 +133,6 @@ using namespace _srs_internal; @@ -133,7 +133,6 @@ using namespace _srs_internal;
133 #define SRS_CONF_DEFAULT_TRANSCODE_IFORMAT "flv" 133 #define SRS_CONF_DEFAULT_TRANSCODE_IFORMAT "flv"
134 #define SRS_CONF_DEFAULT_TRANSCODE_OFORMAT "flv" 134 #define SRS_CONF_DEFAULT_TRANSCODE_OFORMAT "flv"
135 135
136 -#define SRS_CONF_DEFAULT_EDGE_MODE false  
137 #define SRS_CONF_DEFAULT_EDGE_TOKEN_TRAVERSE false 136 #define SRS_CONF_DEFAULT_EDGE_TOKEN_TRAVERSE false
138 #define SRS_CONF_DEFAULT_EDGE_TRANSFORM_VHOST "[vhost]" 137 #define SRS_CONF_DEFAULT_EDGE_TRANSFORM_VHOST "[vhost]"
139 138
@@ -2743,17 +2742,18 @@ bool SrsConfig::get_vhost_is_edge(string vhost) @@ -2743,17 +2742,18 @@ bool SrsConfig::get_vhost_is_edge(string vhost)
2743 2742
2744 bool SrsConfig::get_vhost_is_edge(SrsConfDirective* vhost) 2743 bool SrsConfig::get_vhost_is_edge(SrsConfDirective* vhost)
2745 { 2744 {
  2745 + static bool DEFAULT = false;
2746 SrsConfDirective* conf = vhost; 2746 SrsConfDirective* conf = vhost;
2747 - 2747 +
2748 if (!conf) { 2748 if (!conf) {
2749 - return SRS_CONF_DEFAULT_EDGE_MODE; 2749 + return DEFAULT;
2750 } 2750 }
2751 - 2751 +
2752 conf = conf->get("mode"); 2752 conf = conf->get("mode");
2753 if (!conf || conf->arg0().empty()) { 2753 if (!conf || conf->arg0().empty()) {
2754 - return SRS_CONF_DEFAULT_EDGE_MODE; 2754 + return DEFAULT;
2755 } 2755 }
2756 - 2756 +
2757 return "remote" == conf->arg0(); 2757 return "remote" == conf->arg0();
2758 } 2758 }
2759 2759