Merge pull request #1331 from ivandrofly/patch-300

Update (src/Forms/AddWaveformBatch.cs)
This commit is contained in:
Nikolaj Olsson 2015-10-08 07:16:25 +02:00
commit 49bdd7e032
2 changed files with 3 additions and 3 deletions

View File

@ -76,13 +76,13 @@ namespace Nikse.SubtitleEdit.Forms
buttonInputBrowse.Enabled = true;
}
private static readonly ICollection<string> ExcludedExtensions = new List<string> { ".srt", ".txt", ".exe", ".ass", ".sub", ".jpg", ".png", ".zip", ".rar" };
private void AddInputFile(string fileName)
{
try
{
var ext = Path.GetExtension(fileName).ToLowerInvariant();
var excludedExtensions = new List<string> { ".srt", ".txt", ".exe", ".ass", ".sub", ".jpg", ".png", ".zip", ".rar" };
if (string.IsNullOrEmpty(ext) || excludedExtensions.Contains(ext))
if (string.IsNullOrEmpty(ext) || ExcludedExtensions.Contains(ext))
{
return;
}

View File

@ -154,7 +154,7 @@ namespace Nikse.SubtitleEdit.Forms
frameRate = 25.0;
}
long ms = (long)Math.Round(1000 / frameRate);
long ms = (long)Math.Round(TimeCode.BaseUnit / frameRate);
labelOneFrameIsXMS.Text = string.Format(Configuration.Settings.Language.SetMinimumDisplayTimeBetweenParagraphs.OneFrameXisYMilliseconds, frameRate, ms);
}