Refactor (src/Logic/SubtitleFormats/NciCaption.cs)

This commit is contained in:
ivandroly 2015-07-11 01:38:00 +00:00
parent 9a267c496a
commit a56b4cc85f

View File

@ -78,12 +78,11 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
int seconds = buffer[index + 2];
int frames = buffer[index + 3];
int milliseconds = (int)((TimeCode.BaseUnit / Configuration.Settings.General.CurrentFrameRate) * frames);
int milliseconds = (int)(TimeCode.BaseUnit / Configuration.Settings.General.CurrentFrameRate * frames);
if (milliseconds > 999)
milliseconds = 999;
TimeCode tc = new TimeCode(hour, minutes, seconds, milliseconds);
return tc;
return new TimeCode(hour, minutes, seconds, milliseconds);
}
public override void LoadSubtitle(Subtitle subtitle, List<string> lines, string fileName)
@ -97,6 +96,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
string title = Encoding.ASCII.GetString(buffer, 82, 66);
int i = 128;
var encoding = Encoding.GetEncoding(1252);
while (i < buffer.Length - 66)
{
if (buffer[i] == 0xff && buffer[i + 1] == 0xff && buffer[i + 3] != 0xff && buffer[i - 1] != 0xff && buffer[i + 64] == 0xff && buffer[i + 65] == 0xff)
@ -122,7 +122,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
}
else
{
sb.Append(Encoding.GetEncoding(1252).GetString(buffer, j, 1));
sb.Append(encoding.GetString(buffer, j, 1));
j++;
}
}