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

Implement gaps in waveform snapping

Browse Source
This commit is contained in:
Martijn van Berkel (Flitskikker) 2023-05-20 23:49:29 +02:00
parent db6b8af630
commit 7958a138e4
3 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libse/Common/ShotChangeHelper.cs
View File

@ -3,6 +3,7 @@ using System.Globalization;
using System.IO;
using System.Linq;
using System.Text;
using Nikse.SubtitleEdit.Core.Forms;
namespace Nikse.SubtitleEdit.Core.Common
{
@ -80,8 +81,7 @@ namespace Nikse.SubtitleEdit.Core.Common
public static double GetNextShotChangeMinusGapInMs(List<double> shotChanges, TimeCode currentTime)
{
var nextShotChangeInSeconds = shotChanges.Concat(new[] { double.MaxValue }).First(x => x >= currentTime.TotalSeconds); // will return maxValue if empty
var outCueGapInMs = (TimeCode.BaseUnit / Configuration.Settings.General.CurrentFrameRate) * Configuration.Settings.BeautifyTimeCodes.Profile.OutCuesGap;
return (nextShotChangeInSeconds * 1000) - outCueGapInMs;
return (nextShotChangeInSeconds * 1000) - BeautifyTimeCodes.GetOutCuesGapMs();
}
}
}

14
src/libse/Forms/BeautifyTimeCodes.cs
View File

@ -3,10 +3,22 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Nikse.SubtitleEdit.Core.Common;
namespace Nikse.SubtitleEdit.Core.Forms
{
internal class BeautifyTimeCodes
public static class BeautifyTimeCodes
{
// Utils
public static double GetInCuesGapMs(double? frameRate = null)
{
return (TimeCode.BaseUnit / (frameRate ?? Configuration.Settings.General.CurrentFrameRate)) * Configuration.Settings.BeautifyTimeCodes.Profile.InCuesGap;
}
public static double GetOutCuesGapMs(double? frameRate = null)
{
return (TimeCode.BaseUnit / (frameRate ?? Configuration.Settings.General.CurrentFrameRate)) * Configuration.Settings.BeautifyTimeCodes.Profile.OutCuesGap;
}
}
}

25
src/ui/Controls/AudioVisualizer.cs
View File

@ -10,6 +10,7 @@ using System.Linq;
using System.Runtime.CompilerServices;
using System.Threading.Tasks;
using System.Windows.Forms;
using Nikse.SubtitleEdit.Core.Forms;
namespace Nikse.SubtitleEdit.Controls
{
@ -1730,8 +1731,8 @@ namespace Nikse.SubtitleEdit.Controls
{
var nearestShotChange = _shotChanges.Count > 0 ? _shotChanges.Aggregate((x, y) => Math.Abs((x * 1000) - milliseconds) < Math.Abs((y * 1000) - milliseconds) ? x : y) : -9999;
if (Math.Abs(e.X - SecondsToXPosition(nearestShotChange - _startPositionSeconds)) < ShotChangeSnapPixels)
{
_mouseDownParagraph.StartTime.TotalMilliseconds = nearestShotChange * 1000;
{
_mouseDownParagraph.StartTime.TotalMilliseconds = (nearestShotChange * 1000) + BeautifyTimeCodes.GetInCuesGapMs();
}
}
@ -1749,7 +1750,7 @@ namespace Nikse.SubtitleEdit.Controls
var nearestShotChange = _shotChanges.Count > 0 ? _shotChanges.Aggregate((x, y) => Math.Abs((x * 1000) - milliseconds) < Math.Abs((y * 1000) - milliseconds) ? x : y) : -9999;
if (Math.Abs(e.X - SecondsToXPosition(nearestShotChange - _startPositionSeconds)) < ShotChangeSnapPixels)
{
NewSelectionParagraph.StartTime.TotalMilliseconds = nearestShotChange * 1000;
NewSelectionParagraph.StartTime.TotalMilliseconds = (nearestShotChange * 1000) + BeautifyTimeCodes.GetInCuesGapMs();
}
}
@ -1788,7 +1789,7 @@ namespace Nikse.SubtitleEdit.Controls
var nearestShotChange = _shotChanges.Count > 0 ? _shotChanges.Aggregate((x, y) => Math.Abs((x * 1000) - milliseconds) < Math.Abs((y * 1000) - milliseconds) ? x : y) : -9999;
if (Math.Abs(e.X - SecondsToXPosition(nearestShotChange - _startPositionSeconds)) < ShotChangeSnapPixels)
{
_mouseDownParagraph.EndTime.TotalMilliseconds = nearestShotChange * 1000;
_mouseDownParagraph.EndTime.TotalMilliseconds = (nearestShotChange * 1000) - BeautifyTimeCodes.GetOutCuesGapMs();
}
}
@ -1806,7 +1807,7 @@ namespace Nikse.SubtitleEdit.Controls
var nearestShotChange = _shotChanges.Count > 0 ? _shotChanges.Aggregate((x, y) => Math.Abs((x * 1000) - milliseconds) < Math.Abs((y * 1000) - milliseconds) ? x : y) : -9999;
if (Math.Abs(e.X - SecondsToXPosition(nearestShotChange - _startPositionSeconds)) < ShotChangeSnapPixels)
{
NewSelectionParagraph.EndTime.TotalMilliseconds = nearestShotChange * 1000;
NewSelectionParagraph.EndTime.TotalMilliseconds = (nearestShotChange * 1000) - BeautifyTimeCodes.GetOutCuesGapMs();
}
}
@ -1839,13 +1840,15 @@ namespace Nikse.SubtitleEdit.Controls
if (Math.Abs(SecondsToXPosition(_mouseDownParagraph.StartTime.TotalSeconds - _startPositionSeconds) - SecondsToXPosition(nearestShotChangeInFront - _startPositionSeconds)) < ShotChangeSnapPixels)
{
_mouseDownParagraph.StartTime.TotalMilliseconds = nearestShotChangeInFront * 1000;
_mouseDownParagraph.EndTime.TotalMilliseconds = (nearestShotChangeInFront * 1000) + durationMilliseconds;
var nearestShotChangeInFrontMs = (nearestShotChangeInFront * 1000) + BeautifyTimeCodes.GetInCuesGapMs();
_mouseDownParagraph.StartTime.TotalMilliseconds = nearestShotChangeInFrontMs;
_mouseDownParagraph.EndTime.TotalMilliseconds = nearestShotChangeInFrontMs + durationMilliseconds;
}
else if (Math.Abs(SecondsToXPosition(_mouseDownParagraph.EndTime.TotalSeconds - _startPositionSeconds) - SecondsToXPosition(nearestShotChangeInBack - _startPositionSeconds)) < ShotChangeSnapPixels)
{
_mouseDownParagraph.EndTime.TotalMilliseconds = nearestShotChangeInBack * 1000;
_mouseDownParagraph.StartTime.TotalMilliseconds = (nearestShotChangeInBack * 1000) - durationMilliseconds;
var nearestShotChangeInBackMs = (nearestShotChangeInBack * 1000) - BeautifyTimeCodes.GetOutCuesGapMs();
_mouseDownParagraph.EndTime.TotalMilliseconds = nearestShotChangeInBackMs;
_mouseDownParagraph.StartTime.TotalMilliseconds = nearestShotChangeInBackMs - durationMilliseconds;
}
}
@ -1901,12 +1904,12 @@ namespace Nikse.SubtitleEdit.Controls
if (Math.Abs(SecondsToXPosition(NewSelectionParagraph.StartTime.TotalSeconds - _startPositionSeconds) - SecondsToXPosition(nearestShotChangeInFront - _startPositionSeconds)) < ShotChangeSnapPixels)
{
NewSelectionParagraph.StartTime.TotalMilliseconds = nearestShotChangeInFront * 1000;
NewSelectionParagraph.StartTime.TotalMilliseconds = (nearestShotChangeInFront * 1000) + BeautifyTimeCodes.GetInCuesGapMs();
Invalidate();
}
if (Math.Abs(SecondsToXPosition(NewSelectionParagraph.EndTime.TotalSeconds - _startPositionSeconds) - SecondsToXPosition(nearestShotChangeInBack - _startPositionSeconds)) < ShotChangeSnapPixels)
{
NewSelectionParagraph.EndTime.TotalMilliseconds = nearestShotChangeInBack * 1000;
NewSelectionParagraph.EndTime.TotalMilliseconds = (nearestShotChangeInBack * 1000) - BeautifyTimeCodes.GetOutCuesGapMs();
Invalidate();
}
}