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

Fix gcc breakage caused by last commit, and remove an unused variable while at it.

Browse source 
Originally committed to SVN as r2937.
This commit is contained in:
Karl Blomster 2009-05-15 12:31:09 +00:00
parent a3cd374bc0
commit 5bb56ae5d4
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/ass_time.cpp
View file

@ -323,7 +323,7 @@ int FractionalTime::ToMillisecs (wxString _text) {
wxString re_str = _T(""); wxString re_str = _T("");
text.Trim(false); text.Trim(false);
text.Trim(true); text.Trim(true);
long h=0,m=0,s=0,ms=0,f=0; long h=0,m=0,s=0,f=0;
// hour minute second fraction // hour minute second fraction
re_str << _T("(\\d+)") << sep << _T("(\\d+)") << sep << _T("(\\d+)") << sep << _T("(\\d+)"); re_str << _T("(\\d+)") << sep << _T("(\\d+)") << sep << _T("(\\d+)") << sep << _T("(\\d+)");
@ -393,13 +393,12 @@ wxString FractionalTime::FromAssTime(AssTime time) {
// Milliseconds to SMPTE text string conversion // Milliseconds to SMPTE text string conversion
wxString FractionalTime::FromMillisecs(int64_t msec) { wxString FractionalTime::FromMillisecs(int64_t msec) {
int h=0, m=0, s=0, f=0; // hours, minutes, seconds, fractions int h=0, m=0, s=0, f=0; // hours, minutes, seconds, fractions
int fn = (msec*(int64_t)num) / (1000*den); // frame number
// return 00:00:00:00 // return 00:00:00:00
if (msec <= 0) if (msec <= 0)
goto RETURN; goto RETURN;
int fn = (msec*(int64_t)num) / (1000*den); // frame number
// dropframe? // dropframe?
if (drop) { if (drop) {
fn += 2 * (fn / (30 * 60)) - 2 * (fn / (30 * 60 * 10)); fn += 2 * (fn / (30 * 60)) - 2 * (fn / (30 * 60 * 10));