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

Merge branch 'development' into LTS_development

Browse source 
# Conflicts:
#	lib/stream.cpp
#	lib/stream.h
#	src/input/input.cpp
#	src/output/output_http_internal.cpp
This commit is contained in:
Thulinma 2017-06-09 20:34:57 +02:00
commit bef46f969c
8 changed files with 74 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/input/input.cpp
View file

@ -293,6 +293,7 @@ namespace Mist {
}
finish();
DEBUG_MSG(DLVL_DEVEL, "Input for stream %s closing clean", streamName.c_str());
userPage.finishEach();
//end player functionality
}
@ -358,7 +359,7 @@ namespace Mist {
WARN_MSG("Stream already online, cancelling");
return;
}
if (!Util::startInput(streamName, "push://INTERNAL_ONLY:"+config->getString("input"))) {//manually override stream url to start the buffer
if (!Util::startInput(streamName, "push://INTERNAL_ONLY:"+config->getString("input"), true, true)) {//manually override stream url to start the buffer
pullLock.post();
pullLock.close();
pullLock.unlink();

1
src/input/input_buffer.cpp
View file

@ -85,6 +85,7 @@ namespace Mist {
/*LTS-end*/
capa["source_match"] = "push://*";
capa["non-provider"] = true;//Indicates we don't provide data, only collect it
capa["priority"] = 9ll;
capa["desc"] = "Provides buffered live input";
capa["codecs"][0u][0u].append("*");