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

Changed pull mode detection to be internal to each input, made DTSC input compliant with JSON output styling guidelines.

Browse source
This commit is contained in:
Thulinma 2016-05-05 12:48:37 +02:00
parent 7e82673a13
commit 6386060c10
5 changed files with 31 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/input/input.cpp
View file

@ -83,7 +83,6 @@ namespace Mist {
singleton = this;
isBuffer = false;
streamMode = false;
}
void Input::checkHeaderTimes(std::string streamFile) {
@ -116,10 +115,6 @@ namespace Mist {
}
}
bool Input::needsLock() {
return !(config->hasOption("pull") && config->getBool("pull"));
}
int Input::run() {
if (config->getBool("json")) {
std::cout << capa.toString() << std::endl;
@ -132,11 +127,6 @@ namespace Mist {
streamName = config->getString("streamname");
nProxy.streamName = streamName;
streamMode = config->hasOption("pull") && config->getBool("pull");
INFO_MSG("Stream %s in %s mode", streamName.c_str(), streamMode ? "stream" : "non-stream");
if (!setup()) {
std::cerr << config->getString("cmd") << " setup failed." << std::endl;
return 0;
@ -151,7 +141,7 @@ namespace Mist {
if (!streamName.size()) {
convert();
} else if (streamMode) {
} else if (!needsLock()) {
stream();
}else{
serve();