mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Delete unused SMPTE parsing code

Browse source 
Originally committed to SVN as r6118.
This commit is contained in:
Thomas Goyne 2011-12-22 21:28:04 +00:00
parent 3b83b9e31b
commit ab68b4b080
2 changed files with 0 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
aegisub/src/ass_time.cpp
View file

@ -267,60 +267,6 @@ FractionalTime::FractionalTime(int numerator, int denominator, bool dropframe)
throw "FractionalTime: nonsensical enumerator or denominator"; throw "FractionalTime: nonsensical enumerator or denominator";
} }
int FractionalTime::ToMillisecs(wxString text, char sep) {
text.Trim(false);
text.Trim(true);
wxRegEx re(wxString::Format("(\\d+)%c(\\d+)%c(\\d+)%c(\\d+)", sep, sep, sep, sep), wxRE_ADVANCED);
if (!re.Matches(text))
return 0; // FIXME: throw here too?
long h=0, m=0, s=0, f=0;
re.GetMatch(text,1).ToLong(&h);
re.GetMatch(text,2).ToLong(&m);
re.GetMatch(text,3).ToLong(&s);
re.GetMatch(text,4).ToLong(&f);
int msecs_f = 0;
int fn = 0;
// dropframe? do silly things
if (drop) {
fn += h * frames_per_period * 6;
fn += (m % 10) * frames_per_period;
if (m > 0) {
fn += 1800;
m--;
fn += m * 1798; // two timestamps dropped per minute after the first
fn += s * 30 + f - 2;
}
else { // minute is evenly divisible by 10, keep first two timestamps
fn += s * 30;
fn += f;
}
msecs_f = (fn * num) / den;
}
// no dropframe, may or may not sync with wallclock time
// (see comment in FromMillisecs for an explanation of why it's done like this)
else {
int fps_approx = floor((double(num)/double(den))+0.5);
fn += h * 3600 * fps_approx;
fn += m * 60 * fps_approx;
fn += s * fps_approx;
fn += f;
msecs_f = (fn * num) / den;
}
return msecs_f;
}
AssTime FractionalTime::ToAssTime(wxString text, char sep) {
return AssTime(ToMillisecs(text, sep));
}
wxString FractionalTime::FromAssTime(AssTime time, char sep) { wxString FractionalTime::FromAssTime(AssTime time, char sep) {
return FromMillisecs(time.GetMS(), sep); return FromMillisecs(time.GetMS(), sep);
} }

5
aegisub/src/ass_time.h
View file

@ -102,11 +102,6 @@ public:
int Denominator() const { return den; } int Denominator() const { return den; }
bool IsDrop() const { return drop; } bool IsDrop() const { return drop; }
/// Parse a SMPTE timecode, returning an AssTime
AssTime ToAssTime(wxString fractime, char sep=':');
/// Parse a SMPTE timecode, returning milliseconds
int ToMillisecs(wxString fractime, char sep=':');
/// Convert an AssTime to a SMPTE timecode /// Convert an AssTime to a SMPTE timecode
wxString FromAssTime(AssTime time, char sep=':'); wxString FromAssTime(AssTime time, char sep=':');
/// Convert milliseconds to a SMPTE timecode /// Convert milliseconds to a SMPTE timecode