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

More general approach

Browse Source
This commit is contained in:
Martijn van Berkel (Flitskikker) 2024-10-20 12:23:57 +02:00
parent 13cfef9144
commit c13db1f4a7
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -539,23 +539,24 @@ namespace Nikse.SubtitleEdit.Core.Forms
bestRightInCueFrame = newRightInCueFrame; bestRightInCueFrame = newRightInCueFrame;
} }
// Re-check if, with the new cues, the subtitles are actually connected
var newDistance = FramesToMilliseconds(bestRightInCueFrame) - FramesToMilliseconds(bestLeftOutCueFrame);
if (newDistance < Configuration.Settings.BeautifyTimeCodes.Profile.ConnectedSubtitlesTreatConnected)
{
// Yes, so handle using the designated function, ignoring its check connected check
// (because otherwise it would have handled it before going into the FixChainableSubtitles function)
FixConnectedSubtitles(leftParagraph, rightParagraph, checkConnected: false);
return true;
}
// Check cases // Check cases
var isLeftOutCueOnShotChange = IsCueOnShotChange(bestLeftOutCueFrame, false); var isLeftOutCueOnShotChange = IsCueOnShotChange(bestLeftOutCueFrame, false);
var isRightInCueOnShotChange = IsCueOnShotChange(bestRightInCueFrame, true); var isRightInCueOnShotChange = IsCueOnShotChange(bestRightInCueFrame, true);
var performGeneralChaining = false; var performGeneralChaining = false;
if (isLeftOutCueOnShotChange && isRightInCueOnShotChange if (isRightInCueOnShotChange)
&& bestLeftOutCueFrameInfo.result == FindBestCueResult.SnappedToRedZone && bestRightInCueFrameInfo.result == FindBestCueResult.SnappedToRedZone
&& bestLeftOutCueFrame == bestRightInCueFrame)
{
// If both cues are being snapped to the exact same shot change, the subtitles really are connected
// So, handle using the designated function, ignoring the "treat connected" value (because otherwise it would have handled it before going into this function)
FixConnectedSubtitles(leftParagraph, rightParagraph, checkConnected: false);
return true;
}
else if (isRightInCueOnShotChange)
{ {
// The right in cue is on a shot change // The right in cue is on a shot change
// Try to chain the subtitles // Try to chain the subtitles