From b3ef28f831b07419d237c5129390e265176ac7f2 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Sun, 15 Dec 2013 13:23:03 +0800
Subject: [PATCH] fix bug of get hls enabled config

---
 trunk/conf/srs.conf                | 12 ++++++------
 trunk/src/core/srs_core_config.cpp | 10 ++++++++--
 trunk/src/core/srs_core_hls.cpp    |  2 --
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/trunk/conf/srs.conf b/trunk/conf/srs.conf
index ad6f26f11..1c6777a79 100755
--- a/trunk/conf/srs.conf
+++ b/trunk/conf/srs.conf
@@ -23,14 +23,14 @@ vhost __defaultVhost__ {
     gop_cache       on;
     forward         127.0.0.1:19350;
     hls {
-        hls             on;
+        enabled         on;
         hls_path        ./objs/nginx/html;
         hls_fragment    5;
         hls_window      30;
     }
     transcode {
-        enabled     on;
-        ffmpeg      ./objs/ffmpeg/bin/ffmpeg;
+        enabled         on;
+        ffmpeg          ./objs/ffmpeg/bin/ffmpeg;
         engine ld {
             enabled         on;
             vfilter {
@@ -85,7 +85,7 @@ vhost dev {
     gop_cache       on;
     #forward         127.0.0.1:19350;
     hls {
-        hls             off;
+        enabled         on;
         hls_path        ./objs/nginx/html;
         hls_fragment    5;
         hls_window      30;
@@ -635,7 +635,7 @@ vhost with-hls.vhost.com {
         # whether the hls is enabled.
         # if off, donot write hls(ts and m3u8) when publish.
         # default: off
-        hls             on;
+        enabled         on;
         # the hls output path.
         # the app dir is auto created under the hls_path.
         # for example, for rtmp stream:
@@ -662,7 +662,7 @@ vhost no-hls.vhost.com {
         # whether the hls is enabled.
         # if off, donot write hls(ts and m3u8) when publish.
         # default: off
-        hls             off;
+        enabled         off;
     }
 }
 # the vhost for min delay, donot cache any stream.
diff --git a/trunk/src/core/srs_core_config.cpp b/trunk/src/core/srs_core_config.cpp
index a7dc6aa15..904dc0fed 100644
--- a/trunk/src/core/srs_core_config.cpp
+++ b/trunk/src/core/srs_core_config.cpp
@@ -1312,11 +1312,17 @@ bool SrsConfig::get_hls_enabled(string vhost)
 		return false;
 	}
 	
-	if (hls->arg0() == "off") {
+	SrsConfDirective* conf = hls->get("enabled");
+	
+	if (!conf) {
 		return false;
 	}
 	
-	return true;
+	if (conf->arg0() == "on") {
+		return true;
+	}
+	
+	return false;
 }
 
 string SrsConfig::get_hls_path(string vhost)
diff --git a/trunk/src/core/srs_core_hls.cpp b/trunk/src/core/srs_core_hls.cpp
index ff5b8ffbf..14a82cd54 100644
--- a/trunk/src/core/srs_core_hls.cpp
+++ b/trunk/src/core/srs_core_hls.cpp
@@ -1148,7 +1148,6 @@ int SrsHls::on_publish(SrsRequest* req)
 	std::string stream = req->stream;
 	std::string app = req->app;
 	
-	// TODO: support reload.
 	if (!config->get_hls_enabled(vhost)) {
 		return ret;
 	}
@@ -1156,7 +1155,6 @@ int SrsHls::on_publish(SrsRequest* req)
 	// if enabled, open the muxer.
 	hls_enabled = true;
 	
-	// TODO: subscribe the reload event.
 	int hls_fragment = config->get_hls_fragment(vhost);
 	int hls_window = config->get_hls_window(vhost);