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

Rename another Stream.Write(byte[]) extension method.

Browse Source
This commit is contained in:
Paul Chote
2018-03-07 20:27:22 +00:00
committed by abcdefg30
parent fadcfa0828
commit e69cf4fd5c
4 changed files with 39 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Game/Network/OrderIO.cs
View File

@@ -16,13 +16,6 @@ namespace OpenRA.Network
{ {
public static class OrderIO public static class OrderIO
{ {
// Note: renamed from Write() to avoid being aliased by
// System.IO.Stream.Write(System.ReadOnlySpan) (which is not implemented in Mono)
public static void WriteArray(this Stream s, byte[] buf)
{
s.Write(buf, 0, buf.Length);
}
public static List<Order> ToOrderList(this byte[] bytes, World world) public static List<Order> ToOrderList(this byte[] bytes, World world)
{ {
var ms = new MemoryStream(bytes, 4, bytes.Length - 4); var ms = new MemoryStream(bytes, 4, bytes.Length - 4);

8
OpenRA.Game/StreamExts.cs
View File

@@ -81,7 +81,7 @@ namespace OpenRA
public static void Write(this Stream s, int value) public static void Write(this Stream s, int value)
{ {
s.Write(BitConverter.GetBytes(value)); s.WriteArray(BitConverter.GetBytes(value));
} }
public static float ReadFloat(this Stream s) public static float ReadFloat(this Stream s)
@@ -131,7 +131,9 @@ namespace OpenRA
} }
} }
public static void Write(this Stream s, byte[] data) // Note: renamed from Write() to avoid being aliased by
// System.IO.Stream.Write(System.ReadOnlySpan) (which is not implemented in Mono)
public static void WriteArray(this Stream s, byte[] data)
{ {
s.Write(data, 0, data.Length); s.Write(data, 0, data.Length);
} }
@@ -166,7 +168,7 @@ namespace OpenRA
bytes = new byte[0]; bytes = new byte[0];
s.Write(bytes.Length); s.Write(bytes.Length);
s.Write(bytes); s.WriteArray(bytes);
return 4 + bytes.Length; return 4 + bytes.Length;
} }

62
OpenRA.Mods.Cnc/FileSystem/BagFile.cs
View File

@@ -55,19 +55,19 @@ namespace OpenRA.Mods.Cnc.FileSystem
if ((entry.Flags & 2) > 0) if ((entry.Flags & 2) > 0)
{ {
// PCM // PCM
waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("RIFF")); waveHeaderMemoryStream.WriteArray(Encoding.ASCII.GetBytes("RIFF"));
waveHeaderMemoryStream.Write(BitConverter.GetBytes(entry.Length + 36)); waveHeaderMemoryStream.WriteArray(BitConverter.GetBytes(entry.Length + 36));
waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("WAVE")); waveHeaderMemoryStream.WriteArray(Encoding.ASCII.GetBytes("WAVE"));
waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("fmt ")); waveHeaderMemoryStream.WriteArray(Encoding.ASCII.GetBytes("fmt "));
waveHeaderMemoryStream.Write(BitConverter.GetBytes(16)); waveHeaderMemoryStream.WriteArray(BitConverter.GetBytes(16));
waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)1)); waveHeaderMemoryStream.WriteArray(BitConverter.GetBytes((short)1));
waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)channels)); waveHeaderMemoryStream.WriteArray(BitConverter.GetBytes((short)channels));
waveHeaderMemoryStream.Write(BitConverter.GetBytes(entry.SampleRate)); waveHeaderMemoryStream.WriteArray(BitConverter.GetBytes(entry.SampleRate));
waveHeaderMemoryStream.Write(BitConverter.GetBytes(2 * channels * entry.SampleRate)); waveHeaderMemoryStream.WriteArray(BitConverter.GetBytes(2 * channels * entry.SampleRate));
waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)(2 * channels))); waveHeaderMemoryStream.WriteArray(BitConverter.GetBytes((short)(2 * channels)));
waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)16)); waveHeaderMemoryStream.WriteArray(BitConverter.GetBytes((short)16));
waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("data")); waveHeaderMemoryStream.WriteArray(Encoding.ASCII.GetBytes("data"));
waveHeaderMemoryStream.Write(BitConverter.GetBytes(entry.Length)); waveHeaderMemoryStream.WriteArray(BitConverter.GetBytes(entry.Length));
} }
if ((entry.Flags & 8) > 0) if ((entry.Flags & 8) > 0)
@@ -77,24 +77,24 @@ namespace OpenRA.Mods.Cnc.FileSystem
var bytesPerSec = (int)Math.Floor(((double)(2 * entry.ChunkSize) / samplesPerChunk) * ((double)entry.SampleRate / 2)); var bytesPerSec = (int)Math.Floor(((double)(2 * entry.ChunkSize) / samplesPerChunk) * ((double)entry.SampleRate / 2));
var chunkSize = entry.ChunkSize > entry.Length ? entry.Length : entry.ChunkSize; var chunkSize = entry.ChunkSize > entry.Length ? entry.Length : entry.ChunkSize;
waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("RIFF")); waveHeaderMemoryStream.WriteArray(Encoding.ASCII.GetBytes("RIFF"));
waveHeaderMemoryStream.Write(BitConverter.GetBytes(entry.Length + 52)); waveHeaderMemoryStream.WriteArray(BitConverter.GetBytes(entry.Length + 52));
waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("WAVE")); waveHeaderMemoryStream.WriteArray(Encoding.ASCII.GetBytes("WAVE"));
waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("fmt ")); waveHeaderMemoryStream.WriteArray(Encoding.ASCII.GetBytes("fmt "));
waveHeaderMemoryStream.Write(BitConverter.GetBytes(20)); waveHeaderMemoryStream.WriteArray(BitConverter.GetBytes(20));
waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)17)); waveHeaderMemoryStream.WriteArray(BitConverter.GetBytes((short)17));
waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)channels)); waveHeaderMemoryStream.WriteArray(BitConverter.GetBytes((short)channels));
waveHeaderMemoryStream.Write(BitConverter.GetBytes(entry.SampleRate)); waveHeaderMemoryStream.WriteArray(BitConverter.GetBytes(entry.SampleRate));
waveHeaderMemoryStream.Write(BitConverter.GetBytes(bytesPerSec)); waveHeaderMemoryStream.WriteArray(BitConverter.GetBytes(bytesPerSec));
waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)chunkSize)); waveHeaderMemoryStream.WriteArray(BitConverter.GetBytes((short)chunkSize));
waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)4)); waveHeaderMemoryStream.WriteArray(BitConverter.GetBytes((short)4));
waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)2)); waveHeaderMemoryStream.WriteArray(BitConverter.GetBytes((short)2));
waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)samplesPerChunk)); waveHeaderMemoryStream.WriteArray(BitConverter.GetBytes((short)samplesPerChunk));
waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("fact")); waveHeaderMemoryStream.WriteArray(Encoding.ASCII.GetBytes("fact"));
waveHeaderMemoryStream.Write(BitConverter.GetBytes(4)); waveHeaderMemoryStream.WriteArray(BitConverter.GetBytes(4));
waveHeaderMemoryStream.Write(BitConverter.GetBytes(4 * entry.Length)); waveHeaderMemoryStream.WriteArray(BitConverter.GetBytes(4 * entry.Length));
waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("data")); waveHeaderMemoryStream.WriteArray(Encoding.ASCII.GetBytes("data"));
waveHeaderMemoryStream.Write(BitConverter.GetBytes(entry.Length)); waveHeaderMemoryStream.WriteArray(BitConverter.GetBytes(entry.Length));
} }
waveHeaderMemoryStream.Seek(0, SeekOrigin.Begin); waveHeaderMemoryStream.Seek(0, SeekOrigin.Begin);

6
OpenRA.Mods.Common/FileFormats/VqaReader.cs
View File

@@ -194,14 +194,14 @@ namespace OpenRA.Mods.Common.FileFormats
else if (audioChannels == 1) else if (audioChannels == 1)
{ {
var rawAudio = stream.ReadBytes((int)length); var rawAudio = stream.ReadBytes((int)length);
audio1.Write(rawAudio); audio1.WriteArray(rawAudio);
} }
else else
{ {
var rawAudio = stream.ReadBytes((int)length / 2); var rawAudio = stream.ReadBytes((int)length / 2);
audio1.Write(rawAudio); audio1.WriteArray(rawAudio);
rawAudio = stream.ReadBytes((int)length / 2); rawAudio = stream.ReadBytes((int)length / 2);
audio2.Write(rawAudio); audio2.WriteArray(rawAudio);
if (length % 2 != 0) if (length % 2 != 0)
stream.ReadBytes(2); stream.ReadBytes(2);
} }