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

Working DTSC Merge

Browse source
This commit is contained in:
Erik Zandvliet 2013-12-20 13:07:58 +01:00
parent 78ce2c4180
commit af0ae568c4
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/converters/dtscmerge.cpp
View file

@ -49,6 +49,7 @@ namespace Converters {
bool fullSort = true; bool fullSort = true;
std::map<std::string, DTSC::File> inFiles; std::map<std::string, DTSC::File> inFiles;
std::map<std::string, DTSC::Meta> metaData;
std::string outFileName = argv[1]; std::string outFileName = argv[1];
std::string tmpFileName; std::string tmpFileName;
for (int i = 2; i < argc; i++){ for (int i = 2; i < argc; i++){
@ -61,7 +62,7 @@ namespace Converters {
std::cerr << tmpFileName << " has not been run through DTSCFix yet." << std::endl; std::cerr << tmpFileName << " has not been run through DTSCFix yet." << std::endl;
return 1; return 1;
} }
inFiles.insert(std::pair<std::string,DTSC::File>(tmpFileName,DTSC::File(tmpFileName))); inFiles[tmpFileName] = F;
} }
} }
@ -87,7 +88,7 @@ namespace Converters {
std::multimap<int,keyframeInfo> allSorted; std::multimap<int,keyframeInfo> allSorted;
for (std::map<std::string,DTSC::File>::iterator it = inFiles.begin(); it != inFiles.end(); it++){ for (std::map<std::string,DTSC::File>::iterator it = inFiles.begin(); it != inFiles.end(); it++){
DTSC::Meta tmpMeta = it->second.getMeta(); DTSC::Meta tmpMeta(it->second.getMeta());
for (std::map<int,DTSC::Track>::iterator trackIt = tmpMeta.tracks.begin(); trackIt != tmpMeta.tracks.end(); trackIt++){ for (std::map<int,DTSC::Track>::iterator trackIt = tmpMeta.tracks.begin(); trackIt != tmpMeta.tracks.end(); trackIt++){
long long int oldID = trackIt->first; long long int oldID = trackIt->first;
long long int mappedID = getNextFree(trackMapping); long long int mappedID = getNextFree(trackMapping);