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

Adds length display support for PCM & IMA music.

Browse Source
This commit is contained in:
reaperrr
2014-07-27 16:16:33 +02:00
parent f161d87d07
commit 3e3f1394d9
2 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
OpenRA.Game/FileFormats/WavLoader.cs
View File

@@ -91,6 +91,25 @@ namespace OpenRA.FileFormats
}
}
public static float WaveLength(Stream s)
{
s.Position = 12;
var fmt = s.ReadASCII(4);
if (fmt != "fmt ")
return 0;
s.Position = 22;
var channels = s.ReadInt16();
var sampleRate = s.ReadInt32();
s.Position = 34;
var bitsPerSample = s.ReadInt16();
var length = s.Length * 8;
return length / (channels * sampleRate * bitsPerSample);
}
public byte[] DecodeAdpcmData()
{
var s = new MemoryStream(RawOutput);

10
OpenRA.Game/GameRules/MusicInfo.cs
View File

@@ -32,7 +32,10 @@ namespace OpenRA.GameRules
Exists = true;
using (var s = GlobalFileSystem.Open(Filename))
Length = (int)AudLoader.SoundLength(s);
if (Filename.ToLowerInvariant().EndsWith("wav"))
Length = (int)WavLoader.WaveLength(s);
else
Length = (int)AudLoader.SoundLength(s);
}
public void Reload()
@@ -42,7 +45,10 @@ namespace OpenRA.GameRules
Exists = true;
using (var s = GlobalFileSystem.Open(Filename))
Length = (int)AudLoader.SoundLength(s);
if (Filename.ToLowerInvariant().EndsWith("wav"))
Length = (int)WavLoader.WaveLength(s);
else
Length = (int)AudLoader.SoundLength(s);
}
}
}