From 1b9e594a8f107e15cac30ad8a9eecb66bbadbeda Mon Sep 17 00:00:00 2001 From: Oswald Auguste de Bruin Date: Wed, 16 Oct 2013 16:21:19 +0200 Subject: [PATCH] Fixed live stuff --- src/connectors/conn_http.cpp | 4 +++- src/connectors/conn_http_progressive_mp4.cpp | 1 + src/connectors/conn_http_progressive_ogg.cpp | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/connectors/conn_http.cpp b/src/connectors/conn_http.cpp index 13e87340..8546d19f 100644 --- a/src/connectors/conn_http.cpp +++ b/src/connectors/conn_http.cpp @@ -213,7 +213,9 @@ namespace Connector_HTTP { relurl = "/"; } for (JSON::ArrIter it = conncapa["methods"].ArrBegin(); it != conncapa["methods"].ArrEnd(); it++){ - addSource(relurl, sources, host, port, *it, most_simul, total_matches); + if (!ServConf["streams"][streamname]["meta"].isMember("live") || !it->isMember("nolive")){ + addSource(relurl, sources, host, port, *it, most_simul, total_matches); + } } } } diff --git a/src/connectors/conn_http_progressive_mp4.cpp b/src/connectors/conn_http_progressive_mp4.cpp index 293ac19c..31056098 100644 --- a/src/connectors/conn_http_progressive_mp4.cpp +++ b/src/connectors/conn_http_progressive_mp4.cpp @@ -205,6 +205,7 @@ int main(int argc, char ** argv){ capa["methods"][0u]["handler"] = "http"; capa["methods"][0u]["type"] = "html5/video/mp4"; capa["methods"][0u]["priority"] = 8ll; + capa["methods"][0u]["nolive"] = 1; capa["socket"] = "http_progressive_mp4"; conf.addBasicConnectorOptions(capa); conf.parseArgs(argc, argv); diff --git a/src/connectors/conn_http_progressive_ogg.cpp b/src/connectors/conn_http_progressive_ogg.cpp index f84e60c8..8bedfcd4 100644 --- a/src/connectors/conn_http_progressive_ogg.cpp +++ b/src/connectors/conn_http_progressive_ogg.cpp @@ -228,6 +228,7 @@ int main(int argc, char ** argv){ capa["methods"][0u]["handler"] = "http"; capa["methods"][0u]["type"] = "html5/video/ogg"; capa["methods"][0u]["priority"] = 8ll; + capa["methods"][0u]["nolive"] = 1; conf.addBasicConnectorOptions(capa); conf.parseArgs(argc, argv);