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

Merge pull request #10912 from pchote/soundloader-streams

Browse Source 
Introduce ISoundFormat for parsing sound files.
This commit is contained in:
abcdefg30
2016-03-13 14:56:01 +01:00
parent e1b2f5a280 35cb2cb609
commit b097f7df91
7 changed files with 224 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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