mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Tweaking time class.

Browse source 
Originally committed to SVN as r2445.
This commit is contained in:
Rodrigo Braz Monteiro 2008-11-10 01:57:33 +00:00
parent 5812315d85
commit c029e5aac8
1 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
athenasub/src/athenatime.cpp
View file

@ -136,17 +136,36 @@ void Time::ParseString(const String &data)
size_t len = data.Length();
size_t curIndex = 0;
char cur = 0;
bool gotDecimal = false;
for (size_t i=0;i<len;i++) {
cur = data[i];
if (cur == ':' || cur == '.' || cur == ',' || cur == ';') {
// Got a separator
bool isDecimalSeparator = (cur == '.' || cur == ',');
if (isDecimalSeparator || cur == ':' || cur == ';') {
if (isDecimalSeparator) {
if (gotDecimal) break;
gotDecimal = true;
}
values.at(curIndex++) = data.SubToInteger(last,i);
last = i+1;
}
// Reached end of string
if (i == len-1) {
int value = data.SubToInteger(last,len);
size_t digits = len - last;
if (digits == 2) value *= 10;
if (digits == 1) value *= 100;
// Ended in decimal, so we gotta normalize it to 3 digits
if (gotDecimal) {
if (digits != 3) {
if (digits == 2) value *= 10;
else if (digits == 1) value *= 100;
else if (digits > 3) {
}
}
}
values.at(curIndex++) = value;
}
}
@ -154,8 +173,9 @@ void Time::ParseString(const String &data)
// Turn into milliseconds
size_t mult[] = { 0, 1, 1000, 60000, 3600000 };
size_t accum = 0;
size_t adjust = gotDecimal ? 0 : 1;
for (int i=(int)curIndex;--i>=0;) {
accum += values[i] * mult[curIndex-i];
accum += values[i] * mult[curIndex-i+adjust];
}
// Set