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
This commit is contained in:
Thulinma 2020-02-12 11:55:56 +01:00
commit 606fce296a
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/stream.cpp
View file

@ -376,8 +376,11 @@ bool Util::startInput(std::string streamname, std::string filename, bool forkFir
FAIL_MSG("Required parameter %s for stream %s missing", prm.key().c_str(), streamname.c_str()); FAIL_MSG("Required parameter %s for stream %s missing", prm.key().c_str(), streamname.c_str());
return false; return false;
} }
HIGH_MSG("Setting option '%s' to '%s'", opt.c_str(), stream_cfg[prm.key()].asStringRef().c_str()); if (stream_cfg[prm.key()].isString()){
str_args[opt] = stream_cfg[opt].asStringRef(); str_args[opt] = stream_cfg[prm.key()].asStringRef();
}else{
str_args[opt] = stream_cfg[prm.key()].toString();
}
} }
} }
} }
@ -391,9 +394,12 @@ bool Util::startInput(std::string streamname, std::string filename, bool forkFir
HIGH_MSG("Overriding option '%s' to '%s'", prm.key().c_str(), overrides.at(prm.key()).c_str()); HIGH_MSG("Overriding option '%s' to '%s'", prm.key().c_str(), overrides.at(prm.key()).c_str());
str_args[opt] = overrides.at(prm.key()); str_args[opt] = overrides.at(prm.key());
}else{ }else{
if (stream_cfg.isMember(prm.key()) && stream_cfg[prm.key()].asStringRef().size()){ if (stream_cfg.isMember(prm.key()) && stream_cfg[prm.key()]){
HIGH_MSG("Setting option '%s' to '%s'", opt.c_str(), stream_cfg[prm.key()].asStringRef().c_str()); if (stream_cfg[prm.key()].isString()){
str_args[opt] = stream_cfg[prm.key()].asStringRef(); str_args[opt] = stream_cfg[prm.key()].asStringRef();
}else{
str_args[opt] = stream_cfg[prm.key()].toString();
}
} }
} }
if (!prm->isMember("type") && str_args.count(opt)){str_args[opt] = "";} if (!prm->isMember("type") && str_args.count(opt)){str_args[opt] = "";}