Beeper implemented but has noise on the port - to fix
This commit is contained in:
41
Desktop/BeeperDevice.cs
Normal file
41
Desktop/BeeperDevice.cs
Normal file
@@ -0,0 +1,41 @@
|
||||
using NAudio.Wave;
|
||||
using System;
|
||||
|
||||
namespace Desktop
|
||||
{
|
||||
public class BeeperDevice
|
||||
{
|
||||
private WaveOutEvent _waveOut;
|
||||
private BufferedWaveProvider _buffer;
|
||||
|
||||
public BeeperDevice()
|
||||
{
|
||||
_waveOut = new WaveOutEvent();
|
||||
_waveOut.DesiredLatency = 50; // 100ms latency to prevent buffer stutter
|
||||
|
||||
// 44.1kHz, 1 channel (Mono), Float format
|
||||
_buffer = new BufferedWaveProvider(WaveFormat.CreateIeeeFloatWaveFormat(44100, 1));
|
||||
_buffer.BufferDuration = TimeSpan.FromSeconds(1);
|
||||
_buffer.DiscardOnBufferOverflow = true;
|
||||
|
||||
_waveOut.Init(_buffer);
|
||||
_waveOut.Play();
|
||||
}
|
||||
|
||||
public void AddSample(bool isHigh)
|
||||
{
|
||||
//Buffer overrun check and dump
|
||||
if (_buffer.BufferedDuration.TotalMilliseconds > 100)
|
||||
{
|
||||
_buffer.ClearBuffer();
|
||||
}
|
||||
|
||||
// Convert the boolean into a physical sound wave (-0.2 or +0.2)
|
||||
float sampleValue = isHigh ? 0.2f : -0.2f;
|
||||
|
||||
// Convert the float to bytes and drop it in the pipe
|
||||
byte[] bytes = BitConverter.GetBytes(sampleValue);
|
||||
_buffer.AddSamples(bytes, 0, 4);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -8,6 +8,10 @@
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="NAudio" Version="2.3.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Core\Core.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
@@ -17,6 +17,7 @@ namespace Desktop
|
||||
private ULA _ula = null!;
|
||||
private TapManager _tapManager = null!;
|
||||
private DebuggerForm? _debugger = null;
|
||||
private BeeperDevice _beeper = null!;
|
||||
private string _baseTitle = "";
|
||||
private bool _isRunning = false;
|
||||
private bool _isPaused = false;
|
||||
@@ -41,6 +42,7 @@ namespace Desktop
|
||||
_memoryBus = new MemoryBus();
|
||||
_simpleIoBus = new IO_Bus();
|
||||
_ula = new ULA(_memoryBus, _simpleIoBus);
|
||||
_beeper = new BeeperDevice();
|
||||
_tapManager = new TapManager();
|
||||
_memoryBus.CrapRAMData();
|
||||
byte[] romData = RomLoader.Load("48.rom");
|
||||
@@ -70,6 +72,7 @@ namespace Desktop
|
||||
var stopwatch = Stopwatch.StartNew();
|
||||
var fpsStopwatch = Stopwatch.StartNew();
|
||||
long scanlineCount = 0;
|
||||
long audioSampleCount = 0;
|
||||
|
||||
while (_isRunning)
|
||||
{
|
||||
@@ -90,6 +93,13 @@ namespace Desktop
|
||||
// --- Execute Instruction ---
|
||||
_cpu.Step();
|
||||
|
||||
//Process audio at the correct time
|
||||
while (_cpu.TotalTStates >= (long)(audioSampleCount * 79.365))
|
||||
{
|
||||
_beeper.AddSample(_simpleIoBus.BeeperState);
|
||||
audioSampleCount++;
|
||||
}
|
||||
|
||||
// --- Check for End of Frame ---
|
||||
if (_cpu.TotalTStates >= nextScanlineTarget)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user