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

Fix constant stream restarting.

Browse source
This commit is contained in:
Thulinma 2012-01-05 14:47:24 +01:00
parent ab4035bf02
commit 919e10799d
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
DDV_Controller/main.cpp
View file

@ -303,6 +303,12 @@ void CheckConfig(Json::Value & in, Json::Value & out){
out["version"] = TOSTRING(VERSION); out["version"] = TOSTRING(VERSION);
} }
bool streamsEqual(Json::Value & one, Json::Value & two){
if (one["channel"]["URL"].asString() != two["channel"]["URL"].asString()){return false;}
if (one["preset"]["cmd"].asString() != two["preset"]["cmd"].asString()){return false;}
return true;
}
void startStream(std::string name, Json::Value & data){ void startStream(std::string name, Json::Value & data){
Log("BUFF", "(re)starting stream buffer "+name); Log("BUFF", "(re)starting stream buffer "+name);
std::string URL = data["channel"]["URL"].asString(); std::string URL = data["channel"]["URL"].asString();
@ -337,7 +343,7 @@ void CheckStreams(Json::Value & in, Json::Value & out){
if (in.isObject() && (in.size() > 0)){ if (in.isObject() && (in.size() > 0)){
for (Json::ValueIterator jit = in.begin(); jit != in.end(); jit++){ for (Json::ValueIterator jit = in.begin(); jit != in.end(); jit++){
if (out.isObject() && out.isMember(jit.memberName())){ if (out.isObject() && out.isMember(jit.memberName())){
if (in[jit.memberName()] != out[jit.memberName()]){ if (!streamsEqual(in[jit.memberName()], out[jit.memberName()])){
Log("STRM", std::string("Updated stream ")+jit.memberName()); Log("STRM", std::string("Updated stream ")+jit.memberName());
Util::Procs::Stop(jit.memberName()); Util::Procs::Stop(jit.memberName());
startStream(jit.memberName(), in[jit.memberName()]); startStream(jit.memberName(), in[jit.memberName()]);