Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-10-28 23:12:34 +01:00
Code Issues Projects Releases Wiki Activity

Make sure previous shot change fallback value is far away enough from zero

Browse Source
This commit is contained in:
Martijn van Berkel (Flitskikker) 2023-07-19 17:24:04 +02:00
parent 775ea9cb8d
commit 05ba89cdda
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -166,7 +166,7 @@ namespace Nikse.SubtitleEdit.Core.Forms
{
// Cues want to be pushed together. The connect subtitles are most likely between two shot changes that are close together
// For now, check which shot change is closer and align the cues around that, ignoring the zones
var previousShotChange = new List<int> { -1 }.Concat(_shotChangesFrames).Last(x => x <= newLeftOutCueFrame); // will return -1 if none found
var previousShotChange = new List<int> { int.MinValue }.Concat(_shotChangesFrames).Last(x => x <= newLeftOutCueFrame); // will return minValue if none found
var nextShotChange = _shotChangesFrames.Concat(new List<int> { int.MaxValue }).First(x => x >= newRightInCueFrame); // will return maxValue if none found
if (previousShotChange >= 0 && nextShotChange != int.MaxValue)
{
@ -255,7 +255,7 @@ namespace Nikse.SubtitleEdit.Core.Forms
private (int cueFrame, FindBestCueResult result) FindConnectedSubtitlesBestCueFrame(int cueFrame)
{
var previousShotChange = new List<int> { -1 }.Concat(_shotChangesFrames).Last(x => x <= cueFrame); // will return -1 if none found
var previousShotChange = new List<int> { int.MinValue }.Concat(_shotChangesFrames).Last(x => x <= cueFrame); // will return minValue if none found
var nextShotChange = _shotChangesFrames.Concat(new List<int> { int.MaxValue }).First(x => x >= cueFrame); // will return maxValue if none found
// If both not found, return self
@ -683,7 +683,7 @@ namespace Nikse.SubtitleEdit.Core.Forms
private (int cueFrame, FindBestCueResult result) FindBestCueFrame(int cueFrame, bool isInCue)
{
var previousShotChange = new List<int> { -1 }.Concat(_shotChangesFrames).Last(x => x <= cueFrame); // will return -1 if none found
var previousShotChange = new List<int> { int.MinValue }.Concat(_shotChangesFrames).Last(x => x <= cueFrame); // will return minValue if none found
var nextShotChange = _shotChangesFrames.Concat(new List<int> { int.MaxValue }).First(x => x >= cueFrame); // will return maxValue if none found
// If both not found, return self