ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HuC6280PSG - make some public things private or internal

This commit is contained in:
adelikat 2020-05-07 20:52:27 -05:00
parent 3ae16c4248
commit 3c76e6014a
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/BizHawk.Emulation.Cores/Sound/HuC6280PSG.cs
View File

@ -37,10 +37,10 @@ namespace BizHawk.Emulation.Cores.Components
private readonly Queue<QueuedCommand> commands = new Queue<QueuedCommand>(256); private readonly Queue<QueuedCommand> commands = new Queue<QueuedCommand>(256);
private long frameStartTime, frameStopTime; private long frameStartTime, frameStopTime;
const int SampleRate = 44100; private const int SampleRate = 44100;
const int PsgBase = 3580000; private const int PsgBase = 3580000;
static readonly byte[] LogScale = { 0, 0, 10, 10, 13, 13, 16, 16, 20, 20, 26, 26, 32, 32, 40, 40, 51, 51, 64, 64, 81, 81, 102, 102, 128, 128, 161, 161, 203, 203, 255, 255 }; private static readonly byte[] LogScale = { 0, 0, 10, 10, 13, 13, 16, 16, 20, 20, 26, 26, 32, 32, 40, 40, 51, 51, 64, 64, 81, 81, 102, 102, 128, 128, 161, 161, 203, 203, 255, 255 };
static readonly byte[] VolumeReductionTable = { 0x1F, 0x1D, 0x1B, 0x19, 0x17, 0x15, 0x13, 0x10, 0x0F, 0x0D, 0x0B, 0x09, 0x07, 0x05, 0x03, 0x00 }; private static readonly byte[] VolumeReductionTable = { 0x1F, 0x1D, 0x1B, 0x19, 0x17, 0x15, 0x13, 0x10, 0x0F, 0x0D, 0x0B, 0x09, 0x07, 0x05, 0x03, 0x00 };
public byte MainVolumeLeft; public byte MainVolumeLeft;
public byte MainVolumeRight; public byte MainVolumeRight;
@ -56,27 +56,28 @@ namespace BizHawk.Emulation.Cores.Components
} }
} }
public void BeginFrame(long cycles) internal void BeginFrame(long cycles)
{ {
while (commands.Count > 0) while (commands.Count > 0)
{ {
var cmd = commands.Dequeue(); var cmd = commands.Dequeue();
WritePSGImmediate(cmd.Register, cmd.Value); WritePSGImmediate(cmd.Register, cmd.Value);
} }
frameStartTime = cycles; frameStartTime = cycles;
} }
public void EndFrame(long cycles) internal void EndFrame(long cycles)
{ {
frameStopTime = cycles; frameStopTime = cycles;
} }
public void WritePSG(byte register, byte value, long cycles) internal void WritePSG(byte register, byte value, long cycles)
{ {
commands.Enqueue(new QueuedCommand { Register = register, Value = value, Time = cycles - frameStartTime }); commands.Enqueue(new QueuedCommand { Register = register, Value = value, Time = cycles - frameStartTime });
} }
public void WritePSGImmediate(int register, byte value) private void WritePSGImmediate(int register, byte value)
{ {
register &= 0x0F; register &= 0x0F;
switch (register) switch (register)
@ -161,7 +162,7 @@ namespace BizHawk.Emulation.Cores.Components
MixSamples(samples, start, samples.Length - start); MixSamples(samples, start, samples.Length - start);
} }
void MixSamples(short[] samples, int start, int len) private void MixSamples(short[] samples, int start, int len)
{ {
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
@ -170,7 +171,7 @@ namespace BizHawk.Emulation.Cores.Components
} }
} }
void MixChannel(short[] samples, int start, int len, PSGChannel channel) private void MixChannel(short[] samples, int start, int len, PSGChannel channel)
{ {
if (channel.Enabled == false) return; if (channel.Enabled == false) return;
if (channel.DDA == false && channel.Volume == 0) return; if (channel.DDA == false && channel.Volume == 0) return;
@ -224,7 +225,7 @@ namespace BizHawk.Emulation.Cores.Components
} }
} }
public void SyncState(Serializer ser) internal void SyncState(Serializer ser)
{ {
ser.BeginSection("PSG"); ser.BeginSection("PSG");
ser.Sync(nameof(MainVolumeLeft), ref MainVolumeLeft); ser.Sync(nameof(MainVolumeLeft), ref MainVolumeLeft);
@ -255,7 +256,7 @@ namespace BizHawk.Emulation.Cores.Components
ser.EndSection(); ser.EndSection();
} }
class QueuedCommand private class QueuedCommand
{ {
public byte Register; public byte Register;
public byte Value; public byte Value;

2
src/BizHawk.Emulation.Cores/Sound/SoundMixer.cs
View File

@ -2,7 +2,7 @@
namespace BizHawk.Emulation.Cores.Components namespace BizHawk.Emulation.Cores.Components
{ {
// TODO: Sound mixer is a good concept, but it needs to be refactored to use an ISoundProvider, it perhaps can enforce only recieving providers in Async mode // TODO: Sound mixer is a good concept, but it needs to be refactored to use an ISoundProvider, it perhaps can enforce only receiving providers in Async mode
/// <summary> /// <summary>
/// An interface that extends a sound provider to provide mixing capabilities through the SoundMixer class /// An interface that extends a sound provider to provide mixing capabilities through the SoundMixer class
/// </summary> /// </summary>