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

Back-port some style fixes from ImaAdpcmLoader to AudLoader.

Browse Source
This commit is contained in:
reaperrr
2014-09-14 13:29:00 +02:00
parent fec5eb178c
commit 7589e010c3
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
OpenRA.Game/FileFormats/AudLoader.cs
View File

@@ -36,7 +36,7 @@ namespace OpenRA.FileFormats
Chunk c; Chunk c;
c.CompressedSize = s.ReadUInt16(); c.CompressedSize = s.ReadUInt16();
c.OutputSize = s.ReadUInt16(); c.OutputSize = s.ReadUInt16();
if (0xdeaf != s.ReadUInt32()) if (s.ReadUInt32() != 0xdeaf)
throw new InvalidDataException("Chunk header is bogus"); throw new InvalidDataException("Chunk header is bogus");
return c; return c;
} }
@@ -45,17 +45,19 @@ namespace OpenRA.FileFormats
public static class AudLoader public static class AudLoader
{ {
static int[] indexAdjust = { -1, -1, -1, -1, 2, 4, 6, 8 }; static int[] indexAdjust = { -1, -1, -1, -1, 2, 4, 6, 8 };
static int[] stepTable = { static int[] stepTable =
7, 8, 9, 10, 11, 12, 13, 14, 16, {
17, 19, 21, 23, 25, 28, 31, 34, 37, 7, 8, 9, 10, 11, 12, 13, 14, 16,
41, 45, 50, 55, 60, 66, 73, 80, 88, 17, 19, 21, 23, 25, 28, 31, 34, 37,
97, 107, 118, 130, 143, 157, 173, 190, 209, 41, 45, 50, 55, 60, 66, 73, 80, 88,
230, 253, 279, 307, 337, 371, 408, 449, 494, 97, 107, 118, 130, 143, 157, 173, 190, 209,
544, 598, 658, 724, 796, 876, 963, 1060, 1166, 230, 253, 279, 307, 337, 371, 408, 449, 494,
1282, 1411, 1552, 1707, 1878, 2066, 2272, 2499, 2749, 544, 598, 658, 724, 796, 876, 963, 1060, 1166,
3024, 3327, 3660, 4026, 4428, 4871, 5358, 5894, 6484, 1282, 1411, 1552, 1707, 1878, 2066, 2272, 2499, 2749,
7132, 7845, 8630, 9493, 10442, 11487, 12635, 13899, 15289, 3024, 3327, 3660, 4026, 4428, 4871, 5358, 5894, 6484,
16818, 18500, 20350, 22385, 24623, 27086, 29794, 32767 }; 7132, 7845, 8630, 9493, 10442, 11487, 12635, 13899, 15289,
16818, 18500, 20350, 22385, 24623, 27086, 29794, 32767
};
static short DecodeSample(byte b, ref int index, ref int current) static short DecodeSample(byte b, ref int index, ref int current)
{ {