winlin

fix the format to unix without x

正在显示 44 个修改的文件 包含 19 行增加0 行删除
@@ -17,6 +17,13 @@ vhost removed.vhost.com { @@ -17,6 +17,13 @@ vhost removed.vhost.com {
17 # default: on 17 # default: on
18 enabled off; 18 enabled off;
19 } 19 }
  20 +# the vhost with hls disabled.
  21 +vhost no-hls.vhost.com {
  22 + # whether the hls is enabled.
  23 + # if off, donot write hls(ts and m3u8) when publish.
  24 + # default: on
  25 + hls off;
  26 +}
20 # the vhost for min delay, donot cache any stream. 27 # the vhost for min delay, donot cache any stream.
21 vhost min.delay.com { 28 vhost min.delay.com {
22 # whether cache the last gop. 29 # whether cache the last gop.
@@ -562,6 +562,17 @@ SrsConfDirective* SrsConfig::get_gop_cache(std::string vhost) @@ -562,6 +562,17 @@ SrsConfDirective* SrsConfig::get_gop_cache(std::string vhost)
562 return conf->get("gop_cache"); 562 return conf->get("gop_cache");
563 } 563 }
564 564
  565 +SrsConfDirective* SrsConfig::get_hls(std::string vhost)
  566 +{
  567 + SrsConfDirective* conf = get_vhost(vhost);
  568 +
  569 + if (!conf) {
  570 + return NULL;
  571 + }
  572 +
  573 + return conf->get("hls");
  574 +}
  575 +
565 SrsConfDirective* SrsConfig::get_refer(std::string vhost) 576 SrsConfDirective* SrsConfig::get_refer(std::string vhost)
566 { 577 {
567 SrsConfDirective* conf = get_vhost(vhost); 578 SrsConfDirective* conf = get_vhost(vhost);
@@ -109,6 +109,7 @@ public: @@ -109,6 +109,7 @@ public:
109 virtual int parse_options(int argc, char** argv); 109 virtual int parse_options(int argc, char** argv);
110 virtual SrsConfDirective* get_vhost(std::string vhost); 110 virtual SrsConfDirective* get_vhost(std::string vhost);
111 virtual SrsConfDirective* get_gop_cache(std::string vhost); 111 virtual SrsConfDirective* get_gop_cache(std::string vhost);
  112 + virtual SrsConfDirective* get_hls(std::string vhost);
112 virtual SrsConfDirective* get_refer(std::string vhost); 113 virtual SrsConfDirective* get_refer(std::string vhost);
113 virtual SrsConfDirective* get_refer_play(std::string vhost); 114 virtual SrsConfDirective* get_refer_play(std::string vhost);
114 virtual SrsConfDirective* get_refer_publish(std::string vhost); 115 virtual SrsConfDirective* get_refer_publish(std::string vhost);