X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=main.cpp;h=fc36861f64ab827d22b988f387e1a2b2e9cba75b;hp=88c49f4513bf60521fe782a387cddaf53999506c;hb=20e85bd6901355cc40a6cfb4c0deb7232d9aa63f;hpb=061988af511f42da3cd584b4d983177504ddc177

diff --git a/main.cpp b/main.cpp
index 88c49f4..fc36861 100644
--- a/main.cpp
+++ b/main.cpp
@@ -194,19 +194,29 @@ void create_streams(const Config &config,
 
 		if (deserialized_urls.count(stream_config.url) == 0) {
 			stream_index = servers->add_stream(stream_config.url,
+			                                   stream_config.hls_url,
 			                                   stream_config.backlog_size,
 			                                   stream_config.prebuffering_bytes,
 			                                   Stream::Encoding(stream_config.encoding),
-			                                   Stream::Encoding(stream_config.src_encoding));
+			                                   Stream::Encoding(stream_config.src_encoding),
+			                                   stream_config.hls_frag_duration,
+			                                   stream_config.hls_backlog_margin,
+			                                   stream_config.allow_origin);
 		} else {
 			stream_index = servers->lookup_stream_by_url(stream_config.url);
 			assert(stream_index != -1);
 			servers->set_backlog_size(stream_index, stream_config.backlog_size);
+			if (!stream_config.hls_url.empty()) {
+				servers->register_hls_url(stream_index, stream_config.hls_url);
+			}
 			servers->set_prebuffering_bytes(stream_index, stream_config.prebuffering_bytes);
 			servers->set_encoding(stream_index,
 			                      Stream::Encoding(stream_config.encoding));
 			servers->set_src_encoding(stream_index,
 			                          Stream::Encoding(stream_config.src_encoding));
+			servers->set_hls_frag_duration(stream_index, stream_config.hls_frag_duration);
+			servers->set_hls_backlog_margin(stream_index, stream_config.hls_backlog_margin);
+			servers->set_allow_origin(stream_index, stream_config.allow_origin);
 		}
 
 		servers->set_pacing_rate(stream_index, stream_config.pacing_rate);