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

Move class

Browse Source
This commit is contained in:
Nikolaj Olsson 2020-01-27 21:45:42 +01:00
parent 6450f8fa1f
commit 54e86bc1c7
5 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libse/ContainerFormats/Mp4/Mp4Parser.cs
View File

@ -11,7 +11,7 @@ namespace Nikse.SubtitleEdit.Core.ContainerFormats.Mp4
/// </summary>
public class MP4Parser : Box
{
public string FileName { get; private set; }
public string FileName { get; }
public Moov Moov { get; private set; }
public List<Trak> GetSubtitleTracks()
@ -122,12 +122,6 @@ namespace Nikse.SubtitleEdit.Core.ContainerFormats.Mp4
}
}
public MP4Parser(Stream fs)
{
FileName = null;
ParseMp4(fs);
}
private void ParseMp4(Stream fs)
{
int count = 0;

12
libse/XSub.cs → libse/ContainerFormats/XSub.cs
View File

@ -2,14 +2,14 @@
using System.Collections.Generic;
using System.Drawing;
namespace Nikse.SubtitleEdit.Core
namespace Nikse.SubtitleEdit.Core.ContainerFormats
{
public class XSub
{
public TimeCode Start { get; set; }
public TimeCode End { get; set; }
public int Width { get; private set; }
public int Height { get; private set; }
public int Width { get; }
public int Height { get; }
private readonly byte[] _colorBuffer;
private readonly byte[] _rleBuffer;
@ -30,7 +30,7 @@ namespace Nikse.SubtitleEdit.Core
return new TimeCode(int.Parse(parts[0]), int.Parse(parts[1]), int.Parse(parts[2]), int.Parse(parts[3]));
}
private static int GenerateBitmap(FastBitmap bmp, byte[] buf, List<Color> fourColors)
private static void GenerateBitmap(FastBitmap bmp, byte[] buf, List<Color> fourColors)
{
int w = bmp.Width;
int h = bmp.Height;
@ -42,7 +42,7 @@ namespace Nikse.SubtitleEdit.Core
{
if (nibbleOffset >= nibbleEnd)
{
return -1;
return;
}
var v = GetNibble(buf, nibbleOffset++);
@ -89,7 +89,6 @@ namespace Nikse.SubtitleEdit.Core
nibbleOffset += (nibbleOffset & 1);
}
}
return 0;
}
private static int GetNibble(byte[] buf, int nibbleOffset)
@ -124,6 +123,5 @@ namespace Nikse.SubtitleEdit.Core
{
return GetImage(Color.Transparent, GetColor(3), GetColor(6), GetColor(9));
}
}
}

2
libse/LibSE.csproj
View File

@ -638,7 +638,7 @@
<Compile Include="VobSub\VobSubWriter.cs" />
<Compile Include="WaveToVisualizer.cs" />
<Compile Include="XmlDeserializerGenerator.cs" />
<Compile Include="XSub.cs" />
<Compile Include="ContainerFormats\XSub.cs" />
<Compile Include="ZipExtractor.cs" />
</ItemGroup>
<ItemGroup>

5
src/Forms/Main.cs
View File

@ -1,6 +1,7 @@
using Nikse.SubtitleEdit.Controls;
using Nikse.SubtitleEdit.Core;
using Nikse.SubtitleEdit.Core.BluRaySup;
using Nikse.SubtitleEdit.Core.ContainerFormats;
using Nikse.SubtitleEdit.Core.ContainerFormats.MaterialExchangeFormat;
using Nikse.SubtitleEdit.Core.ContainerFormats.Matroska;
using Nikse.SubtitleEdit.Core.ContainerFormats.Mp4;
@ -12,9 +13,11 @@ using Nikse.SubtitleEdit.Core.SpellCheck;
using Nikse.SubtitleEdit.Core.SubtitleFormats;
using Nikse.SubtitleEdit.Core.TransportStream;
using Nikse.SubtitleEdit.Core.VobSub;
using Nikse.SubtitleEdit.Forms.Networking;
using Nikse.SubtitleEdit.Forms.Ocr;
using Nikse.SubtitleEdit.Forms.Styles;
using Nikse.SubtitleEdit.Logic;
using Nikse.SubtitleEdit.Logic.CommandLineConvert;
using Nikse.SubtitleEdit.Logic.Networking;
using Nikse.SubtitleEdit.Logic.VideoPlayers;
using System;
@ -29,8 +32,6 @@ using System.Reflection;
using System.Text;
using System.Text.RegularExpressions;
using System.Windows.Forms;
using Nikse.SubtitleEdit.Forms.Networking;
using Nikse.SubtitleEdit.Logic.CommandLineConvert;
namespace Nikse.SubtitleEdit.Forms
{

1
src/Forms/Ocr/VobSubOcr.cs
View File

@ -1,6 +1,7 @@
using Nikse.SubtitleEdit.Controls;
using Nikse.SubtitleEdit.Core;
using Nikse.SubtitleEdit.Core.BluRaySup;
using Nikse.SubtitleEdit.Core.ContainerFormats;
using Nikse.SubtitleEdit.Core.SubtitleFormats;
using Nikse.SubtitleEdit.Core.TransportStream;
using Nikse.SubtitleEdit.Core.VobSub;