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

Reworked ISoundFormat.LengthInSeconds implementations

Browse Source
This commit is contained in:
penev92
2022-01-04 23:13:56 +02:00
committed by Matthias Mailänder
parent 631297417c
commit 87b92b53a4
7 changed files with 21 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Mods.Cnc/AudioLoaders/AudLoader.cs
View File

@@ -52,7 +52,7 @@ namespace OpenRA.Mods.Cnc.AudioLoaders
public int Channels => channels;
public int SampleBits => sampleBits;
public int SampleRate => sampleRate;
public float LengthInSeconds { get; }
public float LengthInSeconds => lengthInSeconds;
public Stream GetPCMInputStream() { return audStreamFactory(); }
public void Dispose() { sourceStream.Dispose(); }
@@ -61,15 +61,14 @@ namespace OpenRA.Mods.Cnc.AudioLoaders
readonly int channels;
readonly int sampleBits;
readonly int sampleRate;
readonly float lengthInSeconds;
public AudFormat(Stream stream)
{
sourceStream = stream;
if (!AudReader.LoadSound(stream, out audStreamFactory, out sampleRate, out sampleBits, out channels))
if (!AudReader.LoadSound(stream, out audStreamFactory, out sampleRate, out sampleBits, out channels, out lengthInSeconds))
throw new InvalidDataException();
LengthInSeconds = AudReader.SoundLength(sourceStream);
}
}
}