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
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/buffer/player.cpp
View file

@ -80,7 +80,8 @@ int main(int argc, char** argv){
std::string meta_str = meta.toNetPacked(); std::string meta_str = meta.toNetPacked();
in_out.Send(meta_str); 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 //file needs to be DTSCFix'ed! Run MistDTSCFix executable on it first
std::cerr << "Calculating / writing / updating VoD metadata..." << std::endl; 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"));

3
src/controller/controller.cpp
View file

@ -298,7 +298,8 @@ int main(int argc, char ** argv){
if (Request.isMember("vod")){ if (Request.isMember("vod")){
std::string thisfile = Request["vod"]["filename"]; std::string thisfile = Request["vod"]["filename"];
for (JSON::ObjIter oit = Controller::Storage["streams"].ObjBegin(); oit != Controller::Storage["streams"].ObjEnd(); ++oit){ for (JSON::ObjIter oit = Controller::Storage["streams"].ObjBegin(); oit != Controller::Storage["streams"].ObjEnd(); ++oit){
if ((oit->second.isMember("source") && oit->second["source"].asString() == thisfile) || (oit->second.isMember("channel") && oit->second["channel"]["URL"].asString() == thisfile)){ if ((oit->second.isMember("source") && oit->second["source"].asString() == thisfile)
|| (oit->second.isMember("channel") && oit->second["channel"]["URL"].asString() == thisfile)){
Controller::lastBuffer[oit->first] = Util::epoch(); Controller::lastBuffer[oit->first] = Util::epoch();
if (Request["vod"].isMember("meta")){ if (Request["vod"].isMember("meta")){
Controller::Storage["streams"][oit->first]["meta"] = Request["vod"]["meta"]; Controller::Storage["streams"][oit->first]["meta"] = Request["vod"]["meta"];

3
src/controller/controller_streams.cpp
View file

@ -82,7 +82,8 @@ namespace Controller {
startStream(jit->first, jit->second); startStream(jit->first, jit->second);
} }
if (currTime - lastBuffer[jit->first] > 5){ if (currTime - lastBuffer[jit->first] > 5){
if (jit->second.isMember("source") && jit->second["source"].asString().substr(0, 1) == "/" && jit->second.isMember("error") && jit->second["error"].asString() == "Available"){ if (jit->second.isMember("source") && jit->second["source"].asString().substr(0, 1) == "/" && jit->second.isMember("error")
&& jit->second["error"].asString() == "Available"){
jit->second["online"] = 2; jit->second["online"] = 2;
}else{ }else{
if (jit->second.isMember("error") && jit->second["error"].asString() == "Available"){ if (jit->second.isMember("error") && jit->second["error"].asString() == "Available"){

3
src/converters/dtscfix.cpp
View file

@ -21,7 +21,8 @@ namespace Converters {
return 1; return 1;
} }
if (oriheader["moreheader"].asInt() > 0){ if (oriheader["moreheader"].asInt() > 0){
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")){
std::cerr << "This file was already fixed or doesn't need fixing - cancelling." << std::endl; std::cerr << "This file was already fixed or doesn't need fixing - cancelling." << std::endl;
return 0; return 0;
} }