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

Avoid threading error in scene change generator - thx OmrSi :)

Browse Source
This commit is contained in:
Nikolaj Olsson 2020-09-27 08:43:50 +02:00
parent 33e884a667
commit da75565ae7
3 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Forms/AddWaveformBatch.cs
View File

@ -390,7 +390,7 @@ namespace Nikse.SubtitleEdit.Forms
}
}
}
var seconds = SceneChangesGenerator.GetSeconds(sceneChangesGenerator.TimeCodes.ToString().SplitToLines().ToArray());
var seconds = SceneChangesGenerator.GetSeconds(sceneChangesGenerator.GetTimeCodesString().SplitToLines().ToArray());
if (seconds.Count > 0)
{
SceneChangeHelper.SaveSceneChanges(videoFileName, seconds);

2
src/Forms/ImportSceneChanges.cs
View File

@ -366,7 +366,7 @@ namespace Nikse.SubtitleEdit.Forms
private void UpdateImportTextBox()
{
textBoxGenerate.Text = _sceneChangesGenerator.TimeCodes.ToString();
textBoxGenerate.Text = _sceneChangesGenerator.GetTimeCodesString();
textBoxGenerate.SelectionStart = textBoxGenerate.Text.Length;
textBoxGenerate.ScrollToCaret();
}

26
src/Logic/SceneChangesGenerator.cs
View File

@ -11,8 +11,18 @@ namespace Nikse.SubtitleEdit.Logic
{
public class SceneChangesGenerator
{
public StringBuilder Log { get; private set; }
public StringBuilder TimeCodes { get; private set; }
private StringBuilder Log { get; set; }
private StringBuilder _timeCodes;
public string GetTimeCodesString()
{
lock (TimeCodesLock)
{
return _timeCodes.ToString();
}
}
private static readonly object TimeCodesLock = new object();
public double LastSeconds { get; private set; }
private static readonly Regex TimeRegex = new Regex(@"pts_time:\d+[.,]*\d*", RegexOptions.Compiled);
@ -20,13 +30,16 @@ namespace Nikse.SubtitleEdit.Logic
public SceneChangesGenerator()
{
Log = new StringBuilder();
TimeCodes = new StringBuilder();
_timeCodes = new StringBuilder();
}
public Process GetProcess(string videoFileName, decimal threshold)
{
Log = new StringBuilder();
TimeCodes = new StringBuilder();
lock (TimeCodesLock)
{
_timeCodes = new StringBuilder();
}
var ffmpegLocation = Configuration.Settings.General.FFmpegLocation;
if (!Configuration.IsRunningOnWindows && (string.IsNullOrEmpty(ffmpegLocation) || !File.Exists(ffmpegLocation)))
{
@ -67,7 +80,10 @@ namespace Nikse.SubtitleEdit.Logic
var timeCode = match.Value.Replace("pts_time:", string.Empty).Replace(",", ".").Replace("٫", ".").Replace("⠨", ".");
if (double.TryParse(timeCode, NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out var seconds) && seconds > 0.2)
{
TimeCodes.AppendLine(TimeCode.FromSeconds(seconds).ToShortString());
lock (TimeCodesLock)
{
_timeCodes.AppendLine(TimeCode.FromSeconds(seconds).ToShortString());
}
LastSeconds = seconds;
}
}