diff --git a/BallanceTasEditor/BallanceTasEditor/Backend/TasStorage.cs b/BallanceTasEditor/BallanceTasEditor/Backend/TasStorage.cs index 675c34c..907a0f8 100644 --- a/BallanceTasEditor/BallanceTasEditor/Backend/TasStorage.cs +++ b/BallanceTasEditor/BallanceTasEditor/Backend/TasStorage.cs @@ -52,7 +52,7 @@ namespace BallanceTasEditor.Backend { var totalByte = seq.GetCount() * SIZEOF_RAW_TAS_FRAME; fs.Write(BitConverter.GetBytes(totalByte), 0, SIZEOF_I32); - using (var zo = new Ionic.Zlib.ZlibStream(fs, Ionic.Zlib.CompressionMode.Compress, Ionic.Zlib.CompressionLevel.Level9, true)) { + using (var zo = new System.IO.Compression.ZLibStream(fs, System.IO.Compression.CompressionLevel.SmallestSize, true)) { foreach (var item in seq) { var rawItem = item.ToRaw(); zo.Write(BitConverter.GetBytes(rawItem.TimeDelta), 0, SIZEOF_F32); @@ -101,8 +101,8 @@ namespace BallanceTasEditor.Backend { ArgumentOutOfRangeException.ThrowIfNotEqual(remainder, 0); using (var mem = new MemoryStream()) { - using (var zo = new Ionic.Zlib.ZlibStream(mem, Ionic.Zlib.CompressionMode.Decompress, true)) { - CopyStream(fs, zo); + using (var zo = new System.IO.Compression.ZLibStream(fs, System.IO.Compression.CompressionMode.Decompress, true)) { + zo.CopyTo(mem); zo.Close(); } @@ -132,17 +132,6 @@ namespace BallanceTasEditor.Backend { //zo.Close(); } - private const int STREAM_COPY_CHUNK_SIZE = 10240; - - private static void CopyStream(Stream origin, Stream target) { - var buffer = new byte[STREAM_COPY_CHUNK_SIZE]; - int len; - while ((len = origin.Read(buffer, 0, STREAM_COPY_CHUNK_SIZE)) > 0) { - target.Write(buffer, 0, len); - } - //target.Flush(); - } - private sealed class EnumerableMemoryStream : IExactSizeEnumerable { public EnumerableMemoryStream(MemoryStream mem, int frameCnt) { m_MemoryStream = mem; diff --git a/BallanceTasEditor/BallanceTasEditor/BallanceTasEditor.csproj b/BallanceTasEditor/BallanceTasEditor/BallanceTasEditor.csproj index 53f668b..8051128 100644 --- a/BallanceTasEditor/BallanceTasEditor/BallanceTasEditor.csproj +++ b/BallanceTasEditor/BallanceTasEditor/BallanceTasEditor.csproj @@ -16,7 +16,6 @@ -