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

Only let AssTime be set to a valid time rather than handling invalid times on display 

Originally committed to SVN as r4826.
This commit is contained in:
Thomas Goyne 2010-10-27 21:17:41 +00:00
parent 6432ea1f94
commit 516b2cec93
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
aegisub/src/ass_time.cpp
View File

@ -112,7 +112,7 @@ void AssTime::ParseASS (const wxString text) {
}
// OK, set values
time = tms + tm*60000 + th*3600000;
SetMS(tms + tm*60000 + th*3600000);
}
@ -144,7 +144,7 @@ void AssTime::ParseSRT (const wxString _text) {
ms = tempv;
// Set value
time = ms + s*1000 + m*60000 + h*3600000;
SetMS(ms + s*1000 + m*60000 + h*3600000);
}
@ -161,8 +161,8 @@ int AssTime::GetMS () const {
/// @brief DOCME
/// @param _ms
///
void AssTime::SetMS (int _ms) {
time = _ms;
void AssTime::SetMS (int ms) {
time = MID(0, ms, 10 * 60 * 60 * 1000 - 1);
}
@ -178,21 +178,11 @@ wxString AssTime::GetASSFormated (bool msPrecision) const {
msPrecision = msPrecision || UseMSPrecision;
if (!msPrecision) ms = ms/10*10;
if (ms < 0) ms = 0;
int h = ms / (1000 * 60 * 60);
int m = (ms / (1000 * 60)) % 60;
int s = (ms / 1000) % 60;
ms = ms % 1000;
// Ass overflow
if (h > 9) {
h = 9;
m = 59;
s = 59;
ms = 999;
}
if (msPrecision) return wxString::Format(_T("%01i:%02i:%02i.%03i"),h,m,s,ms);
else return wxString::Format(_T("%01i:%02i:%02i.%02i"),h,m,s,ms/10);
}