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

Also read SRT files that use periods instead of commas to separate fractional seconds. 

Originally committed to SVN as r5848.
This commit is contained in:
Niels Martin Hansen 2011-11-15 03:43:33 +00:00
parent 1b6c1a69d3
commit a01b45fe3a
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
aegisub/src/subtitle_format_srt.cpp
View File

@ -317,6 +317,7 @@ static AssTime ReadSRTTime(const wxString &ts)
s = 0;
break;
case _T(','):
case _T('.'):
ci++;
goto milliseconds;
default:
@ -426,8 +427,7 @@ void SRTSubtitleFormat::ReadFile(wxString filename,wxString encoding) {
// See parsing algorithm at <http://devel.aegisub.org/wiki/SubtitleFormats/SRT>
// "hh:mm:ss,fff --> hh:mm:ss,fff" (e.g. "00:00:04,070 --> 00:00:10,04")
/// @todo: move the full parsing of SRT timestamps here, instead of having it in AssTime
wxRegEx timestamp_regex(L"^([0-9]{2}:[0-9]{2}:[0-9]{2},[0-9]{1,}) --> ([0-9]{2}:[0-9]{2}:[0-9]{2},[0-9]{1,})");
wxRegEx timestamp_regex(L"^[[:space:]]*([[:digit:]]{2}:[[:digit:]]{2}:[[:digit:]]{2}[[.comma.][.period.]][[:digit:]]{1,})[[:space:]]*-->[[:space:]]*([[:digit:]]{2}:[[:digit:]]{2}:[[:digit:]]{2}[[.comma.][.period.]][[:digit:]]{1,})");
if (!timestamp_regex.IsValid())
throw Aegisub::InternalError(L"Parsing SRT: Failed compiling regex", 0);
@ -477,7 +477,6 @@ found_timestamps:
line->group = L"[Events]";
line->Style = _T("Default");
line->Comment = false;
// this parsing should best be moved out of AssTime
line->Start = ReadSRTTime(timestamp_regex.GetMatch(text_line, 1));
line->End = ReadSRTTime(timestamp_regex.GetMatch(text_line, 2));
// store pointer to subtitle, we'll continue working on it