epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3742 from Mailaender/stream-exts

Browse Source 
Ported everything to StreamExts
This commit is contained in:
Paul Chote
2013-08-25 02:40:00 -07:00
parent b5fcb297af 30363db0ed
commit 6dd18399c6
2 changed files with 23 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
OpenRA.FileFormats/FileFormats/AudLoader.cs
View File

@@ -31,12 +31,12 @@ namespace OpenRA.FileFormats
public int CompressedSize;
public int OutputSize;
public static Chunk Read(BinaryReader r)
public static Chunk Read(Stream s)
{
Chunk c;
c.CompressedSize = r.ReadUInt16();
c.OutputSize = r.ReadUInt16();
if (0xdeaf != r.ReadUInt32())
c.CompressedSize = s.ReadUInt16();
c.OutputSize = s.ReadUInt16();
if (0xdeaf != s.ReadUInt32())
throw new InvalidDataException("Chunk header is bogus");
return c;
}
@@ -78,7 +78,7 @@ namespace OpenRA.FileFormats
public static byte[] LoadSound(byte[] raw, ref int index)
{
var br = new BinaryReader(new MemoryStream(raw));
var s = new MemoryStream(raw);
var dataSize = raw.Length;
var outputSize = raw.Length * 4;
@@ -88,7 +88,7 @@ namespace OpenRA.FileFormats
while (dataSize-- > 0)
{
var b = br.ReadByte();
var b = s.ReadUInt8();
var t = DecodeSample(b, ref index, ref currentSample);
output[offset++] = (byte)t;
@@ -104,11 +104,10 @@ namespace OpenRA.FileFormats
public static float SoundLength(Stream s)
{
var br = new BinaryReader(s);
var sampleRate = br.ReadUInt16();
/*var dataSize = */ br.ReadInt32();
var outputSize = br.ReadInt32();
var flags = (SoundFlags)br.ReadByte();
var sampleRate = s.ReadUInt16();
/*var dataSize = */ s.ReadInt32();
var outputSize = s.ReadInt32();
var flags = (SoundFlags)s.ReadByte();
var samples = outputSize;
if (0 != (flags & SoundFlags.Stereo)) samples /= 2;
@@ -118,12 +117,11 @@ namespace OpenRA.FileFormats
public static byte[] LoadSound(Stream s)
{
var br = new BinaryReader(s);
/*var sampleRate =*/ br.ReadUInt16();
var dataSize = br.ReadInt32();
var outputSize = br.ReadInt32();
/*var flags = (SoundFlags)*/ br.ReadByte();
/*var format = (SoundFormat)*/ br.ReadByte();
/*var sampleRate =*/ s.ReadUInt16();
var dataSize = s.ReadInt32();
var outputSize = s.ReadInt32();
/*var flags = (SoundFlags)*/ s.ReadByte();
/*var format = (SoundFormat)*/ s.ReadByte();
var output = new byte[outputSize];
var offset = 0;
@@ -132,10 +130,10 @@ namespace OpenRA.FileFormats
while (dataSize > 0)
{
var chunk = Chunk.Read(br);
var chunk = Chunk.Read(s);
for (int n = 0; n < chunk.CompressedSize; n++)
{
var b = br.ReadByte();
var b = s.ReadUInt8();
var t = DecodeSample(b, ref index, ref currentSample);
output[offset++] = (byte)t;

16
OpenRA.FileFormats/Filesystem/ZipFile.cs
View File

@@ -66,7 +66,7 @@ namespace OpenRA.FileFormats
public IEnumerable<uint> ClassicHashes()
{
foreach(ZipEntry entry in pkg)
foreach (ZipEntry entry in pkg)
yield return PackageEntry.HashFilename(entry.Name, PackageHashType.Classic);
}
@@ -77,7 +77,7 @@ namespace OpenRA.FileFormats
public IEnumerable<string> AllFileNames()
{
foreach(ZipEntry entry in pkg)
foreach (ZipEntry entry in pkg)
yield return entry.Name;
}
@@ -91,20 +91,16 @@ namespace OpenRA.FileFormats
public void Write(Dictionary<string, byte[]> contents)
{
pkg.Close();
pkg = SZipFile.Create(filename);
pkg.BeginUpdate();
// TODO: Clear existing content?
pkg.Close();
pkg = SZipFile.Create(filename);
pkg.BeginUpdate();
foreach (var kvp in contents)
pkg.Add(new StaticMemoryDataSource(kvp.Value), kvp.Key);
pkg.CommitUpdate();
pkg.Close();
pkg = new SZipFile(new MemoryStream(File.ReadAllBytes(filename)));
}
}
@@ -112,7 +108,7 @@ namespace OpenRA.FileFormats
class StaticMemoryDataSource : IStaticDataSource
{
byte[] data;
public StaticMemoryDataSource (byte[] data)
public StaticMemoryDataSource(byte[] data)
{
this.data = data;
}