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

Remove VqaReader dependency on AudReader

Browse Source 
Use ImaAdpcmReader directly, since VQAs only contain
header-less raw IMA  ADPCM audio.
This commit is contained in:
reaperrr
2019-12-09 01:43:32 +01:00
committed by abcdefg30
parent 5afc1c1443
commit 4d92fde5f7
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -220,7 +220,7 @@ namespace OpenRA.Mods.Common.FileFormats
} }
if (audioChannels == 1) if (audioChannels == 1)
audioData = compressed ? AudReader.LoadSound(audio1.ToArray(), ref adpcmIndex) : audio1.ToArray(); audioData = compressed ? ImaAdpcmReader.LoadImaAdpcmSound(audio1.ToArray(), ref adpcmIndex) : audio1.ToArray();
else else
{ {
byte[] leftData, rightData; byte[] leftData, rightData;
@@ -232,9 +232,9 @@ namespace OpenRA.Mods.Common.FileFormats
else else
{ {
adpcmIndex = 0; adpcmIndex = 0;
leftData = AudReader.LoadSound(audio1.ToArray(), ref adpcmIndex); leftData = ImaAdpcmReader.LoadImaAdpcmSound(audio1.ToArray(), ref adpcmIndex);
adpcmIndex = 0; adpcmIndex = 0;
rightData = AudReader.LoadSound(audio2.ToArray(), ref adpcmIndex); rightData = ImaAdpcmReader.LoadImaAdpcmSound(audio2.ToArray(), ref adpcmIndex);
} }
audioData = new byte[rightData.Length + leftData.Length]; audioData = new byte[rightData.Length + leftData.Length];