abea3a0f74
- Fixed a rounding issue in `WavReader.WaveLength()`. - Fixed `AudReader.SoundLength()` not resetting the stream position. - Fixed crashes caused by disposed streams because `LengthInSeconds` would try and calculate the length on the fly. It is now precalculated and cached (making it consistent across all 5 current `ISoundFormat` implementations). - Fixed a crash in `AudReader.LoadSound()`'s `out Func<Stream> result` because that func would try and access the disposed stream's `Length` property. That works for `SegmentStream`, but not for `FileStream`. - Fixed frameCount/soundLength label positioning in the AssetBrowser window to avoid text clipping .
76 lines
1.7 KiB
C#
76 lines
1.7 KiB
C#
#region Copyright & License Information
|
|
/*
|
|
* Copyright 2007-2021 The OpenRA Developers (see AUTHORS)
|
|
* This file is part of OpenRA, which is free software. It is made
|
|
* available to you under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation, either version 3 of
|
|
* the License, or (at your option) any later version. For more
|
|
* information, see COPYING.
|
|
*/
|
|
#endregion
|
|
|
|
using System;
|
|
using System.IO;
|
|
using OpenRA.Mods.Cnc.FileFormats;
|
|
|
|
namespace OpenRA.Mods.Cnc.AudioLoaders
|
|
{
|
|
public class AudLoader : ISoundLoader
|
|
{
|
|
bool IsAud(Stream s)
|
|
{
|
|
var start = s.Position;
|
|
s.Position += 11;
|
|
var readFormat = s.ReadByte();
|
|
s.Position = start;
|
|
|
|
return readFormat == (int)SoundFormat.ImaAdpcm;
|
|
}
|
|
|
|
bool ISoundLoader.TryParseSound(Stream stream, out ISoundFormat sound)
|
|
{
|
|
try
|
|
{
|
|
if (IsAud(stream))
|
|
{
|
|
sound = new AudFormat(stream);
|
|
return true;
|
|
}
|
|
}
|
|
catch
|
|
{
|
|
// Not a supported AUD
|
|
}
|
|
|
|
sound = null;
|
|
return false;
|
|
}
|
|
}
|
|
|
|
public sealed class AudFormat : ISoundFormat
|
|
{
|
|
public int Channels => channels;
|
|
public int SampleBits => sampleBits;
|
|
public int SampleRate => sampleRate;
|
|
public float LengthInSeconds { get; }
|
|
public Stream GetPCMInputStream() { return audStreamFactory(); }
|
|
public void Dispose() { sourceStream.Dispose(); }
|
|
|
|
readonly Stream sourceStream;
|
|
readonly Func<Stream> audStreamFactory;
|
|
readonly int channels;
|
|
readonly int sampleBits;
|
|
readonly int sampleRate;
|
|
|
|
public AudFormat(Stream stream)
|
|
{
|
|
sourceStream = stream;
|
|
|
|
if (!AudReader.LoadSound(stream, out audStreamFactory, out sampleRate, out sampleBits, out channels))
|
|
throw new InvalidDataException();
|
|
|
|
LengthInSeconds = AudReader.SoundLength(sourceStream);
|
|
}
|
|
}
|
|
}
|