Locked timing

clean.sh

@@ -1 +1,9 @@
 rm *.zip
+rm -rf src/Zen.Common/bin
+rm -rf src/Zen.System/bin
+rm -rf src/Zen.Z80/bin
+rm -rf src/Zen.Z80.Tests/bin
+rm -rf src/Zen.Desktop.Host/bin
+rm -rf src/Zen.Utilities/bin
+rm -rf src/Zen.Z80.Test.JSMoo/bin
+rm -rf src/Zen.Z80.Tests.Fuse/bin

src/Zen.Desktop.Host/Infrastructure/Host.cs

@@ -22,8 +22,6 @@ namespace Zen.Desktop.Host.Infrastructure;
 
 public class Host : Game
 {
-    private const int StartPause = 30;
-
     // ReSharper disable once PrivateFieldCanBeConvertedToLocalVariable
     private readonly GraphicsDeviceManager _graphicsDeviceManager;
 
@@ -41,8 +39,6 @@ public class Host : Game
 
     private MenuSystem _menuSystem;
 
-    private int? _pause = StartPause;
-
     private bool _soundState;
 
     private WaveVisualiser _waveVisualiser;
@@ -122,6 +118,14 @@ private void SetMotherboard(Model model)
         _motherboard.Fast = AppSettings.Instance.Speed == Speed.Fast;
         _motherboard.Slow = AppSettings.Instance.Speed == Speed.Slow;
 
+        if (AppSettings.Instance.Speed == Speed.Locked)
+        {
+            _motherboard.Worker.Locked = true;
+            _motherboard.AyAudio.Locked = true;
+
+            TargetElapsedTime = TimeSpan.FromMilliseconds(20);
+        }
+
         _imageName = $"Standard {model} ROM";
 
         AppSettings.Instance.SystemModel = model;
@@ -152,8 +156,6 @@ protected override void OnActivated(object sender, EventArgs args)
         {
             _motherboard.Start();
 
-            _motherboard.Pause();
-
             _hostStarted = true;
 
             _motherboard.Fast = AppSettings.Instance.Speed == Speed.Fast;
@@ -216,16 +218,9 @@ private void ScanComplete()
 
     protected override void Update(GameTime gameTime)
     {
-        if (_pause != null)
+        if (AppSettings.Instance.Speed == Speed.Locked)
         {
-            _pause--;
-        }
-
-        if (_pause == 0)
-        {
-            _pause = null;
-
-            _motherboard.Resume();
+            _motherboard.Worker.RunFrame();
         }
 
         if (Keyboard.GetState().IsKeyDown(Keys.Tab) && _menuSystem == null)
@@ -261,7 +256,6 @@ private void MenuFinished(MenuResult result, object arguments)
                 SetMotherboard((Model) arguments);
                 _motherboard.Fast = false;
                 _motherboard.Slow = false;
-                _motherboard.AyAudio.BufferSize = System.Modules.Audio.Constants.DefaultBufferSize;
                 AppSettings.Instance.Speed = Speed.Normal;
 
                 _motherboard.Start();
@@ -278,35 +272,40 @@ private void MenuFinished(MenuResult result, object arguments)
             case MenuResult.SpeedNormal:
                 _motherboard.Fast = false;
                 _motherboard.Slow = false;
-                _motherboard.AyAudio.BufferSize = System.Modules.Audio.Constants.DefaultBufferSize;
+                _motherboard.Worker.Locked = false;
+                _motherboard.AyAudio.Locked = false;
+
+                TargetElapsedTime = TimeSpan.FromTicks(166667L);
+
+                break;
+
+            case MenuResult.SpeedLocked:
+                _motherboard.Fast = false;
+                _motherboard.Slow = false;
+                _motherboard.Worker.Locked = true;
+                _motherboard.AyAudio.Locked = true;
+
+                TargetElapsedTime = TimeSpan.FromMilliseconds(20);
 
                 break;
 
             case MenuResult.SpeedFast:
                 _motherboard.Fast = true;
                 _motherboard.Slow = false;
-                _motherboard.AyAudio.BufferSize = System.Modules.Audio.Constants.DefaultBufferSize;
+                _motherboard.Worker.Locked = false;
+                _motherboard.AyAudio.Locked = false;
+
+                TargetElapsedTime = TimeSpan.FromTicks(166667L);
 
                 break;
 
             case MenuResult.SpeedSlow:
                 _motherboard.Fast = false;
                 _motherboard.Slow = true;
-                _motherboard.AyAudio.BufferSize = System.Modules.Audio.Constants.DefaultBufferSize;
-
-                break;
-
-            case MenuResult.SpeedHalf:
-                _motherboard.Fast = false;
-                _motherboard.Slow = false;
-                _motherboard.AyAudio.BufferSize = System.Modules.Audio.Constants.DefaultBufferSize * 2;
-
-                break;
-
-            case MenuResult.SpeedQuarter:
-                _motherboard.Fast = false;
-                _motherboard.Slow = false;
-                _motherboard.AyAudio.BufferSize = System.Modules.Audio.Constants.DefaultBufferSize * 4;
+                _motherboard.Worker.Locked = false;
+                _motherboard.AyAudio.Locked = false;
+
+                TargetElapsedTime = TimeSpan.FromTicks(166667L);
 
                 break;
 

src/Zen.Desktop.Host/Infrastructure/Menu/MenuResult.cs

@@ -10,8 +10,7 @@ public enum MenuResult
     SpeedNormal,
     SpeedFast,
     SpeedSlow,
-    SpeedQuarter,
-    SpeedHalf,
+    SpeedLocked,
     SaveState,
     LoadState,
     ChangeScale,

src/Zen.Desktop.Host/Infrastructure/Menu/SpeedMenu.cs

@@ -13,13 +13,13 @@ public override List<Label> GetMenu()
                     {
                         new(0, true, "Zen - Emulator Speed", Color.White, 0, 0, null),
                         new(1, false, $"[1] {(AppSettings.Instance.Speed == Speed.Slow ? ">" : " ")} Scanline {(AppSettings.Instance.Speed == Speed.Slow ? "<" : " ")}", Color.Yellow, 1, 3, Keys.D1, Color.LightGreen),
-                        new(2, false, $"[2] {(AppSettings.Instance.Speed == Speed.Quarter ? ">" : " ")} Quarter {(AppSettings.Instance.Speed == Speed.Quarter ? "<" : " ")}", Color.Yellow, 1, 5, Keys.D2, Color.LightGreen),
-                        new(3, false, $"[3] {(AppSettings.Instance.Speed == Speed.Half ? ">" : " ")} Half {(AppSettings.Instance.Speed == Speed.Half ? "<" : " ")}", Color.Yellow, 1, 7, Keys.D3, Color.LightGreen),
-                        new(4, false, $"[4] {(AppSettings.Instance.Speed == Speed.Normal ? ">" : " ")} Normal {(AppSettings.Instance.Speed == Speed.Normal ? "<" : " ")}", Color.Yellow, 1, 9, Keys.D4, Color.LightGreen),
-                        new(5, false, $"[5] {(AppSettings.Instance.Speed == Speed.Fast ? ">" : " ")} As Fast As Possible {(AppSettings.Instance.Speed == Speed.Fast ? "<" : " ")}", Color.Yellow, 1, 11, Keys.D5, Color.LightGreen),
+                        new(2, false, $"[2] {(AppSettings.Instance.Speed == Speed.Locked ? ">" : " ")} Locked 50Hz {(AppSettings.Instance.Speed == Speed.Locked ? "<" : " ")}", Color.Yellow, 1, 5, Keys.D2, Color.LightGreen),
+                        new(3, false, $"[3] {(AppSettings.Instance.Speed == Speed.Normal ? ">" : " ")} Normal {(AppSettings.Instance.Speed == Speed.Normal ? "<" : " ")}", Color.Yellow, 1, 7, Keys.D3, Color.LightGreen),
+                        new(4, false, $"[4] {(AppSettings.Instance.Speed == Speed.Fast ? ">" : " ")} As Fast As Possible {(AppSettings.Instance.Speed == Speed.Fast ? "<" : " ")}", Color.Yellow, 1, 9, Keys.D4, Color.LightGreen),
                         new(96, true, "This setting is not saved", Color.Wheat, 0, 15, null),
                         new(97, true, "Zen always starts", Color.Wheat, 0, 17, null),
-                        new(98, true, "at Normal speed", Color.Wheat, 0, 18, null),
+                        new(98, true, "at Normal speed or", Color.Wheat, 0, 18, null),
+                        new(98, true, "Locked 50Hz on Linux", Color.Wheat, 0, 19, null),
                         new(99, true, "[ESC] Close Menu", Color.FromNonPremultiplied(255, 64, 64, 255), 0, 21, Keys.Escape, Color.LightGreen)
                     };
 
@@ -36,21 +36,16 @@ public override (MenuResult Result, MenuBase NewMenu, object Arguments) ItemSele
                 return (MenuResult.SpeedSlow, null, null);
 
             case 2:
-                AppSettings.Instance.Speed = Speed.Quarter;
+                AppSettings.Instance.Speed = Speed.Locked;
 
-                return (MenuResult.SpeedQuarter, null, null);
+                return (MenuResult.SpeedLocked, null, null);
 
             case 3:
-                AppSettings.Instance.Speed = Speed.Half;
-
-                return (MenuResult.SpeedHalf, null, null);
-
-            case 4:
                 AppSettings.Instance.Speed = Speed.Normal;
 
                 return (MenuResult.SpeedNormal, null, null);
 
-            case 5:
+            case 4:
                 AppSettings.Instance.Speed = Speed.Fast;
 
                 return (MenuResult.SpeedFast, null, null);

src/Zen.Desktop.Host/Infrastructure/Settings/AppSettings.cs

@@ -60,7 +60,9 @@ private static AppSettings GetAppSettings()
             Logger.LogException(nameof(AppSettings), exception);
         }
 
-        settings.Speed = Speed.Normal;
+        settings.Speed = RuntimeInformation.IsOSPlatform(OSPlatform.Linux)
+            ? Speed.Locked
+            : Speed.Normal;
 
         return settings;
     }

src/Zen.Desktop.Host/Infrastructure/Settings/Speed.cs

@@ -3,8 +3,7 @@ namespace Zen.Desktop.Host.Infrastructure.Settings;
 public enum Speed
 {
     Slow,
-    Quarter,
-    Half,
+    Locked,
     Normal,
     Fast
 }

src/Zen.System/Modules/AyAudio.cs

@@ -32,7 +32,7 @@ public class AyAudio : IDisposable
 
     private byte _registerNumber;
 
-    private float[] _buffer;
+    private readonly float[] _buffer;
 
     private int _readQueue;
 
@@ -42,18 +42,6 @@ public class AyAudio : IDisposable
 
     private ManualResetEvent? _workerResetEvent;
 
-    private int _bufferSize = Constants.DefaultBufferSize;
-
-    public int BufferSize
-    {
-        set
-        {
-            _bufferSize = value;
-
-            _buffer = new float[_bufferSize];
-        }
-    }
-
     public IZenAudioEngine AudioEngine
     {
         set
@@ -65,6 +53,8 @@ public IZenAudioEngine AudioEngine
         get => _engine;
     }
 
+    public bool Locked { get; set; }
+
     public bool Silent { get; set; }
 
     public Action<float[]>? AySignalHook { get; set; }
@@ -75,7 +65,7 @@ public AyAudio(IZenAudioEngine engine)
     {
         _engine = engine;
 
-        _buffer = new float[_bufferSize];
+        _buffer = new float[Constants.DefaultBufferSize];
 
         _cancellationTokenSource = new CancellationTokenSource();
 
@@ -90,7 +80,13 @@ public AyAudio(IZenAudioEngine engine)
 
     public void Start()
     {
-        _audioThread = Task.Run(RunFrame, _cancellationToken);
+        _audioThread = Task.Run(() =>
+        {
+            if (! Locked)
+            {
+                RunFrame();
+            }
+        }, _cancellationToken);
     }
 
     public void FrameReady(ManualResetEvent resetEvent)
@@ -283,7 +279,7 @@ private void RunFrame()
     {
         var signals = new float[3];
 
-        var bufferStep = (float) Common.Constants.FrameCycles / (_bufferSize - 1);
+        var bufferStep = (float) Common.Constants.FrameCycles / (Constants.DefaultBufferSize - 1);
 
         while (! _cancellationToken.IsCancellationRequested)
         {
@@ -293,7 +289,7 @@ private void RunFrame()
 
                 _resetEvent.Reset();
 
-                for (var i = 0; i < _bufferSize; i++)
+                for (var i = 0; i < Constants.DefaultBufferSize; i++)
                 {
                     if (Silent)
                     {

src/Zen.System/Modules/Ram.cs

@@ -18,12 +18,11 @@ public class Ram
 
     private byte _screenBank = 5;
 
-    public bool ProtectRom { get; set; }
+    public bool ProtectRom { get; init; }
 
     public byte ScreenBank
     {
         set => _screenBank = (byte) (value == 1 ? 5 : 7);
-        get => _screenBank;
     }
 
     public byte[] WorkingScreenRam => _banks[_screenBank];