hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed live stuff

Browse source
This commit is contained in:
Oswald Auguste de Bruin 2013-10-16 16:21:19 +02:00
parent f1b3ff276e
commit 1b9e594a8f
3 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/connectors/conn_http.cpp
View file

@ -213,7 +213,9 @@ namespace Connector_HTTP {
relurl = "/"; relurl = "/";
} }
for (JSON::ArrIter it = conncapa["methods"].ArrBegin(); it != conncapa["methods"].ArrEnd(); it++){ 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);
}
} }
} }
} }

1
src/connectors/conn_http_progressive_mp4.cpp
View file

@ -205,6 +205,7 @@ int main(int argc, char ** argv){
capa["methods"][0u]["handler"] = "http"; capa["methods"][0u]["handler"] = "http";
capa["methods"][0u]["type"] = "html5/video/mp4"; capa["methods"][0u]["type"] = "html5/video/mp4";
capa["methods"][0u]["priority"] = 8ll; capa["methods"][0u]["priority"] = 8ll;
capa["methods"][0u]["nolive"] = 1;
capa["socket"] = "http_progressive_mp4"; capa["socket"] = "http_progressive_mp4";
conf.addBasicConnectorOptions(capa); conf.addBasicConnectorOptions(capa);
conf.parseArgs(argc, argv); conf.parseArgs(argc, argv);

1
src/connectors/conn_http_progressive_ogg.cpp
View file

@ -228,6 +228,7 @@ int main(int argc, char ** argv){
capa["methods"][0u]["handler"] = "http"; capa["methods"][0u]["handler"] = "http";
capa["methods"][0u]["type"] = "html5/video/ogg"; capa["methods"][0u]["type"] = "html5/video/ogg";
capa["methods"][0u]["priority"] = 8ll; capa["methods"][0u]["priority"] = 8ll;
capa["methods"][0u]["nolive"] = 1;
conf.addBasicConnectorOptions(capa); conf.addBasicConnectorOptions(capa);
conf.parseArgs(argc, argv); conf.parseArgs(argc, argv);