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

Truncate syllables which extend past the end of the line rather than normalizing all of the syllable lengths

This commit is contained in:
Thomas Goyne 2012-10-16 14:29:31 -07:00
parent a267a15de0
commit 30165e4392
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
aegisub/src/ass_karaoke.cpp
View File

@ -143,17 +143,15 @@ void AssKaraoke::SetLine(AssDialogue *line, bool auto_split, bool normalize) {
if (last_end < end_time)
syls.back().duration += end_time - last_end;
else if (last_end > end_time) {
// Shrink each syllable proportionately
int start_time = active_line->Start;
double scale_factor = double(end_time - start_time) / (last_end - start_time);
// Truncate any syllables that extend past the end of the line
for (size_t i = 0; i < size(); ++i) {
syls[i].start_time = start_time + scale_factor * (syls[i].start_time - start_time);
}
for (int i = size(); i > 0; --i) {
syls[i - 1].duration = end_time - syls[i - 1].start_time;
end_time = syls[i - 1].start_time;
if (syls[i].start_time > end_time) {
syls[i].start_time = end_time;
syls[i].duration = 0;
}
else {
syls[i].duration = std::min(syls[i].duration, end_time - syls[i].start_time);
}
}
}
}