lifegpc/GARbro-crskycode
1
0
Fork 0
mirror of https://github.com/crskycode/GARbro.git synced 2026-07-08 01:30:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactored SoundInput interface.

Browse Source 
added Source property for access to underlying stream.
This commit is contained in:
morkt
2015-05-14 11:26:47 +04:00
parent 7e5dc325c0
commit 9a43b6b055
7 changed files with 64 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ArcFormats/AudioMP3.cs
View File

@@ -47,9 +47,11 @@ namespace GameRes.Formats
get { return m_bitrate; }
}
public override string SourceFormat { get { return "mp3"; } }
public Mp3Input (Stream file) : base (file)
{
m_reader = new Mp3FileReader (m_input);
m_reader = new Mp3FileReader (file);
m_bitrate = m_reader.Mp3WaveFormat.AverageBytesPerSecond*8;
var format = new GameRes.WaveFormat();
format.FormatTag = (ushort)m_reader.WaveFormat.Encoding;

6
ArcFormats/AudioOGG.cs
View File

@@ -48,16 +48,18 @@ namespace GameRes.Formats
}
}
public override bool CanSeek { get { return m_input.CanSeek; } }
public override bool CanSeek { get { return Source.CanSeek; } }
public override int SourceBitrate
{
get { return m_reader.NominalBitrate; }
}
public override string SourceFormat { get { return "ogg"; } }
public OggInput (Stream file) : base (file)
{
m_reader = new VorbisReader (m_input, false);
m_reader = new VorbisReader (Source, false);
var format = new GameRes.WaveFormat();
format.FormatTag = 3; // WAVE_FORMAT_IEEE_FLOAT
format.Channels = (ushort)m_reader.Channels;

2
ArcFormats/AudioPMW.cs
View File

@@ -57,6 +57,8 @@ namespace GameRes.Formats.ScenePlayer
{
if (null == sound)
wav.Dispose();
else
file.Dispose();
}
return sound;
}

24
ArcFormats/AudioWADY.cs
View File

@@ -36,30 +36,32 @@ namespace GameRes.Formats.Marble
public override long Position
{
get { return m_input.Position; }
set { m_input.Position = value; }
get { return Source.Position; }
set { Source.Position = value; }
}
public override bool CanSeek { get { return m_input.CanSeek; } }
public override bool CanSeek { get { return Source.CanSeek; } }
public override int SourceBitrate
{
get { return (int)Format.AverageBytesPerSecond * 8; }
}
public override string SourceFormat { get { return "raw"; } }
public override long Seek (long offset, SeekOrigin origin)
{
return m_input.Seek (offset, origin);
return Source.Seek (offset, origin);
}
public override int Read (byte[] buffer, int offset, int count)
{
return m_input.Read (buffer, offset, count);
return Source.Read (buffer, offset, count);
}
public override int ReadByte ()
{
return m_input.ReadByte();
return Source.ReadByte();
}
public WadyInput (Stream file) : base (new MemoryStream())
@@ -83,13 +85,13 @@ namespace GameRes.Formats.Marble
int remaining = (int)(input.BaseStream.Length-input.BaseStream.Position);
if (remaining == src_size)
{
(m_input as MemoryStream).Capacity = src_size * 2;
Decode (input, src_size, m_input);
(Source as MemoryStream).Capacity = src_size * 2;
Decode (input, src_size, Source);
}
else
Decode2 (input, m_input);
m_input.Position = 0;
this.PcmSize = m_input.Length;
Decode2 (input, Source);
Source.Position = 0;
this.PcmSize = Source.Length;
}
}

4
ArcFormats/Properties/AssemblyInfo.cs
View File

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion ("1.0.4.50")]
[assembly: AssemblyFileVersion ("1.0.4.50")]
[assembly: AssemblyVersion ("1.0.4.51")]
[assembly: AssemblyFileVersion ("1.0.4.51")]