iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Support duplicate order numbers in Matroska files 

Such files are pretty broken, but apparently other stuff allows it.
This commit is contained in:
Thomas Goyne 2013-08-26 17:13:05 -07:00
parent f427c4574d
commit 51b21576cc
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
aegisub/src/mkv_wrap.cpp
View File

@ -80,7 +80,7 @@ public:
#endif #endif
static void read_subtitles(agi::ProgressSink *ps, MatroskaFile *file, MkvStdIO *input, bool srt, double totalTime, AssParser *parser) { static void read_subtitles(agi::ProgressSink *ps, MatroskaFile *file, MkvStdIO *input, bool srt, double totalTime, AssParser *parser) {
std::map<int, std::string> subList; std::vector<std::pair<int, std::string>> subList;
std::string readBuf; std::string readBuf;
// Load blocks // Load blocks
@ -105,12 +105,13 @@ static void read_subtitles(agi::ProgressSink *ps, MatroskaFile *file, MkvStdIO *
std::vector<boost::iterator_range<std::string::iterator>> chunks; std::vector<boost::iterator_range<std::string::iterator>> chunks;
boost::split(chunks, readBuf, boost::is_any_of(",")); boost::split(chunks, readBuf, boost::is_any_of(","));
subList[boost::lexical_cast<int>(chunks[0])] = subList.emplace_back(
boost::lexical_cast<int>(chunks[0]),
str(boost::format("Dialogue: %d,%s,%s,%s") str(boost::format("Dialogue: %d,%s,%s,%s")
% boost::lexical_cast<int>(chunks[1]) % boost::lexical_cast<int>(chunks[1])
% subStart.GetAssFormated() % subStart.GetAssFormated()
% subEnd.GetAssFormated() % subEnd.GetAssFormated()
% boost::make_iterator_range(begin(chunks[2]), readBuf.end())); % boost::make_iterator_range(begin(chunks[2]), readBuf.end())));
} }
// Process SRT // Process SRT
else { else {
@ -119,13 +120,14 @@ static void read_subtitles(agi::ProgressSink *ps, MatroskaFile *file, MkvStdIO *
boost::replace_all(readBuf, "\r", "\\N"); boost::replace_all(readBuf, "\r", "\\N");
boost::replace_all(readBuf, "\n", "\\N"); boost::replace_all(readBuf, "\n", "\\N");
subList[subList.size()] = readBuf; subList.emplace_back(subList.size(), readBuf);
} }
ps->SetProgress(startTime / timecodeScaleLow, totalTime); ps->SetProgress(startTime / timecodeScaleLow, totalTime);
} }
// Insert into file // Insert into file
sort(begin(subList), end(subList));
for (auto order_value_pair : subList) for (auto order_value_pair : subList)
parser->AddLine(order_value_pair.second); parser->AddLine(order_value_pair.second);
} }