Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-11-22 19:22:53 +01:00
Code Issues Projects Releases Wiki Activity

If not ignoring an overlap, fix it first to prevent unwanted outcomes

Browse Source
This commit is contained in:
Martijn van Berkel (Flitskikker) 2023-12-17 23:45:03 +01:00
parent 9d7f8e3bc3
commit 8f5cc96d6d
1 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/libse/Forms/TimeCodesBeautifier.cs
View File

@ -109,10 +109,22 @@ namespace Nikse.SubtitleEdit.Core.Forms
var distance = rightParagraph.StartTime.TotalMilliseconds - leftParagraph.EndTime.TotalMilliseconds;
// If an overlap threshold is set, don't connect if threshold exceeded
if (distance < 0 && Configuration.Settings.BeautifyTimeCodes.OverlapThreshold > 0 && Math.Abs(distance) >= Configuration.Settings.BeautifyTimeCodes.OverlapThreshold)
// Check if there is an overlap
if (distance < 0)
{
return false;
// If an overlap threshold is set, don't connect if threshold exceeded
if (Configuration.Settings.BeautifyTimeCodes.OverlapThreshold > 0 && Math.Abs(distance) >= Configuration.Settings.BeautifyTimeCodes.OverlapThreshold)
{
return false;
}
else
{
// We are continuing, but there is still an overlap, so fix that first
leftParagraph.EndTime.TotalMilliseconds = rightParagraph.StartTime.TotalMilliseconds - 1;
// Re-calculate distance
distance = rightParagraph.StartTime.TotalMilliseconds - leftParagraph.EndTime.TotalMilliseconds;
}
}
var subtitlesAreConnected = distance < Configuration.Settings.BeautifyTimeCodes.Profile.ConnectedSubtitlesTreatConnected;
@ -472,10 +484,19 @@ namespace Nikse.SubtitleEdit.Core.Forms
var distance = rightParagraph.StartTime.TotalMilliseconds - leftParagraph.EndTime.TotalMilliseconds;
// If an overlap threshold is set, don't chain if threshold exceeded
if (distance < 0 && Configuration.Settings.BeautifyTimeCodes.OverlapThreshold > 0 && Math.Abs(distance) >= Configuration.Settings.BeautifyTimeCodes.OverlapThreshold)
// Check if there is an overlap
if (distance < 0)
{
return false;
// If an overlap threshold is set, don't chain if threshold exceeded
if (Configuration.Settings.BeautifyTimeCodes.OverlapThreshold > 0 && Math.Abs(distance) >= Configuration.Settings.BeautifyTimeCodes.OverlapThreshold)
{
return false;
}
else
{
// We are continuing, but there is still an overlap, so fix that first
leftParagraph.EndTime.TotalMilliseconds = rightParagraph.StartTime.TotalMilliseconds - 1;
}
}
var newLeftOutCueFrame = MillisecondsToFrames(leftParagraph.EndTime.TotalMilliseconds);