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

Spelling corrections, FFMPEG-Error detection.

Browse source
This commit is contained in:
Erik Zandvliet 2013-03-07 16:15:08 +01:00 • committed by Thulinma
parent dce6d4b030
commit 9a9b5f8fe6
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
lib/converter.cpp
View file

@ -177,11 +177,9 @@ namespace Converter {
if (Util::Procs::isActive(cIt->first)){ if (Util::Procs::isActive(cIt->first)){
continue; continue;
} }
if (cIt->second["output"].asString().find(".dtsc") != std::string::npos){ if (statusHistory.find( cIt->first ) == statusHistory.end()){
statusHistory[cIt->first] = "Conversion succesful, running DTSCFix"; statusHistory[cIt->first] = "Conversion successful, running DTSCFix";
Util::Procs::Start(cIt->first+"DTSCFix",Util::getMyPath() + "MistDTSCFix " + cIt->second["output"].asString()); Util::Procs::Start(cIt->first+"DTSCFix",Util::getMyPath() + "MistDTSCFix " + cIt->second["output"].asString());
}else{
statusHistory[cIt->first] = "Conversion succesful";
} }
allConversions.erase(cIt); allConversions.erase(cIt);
hasChanged = true; hasChanged = true;
@ -196,7 +194,7 @@ namespace Converter {
if (Util::Procs::isActive(sIt->first+"DTSCFIX")){ if (Util::Procs::isActive(sIt->first+"DTSCFIX")){
continue; continue;
} }
statusHistory[sIt->first] = "Conversion succesful"; statusHistory[sIt->first] = "Conversion successful";
} }
} }
} }
@ -240,10 +238,17 @@ namespace Converter {
totalTime += atoi(line.substr(curOffset+9, 2).c_str()) * 10; totalTime += atoi(line.substr(curOffset+9, 2).c_str()) * 10;
cIt->second["duration"] = totalTime; cIt->second["duration"] = totalTime;
} }
}while(line.find("frame") != 0);//"frame" is the fist word on an actual status line of ffmpeg }while ( !feof(statusFile) && line.find("frame") != 0);//"frame" is the fist word on an actual status line of ffmpeg
result[cIt->first] = parseFFMpegStatus( line ); if ( !feof(statusFile)){
result[cIt->first]["duration"] = cIt->second["duration"]; result[cIt->first] = parseFFMpegStatus( line );
result[cIt->first]["progress"] = (result[cIt->first]["time"].asInt() * 100) / cIt->second["duration"].asInt(); result[cIt->first]["duration"] = cIt->second["duration"];
result[cIt->first]["progress"] = (result[cIt->first]["time"].asInt() * 100) / cIt->second["duration"].asInt();
}else{
line.erase(line.end()-1);
line = line.substr( line.rfind("\n") + 1 );
result[cIt->first] = line;
statusHistory[cIt->first] = line;
}
free(fileBuf); free(fileBuf);
fclose(statusFile); fclose(statusFile);
} }