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

Re-unified coding style.

Browse source
This commit is contained in:
Thulinma 2013-03-25 12:25:36 +01:00
parent fd1c2ff2f4
commit 14ba7f835a
4 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/buffer/player.cpp
View file

@ -80,17 +80,18 @@ int main(int argc, char** argv){
std::string meta_str = meta.toNetPacked();
in_out.Send(meta_str);
if ( !(meta.isMember("keytime") && meta.isMember("keybpos") && meta.isMember("keynum") && meta.isMember("keylen") && meta.isMember("frags")) && meta.isMember("video")){
if ( !(meta.isMember("keytime") && meta.isMember("keybpos") && meta.isMember("keynum") && meta.isMember("keylen") && meta.isMember("frags"))
&& meta.isMember("video")){
//file needs to be DTSCFix'ed! Run MistDTSCFix executable on it first
std::cerr << "Calculating / writing / updating VoD metadata..." << std::endl;
Util::Procs::Start("Fixer", Util::getMyPath() + "MistDTSCFix "+conf.getString("filename"));
Util::Procs::Start("Fixer", Util::getMyPath() + "MistDTSCFix " + conf.getString("filename"));
while (Util::Procs::isActive("Fixer")){
Util::sleep(5000);
}
std::cerr << "Done! Aborting this request to make sure all goes well." << std::endl;
return 1;
}
JSON::Value pausemark;
pausemark["datatype"] = "pause_marker";
pausemark["time"] = (long long int)0;