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

Merge branch 'development' into LTS_development

Browse source
This commit is contained in:
Thulinma 2018-11-28 11:55:15 +01:00
commit 83665c4e3b
7 changed files with 34 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/controller/controller_storage.cpp
View file

@ -72,7 +72,7 @@ namespace Controller{
rlxLogs->setEndPos(logCounter);
}
}else{
std::cerr << kind << "|MistController|" << getpid() << "||" << message << "\n";
std::cerr << kind << "|MistController|" << getpid() << "|||" << message << "\n";
}
}

1
src/input/input.cpp
View file

@ -217,6 +217,7 @@ namespace Mist {
int Input::boot(int argc, char * argv[]){
if (!(config->parseArgs(argc, argv))){return 1;}
streamName = nProxy.streamName = config->getString("streamname");
Util::Config::streamName = streamName;
if (config->getBool("json")) {
std::cout << capa.toString() << std::endl;

1
src/output/output.cpp
View file

@ -92,6 +92,7 @@ namespace Mist{
//If we have a streamname option, set internal streamname to that option
if (!streamName.size() && config->hasOption("streamname")){
streamName = config->getString("streamname");
Util::Config::streamName = streamName;
}
/*LTS-START*/