From 4d92fde5f7346fbed28e7f942299af50562f39d0 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Mon, 9 Dec 2019 01:43:32 +0100 Subject: [PATCH] Remove VqaReader dependency on AudReader Use ImaAdpcmReader directly, since VQAs only contain header-less raw IMA ADPCM audio. --- OpenRA.Mods.Common/FileFormats/VqaReader.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenRA.Mods.Common/FileFormats/VqaReader.cs b/OpenRA.Mods.Common/FileFormats/VqaReader.cs index 7e12373e76..de9a58e1c7 100644 --- a/OpenRA.Mods.Common/FileFormats/VqaReader.cs +++ b/OpenRA.Mods.Common/FileFormats/VqaReader.cs @@ -220,7 +220,7 @@ namespace OpenRA.Mods.Common.FileFormats } if (audioChannels == 1) - audioData = compressed ? AudReader.LoadSound(audio1.ToArray(), ref adpcmIndex) : audio1.ToArray(); + audioData = compressed ? ImaAdpcmReader.LoadImaAdpcmSound(audio1.ToArray(), ref adpcmIndex) : audio1.ToArray(); else { byte[] leftData, rightData; @@ -232,9 +232,9 @@ namespace OpenRA.Mods.Common.FileFormats else { adpcmIndex = 0; - leftData = AudReader.LoadSound(audio1.ToArray(), ref adpcmIndex); + leftData = ImaAdpcmReader.LoadImaAdpcmSound(audio1.ToArray(), ref adpcmIndex); adpcmIndex = 0; - rightData = AudReader.LoadSound(audio2.ToArray(), ref adpcmIndex); + rightData = ImaAdpcmReader.LoadImaAdpcmSound(audio2.ToArray(), ref adpcmIndex); } audioData = new byte[rightData.Length + leftData.Length];