From beb7be88e2ae4ddc3be2f269d70607fca3443686 Mon Sep 17 00:00:00 2001
From: Stevo John <stevehuwjohn@gmail.com>
Date: Fri, 16 Aug 2024 11:13:30 +0100
Subject: [PATCH 01/27] WIP

---
 .../Infrastructure/Menu/MenuResult.cs                |  1 +
 .../Infrastructure/Menu/SpeedMenu.cs                 | 12 +++++++++---
 .../Infrastructure/Settings/Speed.cs                 |  1 +
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/Zen.Desktop.Host/Infrastructure/Menu/MenuResult.cs b/src/Zen.Desktop.Host/Infrastructure/Menu/MenuResult.cs
index a71e4ec5..39029cca 100644
--- a/src/Zen.Desktop.Host/Infrastructure/Menu/MenuResult.cs
+++ b/src/Zen.Desktop.Host/Infrastructure/Menu/MenuResult.cs
@@ -12,6 +12,7 @@ public enum MenuResult
     SpeedSlow,
     SpeedQuarter,
     SpeedHalf,
+    SpeedLocked,
     SaveState,
     LoadState,
     ChangeScale,
diff --git a/src/Zen.Desktop.Host/Infrastructure/Menu/SpeedMenu.cs b/src/Zen.Desktop.Host/Infrastructure/Menu/SpeedMenu.cs
index 2dd8a581..12f18741 100644
--- a/src/Zen.Desktop.Host/Infrastructure/Menu/SpeedMenu.cs
+++ b/src/Zen.Desktop.Host/Infrastructure/Menu/SpeedMenu.cs
@@ -15,8 +15,9 @@ public override List<Label> GetMenu()
                         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(4, false, $"[4] {(AppSettings.Instance.Speed == Speed.Locked ? ">" : " ")} Locked 50Hz {(AppSettings.Instance.Speed == Speed.Locked ? "<" : " ")}", Color.Yellow, 1, 9, Keys.D4, Color.LightGreen),
+                        new(5, false, $"[5] {(AppSettings.Instance.Speed == Speed.Normal ? ">" : " ")} Normal {(AppSettings.Instance.Speed == Speed.Normal ? "<" : " ")}", Color.Yellow, 1, 9, Keys.D5, Color.LightGreen),
+                        new(6, false, $"[6] {(AppSettings.Instance.Speed == Speed.Fast ? ">" : " ")} As Fast As Possible {(AppSettings.Instance.Speed == Speed.Fast ? "<" : " ")}", Color.Yellow, 1, 11, Keys.D6, 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),
@@ -46,11 +47,16 @@ public override (MenuResult Result, MenuBase NewMenu, object Arguments) ItemSele
                 return (MenuResult.SpeedHalf, null, null);
 
             case 4:
+                AppSettings.Instance.Speed = Speed.Locked;
+
+                return (MenuResult.SpeedLocked, null, null);
+
+            case 5:
                 AppSettings.Instance.Speed = Speed.Normal;
 
                 return (MenuResult.SpeedNormal, null, null);
 
-            case 5:
+            case 6:
                 AppSettings.Instance.Speed = Speed.Fast;
 
                 return (MenuResult.SpeedFast, null, null);
diff --git a/src/Zen.Desktop.Host/Infrastructure/Settings/Speed.cs b/src/Zen.Desktop.Host/Infrastructure/Settings/Speed.cs
index c7dec170..fbd5fa88 100644
--- a/src/Zen.Desktop.Host/Infrastructure/Settings/Speed.cs
+++ b/src/Zen.Desktop.Host/Infrastructure/Settings/Speed.cs
@@ -5,6 +5,7 @@ public enum Speed
     Slow,
     Quarter,
     Half,
+    Locked,
     Normal,
     Fast
 }
\ No newline at end of file

From 976d35021c1bcff9b5636ad8de578498a3b54901 Mon Sep 17 00:00:00 2001
From: Stevo John <stevehuwjohn@gmail.com>
Date: Fri, 16 Aug 2024 11:16:45 +0100
Subject: [PATCH 02/27] WIP

---
 src/Zen.Desktop.Host/Infrastructure/Host.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Zen.Desktop.Host/Infrastructure/Host.cs b/src/Zen.Desktop.Host/Infrastructure/Host.cs
index 24b488fa..b68218da 100644
--- a/src/Zen.Desktop.Host/Infrastructure/Host.cs
+++ b/src/Zen.Desktop.Host/Infrastructure/Host.cs
@@ -94,6 +94,8 @@ public Host()
         IsMouseVisible = false;
 
         SetMotherboard(AppSettings.Instance.SystemModel);
+
+        InactiveSleepTime = TimeSpan.FromMilliseconds(0);
     }
 
     private void SetMotherboard(Model model)

From dfc0fda0efb91ec1bc9d91080ae4d1bf5d11073c Mon Sep 17 00:00:00 2001
From: Stevo John <stevehuwjohn@gmail.com>
Date: Fri, 16 Aug 2024 11:19:42 +0100
Subject: [PATCH 03/27] WIP

---
 src/Zen.Desktop.Host/Infrastructure/Menu/SpeedMenu.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Zen.Desktop.Host/Infrastructure/Menu/SpeedMenu.cs b/src/Zen.Desktop.Host/Infrastructure/Menu/SpeedMenu.cs
index 12f18741..2e7b7067 100644
--- a/src/Zen.Desktop.Host/Infrastructure/Menu/SpeedMenu.cs
+++ b/src/Zen.Desktop.Host/Infrastructure/Menu/SpeedMenu.cs
@@ -16,11 +16,12 @@ public override List<Label> GetMenu()
                         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.Locked ? ">" : " ")} Locked 50Hz {(AppSettings.Instance.Speed == Speed.Locked ? "<" : " ")}", Color.Yellow, 1, 9, Keys.D4, Color.LightGreen),
-                        new(5, false, $"[5] {(AppSettings.Instance.Speed == Speed.Normal ? ">" : " ")} Normal {(AppSettings.Instance.Speed == Speed.Normal ? "<" : " ")}", Color.Yellow, 1, 9, Keys.D5, Color.LightGreen),
-                        new(6, false, $"[6] {(AppSettings.Instance.Speed == Speed.Fast ? ">" : " ")} As Fast As Possible {(AppSettings.Instance.Speed == Speed.Fast ? "<" : " ")}", Color.Yellow, 1, 11, Keys.D6, Color.LightGreen),
+                        new(5, false, $"[5] {(AppSettings.Instance.Speed == Speed.Normal ? ">" : " ")} Normal {(AppSettings.Instance.Speed == Speed.Normal ? "<" : " ")}", Color.Yellow, 1, 11, Keys.D5, Color.LightGreen),
+                        new(6, false, $"[6] {(AppSettings.Instance.Speed == Speed.Fast ? ">" : " ")} As Fast As Possible {(AppSettings.Instance.Speed == Speed.Fast ? "<" : " ")}", Color.Yellow, 1, 13, Keys.D6, 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)
                     };
 

From be64e3ec568a9da91090bc940d7fc88300aaf74b Mon Sep 17 00:00:00 2001
From: Stevo John <stevehuwjohn@gmail.com>
Date: Fri, 16 Aug 2024 11:20:30 +0100
Subject: [PATCH 04/27] WIP

---
 src/Zen.Desktop.Host/Infrastructure/Settings/AppSettings.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Zen.Desktop.Host/Infrastructure/Settings/AppSettings.cs b/src/Zen.Desktop.Host/Infrastructure/Settings/AppSettings.cs
index 71cdc6f9..e88f1d0b 100644
--- a/src/Zen.Desktop.Host/Infrastructure/Settings/AppSettings.cs
+++ b/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;
     }

From ff8a9c4a5eeafcbec100dc3df2378ae7a1ed0305 Mon Sep 17 00:00:00 2001
From: Stevo John <stevehuwjohn@gmail.com>
Date: Fri, 16 Aug 2024 11:25:00 +0100
Subject: [PATCH 05/27] WIP

---
 src/Zen.Desktop.Host/Infrastructure/Host.cs | 25 ++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/Zen.Desktop.Host/Infrastructure/Host.cs b/src/Zen.Desktop.Host/Infrastructure/Host.cs
index b68218da..f504acc6 100644
--- a/src/Zen.Desktop.Host/Infrastructure/Host.cs
+++ b/src/Zen.Desktop.Host/Infrastructure/Host.cs
@@ -279,6 +279,17 @@ private void MenuFinished(MenuResult result, object arguments)
                 _motherboard.Fast = false;
                 _motherboard.Slow = false;
                 _motherboard.AyAudio.BufferSize = System.Modules.Audio.Constants.DefaultBufferSize;
+                
+                TargetElapsedTime = TimeSpan.FromMilliseconds(16.666);
+
+                break;
+
+            case MenuResult.SpeedLocked:
+                _motherboard.Fast = false;
+                _motherboard.Slow = false;
+                _motherboard.AyAudio.BufferSize = System.Modules.Audio.Constants.DefaultBufferSize;
+                
+                TargetElapsedTime = TimeSpan.FromMilliseconds(20);
 
                 break;
 
@@ -286,6 +297,8 @@ private void MenuFinished(MenuResult result, object arguments)
                 _motherboard.Fast = true;
                 _motherboard.Slow = false;
                 _motherboard.AyAudio.BufferSize = System.Modules.Audio.Constants.DefaultBufferSize;
+                
+                TargetElapsedTime = TimeSpan.FromMilliseconds(16.666);
 
                 break;
             
@@ -293,21 +306,27 @@ private void MenuFinished(MenuResult result, object arguments)
                 _motherboard.Fast = false;
                 _motherboard.Slow = true;
                 _motherboard.AyAudio.BufferSize = System.Modules.Audio.Constants.DefaultBufferSize;
-                
+                                
+                TargetElapsedTime = TimeSpan.FromMilliseconds(16.666);
+
                 break;
             
             case MenuResult.SpeedHalf:
                 _motherboard.Fast = false;
                 _motherboard.Slow = false;
                 _motherboard.AyAudio.BufferSize = System.Modules.Audio.Constants.DefaultBufferSize * 2;
-                
+                                
+                TargetElapsedTime = TimeSpan.FromMilliseconds(16.666);
+
                 break;
             
             case MenuResult.SpeedQuarter:
                 _motherboard.Fast = false;
                 _motherboard.Slow = false;
                 _motherboard.AyAudio.BufferSize = System.Modules.Audio.Constants.DefaultBufferSize * 4;
-
+                
+                TargetElapsedTime = TimeSpan.FromMilliseconds(16.666);
+    
                 break;
 
             case MenuResult.SaveState:

From 12af2b02d756c890aa207f0f3f28b230195ddec7 Mon Sep 17 00:00:00 2001
From: Stevo John <stevehuwjohn@gmail.com>
Date: Fri, 16 Aug 2024 11:28:38 +0100
Subject: [PATCH 06/27] WIP

---
 src/Zen.System/Modules/Worker.cs | 113 ++++++++++++++++---------------
 1 file changed, 59 insertions(+), 54 deletions(-)

diff --git a/src/Zen.System/Modules/Worker.cs b/src/Zen.System/Modules/Worker.cs
index 5d5696e5..6413502a 100644
--- a/src/Zen.System/Modules/Worker.cs
+++ b/src/Zen.System/Modules/Worker.cs
@@ -111,82 +111,87 @@ private void TimerWorker()
         {
             try
             {
-                if (! _paused)
-                {
-                    _frameCycles = 0;
-
-                    _videoModulator.StartFrame();
-
-                    while (_frameCycles < Constants.FrameCycles)
-                    {
-                        if (_frameCycles is >= Constants.InterruptStart and < Constants.InterruptEnd)
-                        {
-                            _interface.INT = true;
+                RunFrame();
+            }
+            catch (Exception exception)
+            {
+                Logger.LogException(nameof(Worker), exception);
 
-                            _scanStates = 0;
+                throw;
+            }
+        }
+        // ReSharper disable once FunctionNeverReturns
+    }
 
-                            _lastScanComplete = 0;
-                        }
-                        else
-                        {
-                            _interface.INT = false;
-                        }
+    private void RunFrame()
+    {
+        if (! _paused)
+        {
+            _frameCycles = 0;
 
-                        ClearFrameRamBuffer();
+            _videoModulator.StartFrame();
 
-                        var cycles = OnTick(_frameCycles);
+            while (_frameCycles < Constants.FrameCycles)
+            {
+                if (_frameCycles is >= Constants.InterruptStart and < Constants.InterruptEnd)
+                {
+                    _interface.INT = true;
 
-                        var instructionCycles = 0;
-                        
-                        for (var i = 0; i < 7; i++)
-                        {
-                            if (i > 0 && cycles[i] == 0)
-                            {
-                                break;
-                            }
+                    _scanStates = 0;
 
-                            _frameCycles += cycles[i];
+                    _lastScanComplete = 0;
+                }
+                else
+                {
+                    _interface.INT = false;
+                }
 
-                            instructionCycles += cycles[i];
+                ClearFrameRamBuffer();
 
-                            _frameCycles += ApplyFrameRamChanges(i, _frameCycles, cycles);
+                var cycles = OnTick(_frameCycles);
 
-                            if (cycles[i] > 0)
-                            {
-                                _videoModulator.CycleComplete(_frameCycles);
-                            }
-                        }
+                var instructionCycles = 0;
+                
+                for (var i = 0; i < 7; i++)
+                {
+                    if (i > 0 && cycles[i] == 0)
+                    {
+                        break;
+                    }
 
-                        _scanStates += instructionCycles;
+                    _frameCycles += cycles[i];
 
-                        if (Slow && _scanStates - _lastScanComplete > Constants.StatesPerScreenLine * Constants.SlowScanFactor)
-                        {
-                            _scanResetEvent.WaitOne();
+                    instructionCycles += cycles[i];
 
-                            _lastScanComplete = _scanStates;
-                        }
-                    }
+                    _frameCycles += ApplyFrameRamChanges(i, _frameCycles, cycles);
 
-                    if (! Fast)
+                    if (cycles[i] > 0)
                     {
-                        _resetEvent.WaitOne();
+                        _videoModulator.CycleComplete(_frameCycles);
                     }
-
-                    Counters.Instance.IncrementCounter(Counter.SpectrumFrames);
                 }
 
-                _ayAudio.FrameReady(_resetEvent);
+                _scanStates += instructionCycles;
+
+                if (Slow && _scanStates - _lastScanComplete > Constants.StatesPerScreenLine * Constants.SlowScanFactor)
+                {
+                    _scanResetEvent.WaitOne();
 
-                _resetEvent.Reset();
+                    _lastScanComplete = _scanStates;
+                }
             }
-            catch (Exception exception)
-            {
-                Logger.LogException(nameof(Worker), exception);
 
-                throw;
+            if (! Fast)
+            {
+                _resetEvent.WaitOne();
             }
+
+            Counters.Instance.IncrementCounter(Counter.SpectrumFrames);
         }
-        // ReSharper disable once FunctionNeverReturns
+
+        _ayAudio.FrameReady(_resetEvent);
+
+        _resetEvent.Reset();
     }
 
     private void ClearFrameRamBuffer()

From c26fd34c414c418b6057bb4451ddaa813a13a2ae Mon Sep 17 00:00:00 2001
From: Stevo John <stevehuwjohn@gmail.com>
Date: Fri, 16 Aug 2024 11:28:59 +0100
Subject: [PATCH 07/27] WIP

---
 src/Zen.System/Modules/Worker.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Zen.System/Modules/Worker.cs b/src/Zen.System/Modules/Worker.cs
index 6413502a..62cc32ad 100644
--- a/src/Zen.System/Modules/Worker.cs
+++ b/src/Zen.System/Modules/Worker.cs
@@ -123,7 +123,7 @@ private void TimerWorker()
         // ReSharper disable once FunctionNeverReturns
     }
 
-    private void RunFrame()
+    public void RunFrame()
     {
         if (! _paused)
         {

From 2528823ad119ff816fe850624ff1c183e3a68c36 Mon Sep 17 00:00:00 2001
From: Stevo John <stevehuwjohn@gmail.com>
Date: Fri, 16 Aug 2024 11:30:59 +0100
Subject: [PATCH 08/27] WIP

---
 src/Zen.Desktop.Host/Infrastructure/Host.cs | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/Zen.Desktop.Host/Infrastructure/Host.cs b/src/Zen.Desktop.Host/Infrastructure/Host.cs
index f504acc6..b8ebc9db 100644
--- a/src/Zen.Desktop.Host/Infrastructure/Host.cs
+++ b/src/Zen.Desktop.Host/Infrastructure/Host.cs
@@ -278,7 +278,6 @@ private void MenuFinished(MenuResult result, object arguments)
             case MenuResult.SpeedNormal:
                 _motherboard.Fast = false;
                 _motherboard.Slow = false;
-                _motherboard.AyAudio.BufferSize = System.Modules.Audio.Constants.DefaultBufferSize;
                 
                 TargetElapsedTime = TimeSpan.FromMilliseconds(16.666);
 
@@ -287,7 +286,6 @@ private void MenuFinished(MenuResult result, object arguments)
             case MenuResult.SpeedLocked:
                 _motherboard.Fast = false;
                 _motherboard.Slow = false;
-                _motherboard.AyAudio.BufferSize = System.Modules.Audio.Constants.DefaultBufferSize;
                 
                 TargetElapsedTime = TimeSpan.FromMilliseconds(20);
 
@@ -296,7 +294,6 @@ private void MenuFinished(MenuResult result, object arguments)
             case MenuResult.SpeedFast:
                 _motherboard.Fast = true;
                 _motherboard.Slow = false;
-                _motherboard.AyAudio.BufferSize = System.Modules.Audio.Constants.DefaultBufferSize;
                 
                 TargetElapsedTime = TimeSpan.FromMilliseconds(16.666);
 
@@ -305,7 +302,6 @@ private void MenuFinished(MenuResult result, object arguments)
             case MenuResult.SpeedSlow:
                 _motherboard.Fast = false;
                 _motherboard.Slow = true;
-                _motherboard.AyAudio.BufferSize = System.Modules.Audio.Constants.DefaultBufferSize;
                                 
                 TargetElapsedTime = TimeSpan.FromMilliseconds(16.666);
 
@@ -314,18 +310,16 @@ private void MenuFinished(MenuResult result, object arguments)
             case MenuResult.SpeedHalf:
                 _motherboard.Fast = false;
                 _motherboard.Slow = false;
-                _motherboard.AyAudio.BufferSize = System.Modules.Audio.Constants.DefaultBufferSize * 2;
                                 
-                TargetElapsedTime = TimeSpan.FromMilliseconds(16.666);
+                TargetElapsedTime = TimeSpan.FromMilliseconds(40);
 
                 break;
             
             case MenuResult.SpeedQuarter:
                 _motherboard.Fast = false;
                 _motherboard.Slow = false;
-                _motherboard.AyAudio.BufferSize = System.Modules.Audio.Constants.DefaultBufferSize * 4;
                 
-                TargetElapsedTime = TimeSpan.FromMilliseconds(16.666);
+                TargetElapsedTime = TimeSpan.FromMilliseconds(80);
     
                 break;
 

From a3bccb65a041d5eaea479529b56d0dda49dc7613 Mon Sep 17 00:00:00 2001
From: Stevo John <stevehuwjohn@gmail.com>
Date: Fri, 16 Aug 2024 11:32:36 +0100
Subject: [PATCH 09/27] WIP

---
 src/Zen.Desktop.Host/Infrastructure/Host.cs |  1 -
 src/Zen.System/Modules/AyAudio.cs           | 20 ++++----------------
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/src/Zen.Desktop.Host/Infrastructure/Host.cs b/src/Zen.Desktop.Host/Infrastructure/Host.cs
index b8ebc9db..e43b0c89 100644
--- a/src/Zen.Desktop.Host/Infrastructure/Host.cs
+++ b/src/Zen.Desktop.Host/Infrastructure/Host.cs
@@ -261,7 +261,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();
diff --git a/src/Zen.System/Modules/AyAudio.cs b/src/Zen.System/Modules/AyAudio.cs
index 9436fb50..727b3444 100644
--- a/src/Zen.System/Modules/AyAudio.cs
+++ b/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
@@ -75,7 +63,7 @@ public AyAudio(IZenAudioEngine engine)
     {
         _engine = engine;
         
-        _buffer = new float[_bufferSize];
+        _buffer = new float[Constants.DefaultBufferSize];
 
         _cancellationTokenSource = new CancellationTokenSource();
 
@@ -283,7 +271,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 +281,7 @@ private void RunFrame()
 
                 _resetEvent.Reset();
 
-                for (var i = 0; i < _bufferSize; i++)
+                for (var i = 0; i < Constants.DefaultBufferSize; i++)
                 {
                     if (Silent)
                     {

From 2cc70b6b296945212e21ba76fcd55f27d795f837 Mon Sep 17 00:00:00 2001
From: Stevo John <stevehuwjohn@gmail.com>
Date: Fri, 16 Aug 2024 11:37:15 +0100
Subject: [PATCH 10/27] WIP

---
 src/Zen.Desktop.Host/Infrastructure/Host.cs    | 16 ----------------
 .../Infrastructure/Menu/MenuResult.cs          |  2 --
 .../Infrastructure/Menu/SpeedMenu.cs           | 18 +++---------------
 .../Infrastructure/Settings/Speed.cs           |  2 --
 4 files changed, 3 insertions(+), 35 deletions(-)

diff --git a/src/Zen.Desktop.Host/Infrastructure/Host.cs b/src/Zen.Desktop.Host/Infrastructure/Host.cs
index e43b0c89..598d40c7 100644
--- a/src/Zen.Desktop.Host/Infrastructure/Host.cs
+++ b/src/Zen.Desktop.Host/Infrastructure/Host.cs
@@ -305,22 +305,6 @@ private void MenuFinished(MenuResult result, object arguments)
                 TargetElapsedTime = TimeSpan.FromMilliseconds(16.666);
 
                 break;
-            
-            case MenuResult.SpeedHalf:
-                _motherboard.Fast = false;
-                _motherboard.Slow = false;
-                                
-                TargetElapsedTime = TimeSpan.FromMilliseconds(40);
-
-                break;
-            
-            case MenuResult.SpeedQuarter:
-                _motherboard.Fast = false;
-                _motherboard.Slow = false;
-                
-                TargetElapsedTime = TimeSpan.FromMilliseconds(80);
-    
-                break;
 
             case MenuResult.SaveState:
                 SaveState();
diff --git a/src/Zen.Desktop.Host/Infrastructure/Menu/MenuResult.cs b/src/Zen.Desktop.Host/Infrastructure/Menu/MenuResult.cs
index 39029cca..121c2495 100644
--- a/src/Zen.Desktop.Host/Infrastructure/Menu/MenuResult.cs
+++ b/src/Zen.Desktop.Host/Infrastructure/Menu/MenuResult.cs
@@ -10,8 +10,6 @@ public enum MenuResult
     SpeedNormal,
     SpeedFast,
     SpeedSlow,
-    SpeedQuarter,
-    SpeedHalf,
     SpeedLocked,
     SaveState,
     LoadState,
diff --git a/src/Zen.Desktop.Host/Infrastructure/Menu/SpeedMenu.cs b/src/Zen.Desktop.Host/Infrastructure/Menu/SpeedMenu.cs
index 2e7b7067..4c81283d 100644
--- a/src/Zen.Desktop.Host/Infrastructure/Menu/SpeedMenu.cs
+++ b/src/Zen.Desktop.Host/Infrastructure/Menu/SpeedMenu.cs
@@ -13,11 +13,9 @@ 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.Locked ? ">" : " ")} Locked 50Hz {(AppSettings.Instance.Speed == Speed.Locked ? "<" : " ")}", Color.Yellow, 1, 9, Keys.D4, Color.LightGreen),
-                        new(5, false, $"[5] {(AppSettings.Instance.Speed == Speed.Normal ? ">" : " ")} Normal {(AppSettings.Instance.Speed == Speed.Normal ? "<" : " ")}", Color.Yellow, 1, 11, Keys.D5, Color.LightGreen),
-                        new(6, false, $"[6] {(AppSettings.Instance.Speed == Speed.Fast ? ">" : " ")} As Fast As Possible {(AppSettings.Instance.Speed == Speed.Fast ? "<" : " ")}", Color.Yellow, 1, 13, Keys.D6, 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 or", Color.Wheat, 0, 18, null),
@@ -37,16 +35,6 @@ public override (MenuResult Result, MenuBase NewMenu, object Arguments) ItemSele
 
                 return (MenuResult.SpeedSlow, null, null);
 
-            case 2:
-                AppSettings.Instance.Speed = Speed.Quarter;
-
-                return (MenuResult.SpeedQuarter, null, null);
-
-            case 3:
-                AppSettings.Instance.Speed = Speed.Half;
-
-                return (MenuResult.SpeedHalf, null, null);
-
             case 4:
                 AppSettings.Instance.Speed = Speed.Locked;
 
diff --git a/src/Zen.Desktop.Host/Infrastructure/Settings/Speed.cs b/src/Zen.Desktop.Host/Infrastructure/Settings/Speed.cs
index fbd5fa88..fa4f27cd 100644
--- a/src/Zen.Desktop.Host/Infrastructure/Settings/Speed.cs
+++ b/src/Zen.Desktop.Host/Infrastructure/Settings/Speed.cs
@@ -3,8 +3,6 @@ namespace Zen.Desktop.Host.Infrastructure.Settings;
 public enum Speed
 {
     Slow,
-    Quarter,
-    Half,
     Locked,
     Normal,
     Fast

From 00bfde5a34d56299b83d2270877852ca0bb19aba Mon Sep 17 00:00:00 2001
From: Stevo John <stevehuwjohn@gmail.com>
Date: Fri, 16 Aug 2024 11:39:54 +0100
Subject: [PATCH 11/27] WIP

---
 src/Zen.System/Modules/Ram.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Zen.System/Modules/Ram.cs b/src/Zen.System/Modules/Ram.cs
index 6d8e6164..50bf3b51 100644
--- a/src/Zen.System/Modules/Ram.cs
+++ b/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];

From 76a5d7edd78bf1a8481233b3e062b222b0afeca6 Mon Sep 17 00:00:00 2001
From: Stevo John <stevehuwjohn@gmail.com>
Date: Fri, 16 Aug 2024 11:54:56 +0100
Subject: [PATCH 12/27] WIP

---
 src/Zen.Desktop.Host/Infrastructure/Host.cs | 5 +++++
 src/Zen.System/Motherboard.cs               | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/src/Zen.Desktop.Host/Infrastructure/Host.cs b/src/Zen.Desktop.Host/Infrastructure/Host.cs
index 598d40c7..e032ef88 100644
--- a/src/Zen.Desktop.Host/Infrastructure/Host.cs
+++ b/src/Zen.Desktop.Host/Infrastructure/Host.cs
@@ -228,6 +228,11 @@ protected override void Update(GameTime gameTime)
             _motherboard.Resume();
         }
 
+        if (AppSettings.Instance.Speed == Speed.Fast)
+        {
+            _motherboard.Worker.RunFrame();
+        }
+
         if (Keyboard.GetState().IsKeyDown(Keys.Tab) && _menuSystem == null)
         {
             _motherboard.Pause();
diff --git a/src/Zen.System/Motherboard.cs b/src/Zen.System/Motherboard.cs
index a8a7f396..f8cd8870 100644
--- a/src/Zen.System/Motherboard.cs
+++ b/src/Zen.System/Motherboard.cs
@@ -68,6 +68,8 @@ public bool Slow
     {
         set => _worker.Slow = value;
     }
+    
+    public Worker Worker => _worker;
 
     public bool Sound
     {

From 300d14d0456668fd86801d4743368155943f1f92 Mon Sep 17 00:00:00 2001
From: Stevo John <stevehuwjohn@gmail.com>
Date: Fri, 16 Aug 2024 11:58:07 +0100
Subject: [PATCH 13/27] WIP

---
 src/Zen.Desktop.Host/Infrastructure/Host.cs |   2 +-
 src/Zen.System/Modules/Worker.cs            | 103 ++++++++++----------
 2 files changed, 55 insertions(+), 50 deletions(-)

diff --git a/src/Zen.Desktop.Host/Infrastructure/Host.cs b/src/Zen.Desktop.Host/Infrastructure/Host.cs
index e032ef88..ee3a2653 100644
--- a/src/Zen.Desktop.Host/Infrastructure/Host.cs
+++ b/src/Zen.Desktop.Host/Infrastructure/Host.cs
@@ -228,7 +228,7 @@ protected override void Update(GameTime gameTime)
             _motherboard.Resume();
         }
 
-        if (AppSettings.Instance.Speed == Speed.Fast)
+        if (AppSettings.Instance.Speed == Speed.Locked)
         {
             _motherboard.Worker.RunFrame();
         }
diff --git a/src/Zen.System/Modules/Worker.cs b/src/Zen.System/Modules/Worker.cs
index 62cc32ad..43a946b0 100644
--- a/src/Zen.System/Modules/Worker.cs
+++ b/src/Zen.System/Modules/Worker.cs
@@ -41,6 +41,8 @@ public class Worker : IDisposable
     public bool Fast { get; set; }
     
     public bool Slow { get; set; }
+    
+    public bool Locked { get; set; }
 
     public Worker(Interface @interface, VideoModulator videoModulator, AyAudio ayAudio)
     {
@@ -109,89 +111,92 @@ private void TimerWorker()
     {
         while (! _cancellationToken.IsCancellationRequested)
         {
-            try
+            if (! Locked)
             {
                 RunFrame();
             }
-            catch (Exception exception)
-            {
-                Logger.LogException(nameof(Worker), exception);
-
-                throw;
-            }
         }
         // ReSharper disable once FunctionNeverReturns
     }
 
     public void RunFrame()
     {
-        if (! _paused)
+        try
         {
-            _frameCycles = 0;
+            if (! _paused)
+            {
+                _frameCycles = 0;
 
-            _videoModulator.StartFrame();
+                _videoModulator.StartFrame();
 
-            while (_frameCycles < Constants.FrameCycles)
-            {
-                if (_frameCycles is >= Constants.InterruptStart and < Constants.InterruptEnd)
+                while (_frameCycles < Constants.FrameCycles)
                 {
-                    _interface.INT = true;
+                    if (_frameCycles is >= Constants.InterruptStart and < Constants.InterruptEnd)
+                    {
+                        _interface.INT = true;
 
-                    _scanStates = 0;
+                        _scanStates = 0;
 
-                    _lastScanComplete = 0;
-                }
-                else
-                {
-                    _interface.INT = false;
-                }
+                        _lastScanComplete = 0;
+                    }
+                    else
+                    {
+                        _interface.INT = false;
+                    }
 
-                ClearFrameRamBuffer();
+                    ClearFrameRamBuffer();
 
-                var cycles = OnTick(_frameCycles);
+                    var cycles = OnTick(_frameCycles);
 
-                var instructionCycles = 0;
-                
-                for (var i = 0; i < 7; i++)
-                {
-                    if (i > 0 && cycles[i] == 0)
+                    var instructionCycles = 0;
+
+                    for (var i = 0; i < 7; i++)
                     {
-                        break;
-                    }
+                        if (i > 0 && cycles[i] == 0)
+                        {
+                            break;
+                        }
 
-                    _frameCycles += cycles[i];
+                        _frameCycles += cycles[i];
 
-                    instructionCycles += cycles[i];
+                        instructionCycles += cycles[i];
 
-                    _frameCycles += ApplyFrameRamChanges(i, _frameCycles, cycles);
+                        _frameCycles += ApplyFrameRamChanges(i, _frameCycles, cycles);
+
+                        if (cycles[i] > 0)
+                        {
+                            _videoModulator.CycleComplete(_frameCycles);
+                        }
+                    }
 
-                    if (cycles[i] > 0)
+                    _scanStates += instructionCycles;
+
+                    if (Slow && _scanStates - _lastScanComplete > Constants.StatesPerScreenLine * Constants.SlowScanFactor)
                     {
-                        _videoModulator.CycleComplete(_frameCycles);
+                        _scanResetEvent.WaitOne();
+
+                        _lastScanComplete = _scanStates;
                     }
                 }
 
-                _scanStates += instructionCycles;
-
-                if (Slow && _scanStates - _lastScanComplete > Constants.StatesPerScreenLine * Constants.SlowScanFactor)
+                if (! Fast)
                 {
-                    _scanResetEvent.WaitOne();
-
-                    _lastScanComplete = _scanStates;
+                    _resetEvent.WaitOne();
                 }
-            }
 
-            if (! Fast)
-            {
-                _resetEvent.WaitOne();
+                Counters.Instance.IncrementCounter(Counter.SpectrumFrames);
             }
 
-            Counters.Instance.IncrementCounter(Counter.SpectrumFrames);
-        }
+            _ayAudio.FrameReady(_resetEvent);
 
-        _ayAudio.FrameReady(_resetEvent);
+            _resetEvent.Reset();
+        }
+        catch (Exception exception)
+        {
+            Logger.LogException(nameof(Worker), exception);
 
-        _resetEvent.Reset();
+            throw;
+        }
     }
 
     private void ClearFrameRamBuffer()

From 387d87d170a041092c92a265d37b56bc50abd2e4 Mon Sep 17 00:00:00 2001
From: Stevo John <stevehuwjohn@gmail.com>
Date: Fri, 16 Aug 2024 11:59:00 +0100
Subject: [PATCH 14/27] WIP

---
 src/Zen.Desktop.Host/Infrastructure/Host.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Zen.Desktop.Host/Infrastructure/Host.cs b/src/Zen.Desktop.Host/Infrastructure/Host.cs
index ee3a2653..71753ca3 100644
--- a/src/Zen.Desktop.Host/Infrastructure/Host.cs
+++ b/src/Zen.Desktop.Host/Infrastructure/Host.cs
@@ -282,6 +282,7 @@ private void MenuFinished(MenuResult result, object arguments)
             case MenuResult.SpeedNormal:
                 _motherboard.Fast = false;
                 _motherboard.Slow = false;
+                _motherboard.Worker.Locked = false;
                 
                 TargetElapsedTime = TimeSpan.FromMilliseconds(16.666);
 
@@ -290,6 +291,7 @@ private void MenuFinished(MenuResult result, object arguments)
             case MenuResult.SpeedLocked:
                 _motherboard.Fast = false;
                 _motherboard.Slow = false;
+                _motherboard.Worker.Locked = true;
                 
                 TargetElapsedTime = TimeSpan.FromMilliseconds(20);
 
@@ -298,6 +300,7 @@ private void MenuFinished(MenuResult result, object arguments)
             case MenuResult.SpeedFast:
                 _motherboard.Fast = true;
                 _motherboard.Slow = false;
+                _motherboard.Worker.Locked = false;
                 
                 TargetElapsedTime = TimeSpan.FromMilliseconds(16.666);
 
@@ -306,6 +309,7 @@ private void MenuFinished(MenuResult result, object arguments)
             case MenuResult.SpeedSlow:
                 _motherboard.Fast = false;
                 _motherboard.Slow = true;
+                _motherboard.Worker.Locked = false;
                                 
                 TargetElapsedTime = TimeSpan.FromMilliseconds(16.666);
 

From 25a31cb9801ed76a72d0bb1962a57986f46bad4f Mon Sep 17 00:00:00 2001
From: Stevo John <stevehuwjohn@gmail.com>
Date: Fri, 16 Aug 2024 12:00:19 +0100
Subject: [PATCH 15/27] WIP

---
 src/Zen.Desktop.Host/Infrastructure/Menu/SpeedMenu.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Zen.Desktop.Host/Infrastructure/Menu/SpeedMenu.cs b/src/Zen.Desktop.Host/Infrastructure/Menu/SpeedMenu.cs
index 4c81283d..cd6e8c9f 100644
--- a/src/Zen.Desktop.Host/Infrastructure/Menu/SpeedMenu.cs
+++ b/src/Zen.Desktop.Host/Infrastructure/Menu/SpeedMenu.cs
@@ -35,17 +35,17 @@ public override (MenuResult Result, MenuBase NewMenu, object Arguments) ItemSele
 
                 return (MenuResult.SpeedSlow, null, null);
 
-            case 4:
+            case 2:
                 AppSettings.Instance.Speed = Speed.Locked;
 
                 return (MenuResult.SpeedLocked, null, null);
 
-            case 5:
+            case 3:
                 AppSettings.Instance.Speed = Speed.Normal;
 
                 return (MenuResult.SpeedNormal, null, null);
 
-            case 6:
+            case 4:
                 AppSettings.Instance.Speed = Speed.Fast;
 
                 return (MenuResult.SpeedFast, null, null);

From 10680624f94c14b9daa0dc5d0aa869b261af76f7 Mon Sep 17 00:00:00 2001
From: Stevo John <stevehuwjohn@gmail.com>
Date: Fri, 16 Aug 2024 12:02:42 +0100
Subject: [PATCH 16/27] WIP

---
 src/Zen.Desktop.Host/Infrastructure/Host.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Zen.Desktop.Host/Infrastructure/Host.cs b/src/Zen.Desktop.Host/Infrastructure/Host.cs
index 71753ca3..434c82bc 100644
--- a/src/Zen.Desktop.Host/Infrastructure/Host.cs
+++ b/src/Zen.Desktop.Host/Infrastructure/Host.cs
@@ -283,8 +283,8 @@ private void MenuFinished(MenuResult result, object arguments)
                 _motherboard.Fast = false;
                 _motherboard.Slow = false;
                 _motherboard.Worker.Locked = false;
-                
-                TargetElapsedTime = TimeSpan.FromMilliseconds(16.666);
+
+                TargetElapsedTime = TimeSpan.FromTicks(166667L);
 
                 break;
 
@@ -302,7 +302,7 @@ private void MenuFinished(MenuResult result, object arguments)
                 _motherboard.Slow = false;
                 _motherboard.Worker.Locked = false;
                 
-                TargetElapsedTime = TimeSpan.FromMilliseconds(16.666);
+                TargetElapsedTime = TimeSpan.FromTicks(166667L);
 
                 break;
             
@@ -311,7 +311,7 @@ private void MenuFinished(MenuResult result, object arguments)
                 _motherboard.Slow = true;
                 _motherboard.Worker.Locked = false;
                                 
-                TargetElapsedTime = TimeSpan.FromMilliseconds(16.666);
+                TargetElapsedTime = TimeSpan.FromTicks(166667L);
 
                 break;
 

From e471e63ca48da81bb4ab56483a2edc51ec09ba98 Mon Sep 17 00:00:00 2001
From: Stevo John <stevehuwjohn@gmail.com>
Date: Fri, 16 Aug 2024 12:10:38 +0100
Subject: [PATCH 17/27] WIP

---
 src/Zen.System/Modules/Worker.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Zen.System/Modules/Worker.cs b/src/Zen.System/Modules/Worker.cs
index 43a946b0..417edfb2 100644
--- a/src/Zen.System/Modules/Worker.cs
+++ b/src/Zen.System/Modules/Worker.cs
@@ -179,7 +179,7 @@ public void RunFrame()
                     }
                 }
 
-                if (! Fast)
+                if (! Fast && ! Locked)
                 {
                     _resetEvent.WaitOne();
                 }

From fa8eab200f2c0680f1d3c5f46f7c3caba0f2af2d Mon Sep 17 00:00:00 2001
From: Stevo John <stevehuwjohn@gmail.com>
Date: Fri, 16 Aug 2024 12:24:22 +0100
Subject: [PATCH 18/27] WIP

---
 src/Zen.Desktop.Host/Infrastructure/Host.cs   | 23 ++++++-------------
 .../Infrastructure/Settings/AppSettings.cs    |  2 +-
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/src/Zen.Desktop.Host/Infrastructure/Host.cs b/src/Zen.Desktop.Host/Infrastructure/Host.cs
index 434c82bc..4a02e0c8 100644
--- a/src/Zen.Desktop.Host/Infrastructure/Host.cs
+++ b/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,13 @@ 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;
+
+            TargetElapsedTime = TimeSpan.FromMilliseconds(20);
+        }
+
         _imageName = $"Standard {model} ROM";
 
         AppSettings.Instance.SystemModel = model;
@@ -216,18 +219,6 @@ private void ScanComplete()
 
     protected override void Update(GameTime gameTime)
     {
-        if (_pause != null)
-        {
-            _pause--;
-        }
-
-        if (_pause == 0)
-        {
-            _pause = null;
-
-            _motherboard.Resume();
-        }
-
         if (AppSettings.Instance.Speed == Speed.Locked)
         {
             _motherboard.Worker.RunFrame();
diff --git a/src/Zen.Desktop.Host/Infrastructure/Settings/AppSettings.cs b/src/Zen.Desktop.Host/Infrastructure/Settings/AppSettings.cs
index e88f1d0b..8397c7a6 100644
--- a/src/Zen.Desktop.Host/Infrastructure/Settings/AppSettings.cs
+++ b/src/Zen.Desktop.Host/Infrastructure/Settings/AppSettings.cs
@@ -62,7 +62,7 @@ private static AppSettings GetAppSettings()
 
         settings.Speed = RuntimeInformation.IsOSPlatform(OSPlatform.Linux)
             ? Speed.Locked
-            : Speed.Normal;
+            : Speed.Locked;
 
         return settings;
     }

From 05fda36be648d23c4919fc05d3740b4ce616e226 Mon Sep 17 00:00:00 2001
From: Stevo John <stevehuwjohn@gmail.com>
Date: Fri, 16 Aug 2024 12:25:17 +0100
Subject: [PATCH 19/27] WIP

---
 src/Zen.Desktop.Host/Infrastructure/Host.cs | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/Zen.Desktop.Host/Infrastructure/Host.cs b/src/Zen.Desktop.Host/Infrastructure/Host.cs
index 4a02e0c8..c6b0a7bd 100644
--- a/src/Zen.Desktop.Host/Infrastructure/Host.cs
+++ b/src/Zen.Desktop.Host/Infrastructure/Host.cs
@@ -22,6 +22,8 @@ namespace Zen.Desktop.Host.Infrastructure;
 
 public class Host : Game
 {
+    private const int StartPause = 30;
+
     // ReSharper disable once PrivateFieldCanBeConvertedToLocalVariable
     private readonly GraphicsDeviceManager _graphicsDeviceManager;
 
@@ -39,6 +41,8 @@ public class Host : Game
 
     private MenuSystem _menuSystem;
 
+    private int? _pause = StartPause;
+
     private bool _soundState;
 
     private WaveVisualiser _waveVisualiser;
@@ -121,7 +125,7 @@ private void SetMotherboard(Model model)
         if (AppSettings.Instance.Speed == Speed.Locked)
         {
             _motherboard.Worker.Locked = true;
-
+            
             TargetElapsedTime = TimeSpan.FromMilliseconds(20);
         }
 
@@ -219,6 +223,18 @@ private void ScanComplete()
 
     protected override void Update(GameTime gameTime)
     {
+        if (_pause != null)
+        {
+            _pause--;
+        }
+
+        if (_pause == 0)
+        {
+            _pause = null;
+
+            _motherboard.Resume();
+        }
+
         if (AppSettings.Instance.Speed == Speed.Locked)
         {
             _motherboard.Worker.RunFrame();

From e9e40d45a698929f299aaba3d95586783df2addd Mon Sep 17 00:00:00 2001
From: Stevo John <stevehuwjohn@gmail.com>
Date: Fri, 16 Aug 2024 12:27:19 +0100
Subject: [PATCH 20/27] WIP

---
 src/Zen.Desktop.Host/Infrastructure/Host.cs | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/src/Zen.Desktop.Host/Infrastructure/Host.cs b/src/Zen.Desktop.Host/Infrastructure/Host.cs
index c6b0a7bd..7d4be43c 100644
--- a/src/Zen.Desktop.Host/Infrastructure/Host.cs
+++ b/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;
@@ -159,8 +155,6 @@ protected override void OnActivated(object sender, EventArgs args)
         {
             _motherboard.Start();
 
-            _motherboard.Pause();
-
             _hostStarted = true;
 
             _motherboard.Fast = AppSettings.Instance.Speed == Speed.Fast;
@@ -223,18 +217,6 @@ private void ScanComplete()
 
     protected override void Update(GameTime gameTime)
     {
-        if (_pause != null)
-        {
-            _pause--;
-        }
-
-        if (_pause == 0)
-        {
-            _pause = null;
-
-            _motherboard.Resume();
-        }
-
         if (AppSettings.Instance.Speed == Speed.Locked)
         {
             _motherboard.Worker.RunFrame();

From 23fc2b509eb23d532c751acf715e6bb8522121ab Mon Sep 17 00:00:00 2001
From: Stevo John <stevehuwjohn@gmail.com>
Date: Fri, 16 Aug 2024 12:27:30 +0100
Subject: [PATCH 21/27] WIP

---
 src/Zen.Desktop.Host/Infrastructure/Settings/AppSettings.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Zen.Desktop.Host/Infrastructure/Settings/AppSettings.cs b/src/Zen.Desktop.Host/Infrastructure/Settings/AppSettings.cs
index 8397c7a6..e88f1d0b 100644
--- a/src/Zen.Desktop.Host/Infrastructure/Settings/AppSettings.cs
+++ b/src/Zen.Desktop.Host/Infrastructure/Settings/AppSettings.cs
@@ -62,7 +62,7 @@ private static AppSettings GetAppSettings()
 
         settings.Speed = RuntimeInformation.IsOSPlatform(OSPlatform.Linux)
             ? Speed.Locked
-            : Speed.Locked;
+            : Speed.Normal;
 
         return settings;
     }

From 08808e4c953d9a4388ea93e57a166531ac77ccea Mon Sep 17 00:00:00 2001
From: Stevo John <stevehuwjohn@gmail.com>
Date: Fri, 16 Aug 2024 12:36:51 +0100
Subject: [PATCH 22/27] WIP

---
 src/Zen.System/Modules/AyAudio.cs | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/Zen.System/Modules/AyAudio.cs b/src/Zen.System/Modules/AyAudio.cs
index 727b3444..c75df19d 100644
--- a/src/Zen.System/Modules/AyAudio.cs
+++ b/src/Zen.System/Modules/AyAudio.cs
@@ -24,8 +24,6 @@ public class AyAudio : IDisposable
 
     private readonly byte[] _registerValues = new byte[256];
 
-    private readonly ManualResetEvent _resetEvent = new(false);
-
     private readonly Queue<(int Frame, Command Command, byte Value)>[] _commandQueues;
 
     private Task? _audioThread;
@@ -84,8 +82,6 @@ public void Start()
     public void FrameReady(ManualResetEvent resetEvent)
     {
         _workerResetEvent = resetEvent;
-
-        _resetEvent.Set();
     }
 
     public void SelectRegister(int cycle, byte registerNumber)
@@ -277,10 +273,6 @@ private void RunFrame()
         {
             try
             {
-                _resetEvent.WaitOne();
-
-                _resetEvent.Reset();
-
                 for (var i = 0; i < Constants.DefaultBufferSize; i++)
                 {
                     if (Silent)

From 0b2d6df0b4aeea5a53c5b00d983c55edc4fbac17 Mon Sep 17 00:00:00 2001
From: Stevo John <stevehuwjohn@gmail.com>
Date: Fri, 16 Aug 2024 12:43:19 +0100
Subject: [PATCH 23/27] WIP

---
 src/Zen.System/Modules/AyAudio.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/Zen.System/Modules/AyAudio.cs b/src/Zen.System/Modules/AyAudio.cs
index c75df19d..727b3444 100644
--- a/src/Zen.System/Modules/AyAudio.cs
+++ b/src/Zen.System/Modules/AyAudio.cs
@@ -24,6 +24,8 @@ public class AyAudio : IDisposable
 
     private readonly byte[] _registerValues = new byte[256];
 
+    private readonly ManualResetEvent _resetEvent = new(false);
+
     private readonly Queue<(int Frame, Command Command, byte Value)>[] _commandQueues;
 
     private Task? _audioThread;
@@ -82,6 +84,8 @@ public void Start()
     public void FrameReady(ManualResetEvent resetEvent)
     {
         _workerResetEvent = resetEvent;
+
+        _resetEvent.Set();
     }
 
     public void SelectRegister(int cycle, byte registerNumber)
@@ -273,6 +277,10 @@ private void RunFrame()
         {
             try
             {
+                _resetEvent.WaitOne();
+
+                _resetEvent.Reset();
+
                 for (var i = 0; i < Constants.DefaultBufferSize; i++)
                 {
                     if (Silent)

From e3c9245b2ec86fb4578799b788fc4c8dd9e386b1 Mon Sep 17 00:00:00 2001
From: Stevo John <stevehuwjohn@gmail.com>
Date: Fri, 16 Aug 2024 12:48:02 +0100
Subject: [PATCH 24/27] WIP

---
 src/Zen.Desktop.Host/Infrastructure/Host.cs |  9 +++++++--
 src/Zen.System/Modules/AyAudio.cs           | 17 +++++++++++++++--
 src/Zen.System/Modules/Worker.cs            |  5 +++++
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/src/Zen.Desktop.Host/Infrastructure/Host.cs b/src/Zen.Desktop.Host/Infrastructure/Host.cs
index 52398580..e9325d21 100644
--- a/src/Zen.Desktop.Host/Infrastructure/Host.cs
+++ b/src/Zen.Desktop.Host/Infrastructure/Host.cs
@@ -121,6 +121,7 @@ private void SetMotherboard(Model model)
         if (AppSettings.Instance.Speed == Speed.Locked)
         {
             _motherboard.Worker.Locked = true;
+            _motherboard.AyAudio.Locked = true;
             
             TargetElapsedTime = TimeSpan.FromMilliseconds(20);
         }
@@ -272,6 +273,7 @@ private void MenuFinished(MenuResult result, object arguments)
                 _motherboard.Fast = false;
                 _motherboard.Slow = false;
                 _motherboard.Worker.Locked = false;
+                _motherboard.AyAudio.Locked = false;
 
                 TargetElapsedTime = TimeSpan.FromTicks(166667L);
 
@@ -281,6 +283,7 @@ private void MenuFinished(MenuResult result, object arguments)
                 _motherboard.Fast = false;
                 _motherboard.Slow = false;
                 _motherboard.Worker.Locked = true;
+                _motherboard.AyAudio.Locked = true;
                 
                 TargetElapsedTime = TimeSpan.FromMilliseconds(20);
 
@@ -290,7 +293,8 @@ private void MenuFinished(MenuResult result, object arguments)
                 _motherboard.Fast = true;
                 _motherboard.Slow = false;
                 _motherboard.Worker.Locked = false;
-                
+                _motherboard.AyAudio.Locked = false;
+
                 TargetElapsedTime = TimeSpan.FromTicks(166667L);
 
                 break;
@@ -299,7 +303,8 @@ private void MenuFinished(MenuResult result, object arguments)
                 _motherboard.Fast = false;
                 _motherboard.Slow = true;
                 _motherboard.Worker.Locked = false;
-                                
+                _motherboard.AyAudio.Locked = false;
+
                 TargetElapsedTime = TimeSpan.FromTicks(166667L);
 
                 break;
diff --git a/src/Zen.System/Modules/AyAudio.cs b/src/Zen.System/Modules/AyAudio.cs
index 727b3444..ae2368cc 100644
--- a/src/Zen.System/Modules/AyAudio.cs
+++ b/src/Zen.System/Modules/AyAudio.cs
@@ -53,6 +53,8 @@ public IZenAudioEngine AudioEngine
         get => _engine;
     }
 
+    public bool Locked { get; set; }
+    
     public bool Silent { get; set; }
 
     public Action<float[]>? AySignalHook { get; set; }
@@ -78,7 +80,18 @@ public AyAudio(IZenAudioEngine engine)
 
     public void Start()
     {
-        _audioThread = Task.Run(RunFrame, _cancellationToken);
+        _audioThread = Task.Run(() =>
+        {
+            if (! Locked)
+            {
+                RunFrameInternal();
+            }
+        }, _cancellationToken);
+    }
+
+    public void RunFrame()
+    {
+        RunFrameInternal();
     }
 
     public void FrameReady(ManualResetEvent resetEvent)
@@ -267,7 +280,7 @@ public void Dispose()
         _engine.Dispose();
     }
 
-    private void RunFrame()
+    private void RunFrameInternal()
     {
         var signals = new float[3];
 
diff --git a/src/Zen.System/Modules/Worker.cs b/src/Zen.System/Modules/Worker.cs
index 417edfb2..b35ed870 100644
--- a/src/Zen.System/Modules/Worker.cs
+++ b/src/Zen.System/Modules/Worker.cs
@@ -189,6 +189,11 @@ public void RunFrame()
 
             _ayAudio.FrameReady(_resetEvent);
 
+            if (Locked)
+            {
+                _ayAudio.RunFrame();
+            }
+
             _resetEvent.Reset();
         }
         catch (Exception exception)

From adbf475c9a3aae3e1c772afd9dc54d386878bce2 Mon Sep 17 00:00:00 2001
From: Stevo John <stevehuwjohn@gmail.com>
Date: Fri, 16 Aug 2024 13:16:10 +0100
Subject: [PATCH 25/27] WIP

---
 src/Zen.System/Modules/AyAudio.cs | 9 ++-------
 src/Zen.System/Modules/Worker.cs  | 5 -----
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/Zen.System/Modules/AyAudio.cs b/src/Zen.System/Modules/AyAudio.cs
index ae2368cc..26efbc62 100644
--- a/src/Zen.System/Modules/AyAudio.cs
+++ b/src/Zen.System/Modules/AyAudio.cs
@@ -84,16 +84,11 @@ public void Start()
         {
             if (! Locked)
             {
-                RunFrameInternal();
+                RunFrame();
             }
         }, _cancellationToken);
     }
 
-    public void RunFrame()
-    {
-        RunFrameInternal();
-    }
-
     public void FrameReady(ManualResetEvent resetEvent)
     {
         _workerResetEvent = resetEvent;
@@ -280,7 +275,7 @@ public void Dispose()
         _engine.Dispose();
     }
 
-    private void RunFrameInternal()
+    private void RunFrame()
     {
         var signals = new float[3];
 
diff --git a/src/Zen.System/Modules/Worker.cs b/src/Zen.System/Modules/Worker.cs
index b35ed870..417edfb2 100644
--- a/src/Zen.System/Modules/Worker.cs
+++ b/src/Zen.System/Modules/Worker.cs
@@ -189,11 +189,6 @@ public void RunFrame()
 
             _ayAudio.FrameReady(_resetEvent);
 
-            if (Locked)
-            {
-                _ayAudio.RunFrame();
-            }
-
             _resetEvent.Reset();
         }
         catch (Exception exception)

From d041fa24e5a98bc2fce300e24f4eec7f39ea2a7b Mon Sep 17 00:00:00 2001
From: Stevo John <stevehuwjohn@gmail.com>
Date: Fri, 16 Aug 2024 14:03:47 +0100
Subject: [PATCH 26/27] WIP:

---
 clean.sh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/clean.sh b/clean.sh
index e25b8031..828d29ae 100755
--- a/clean.sh
+++ b/clean.sh
@@ -1 +1,15 @@
 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
+
+
+
+
+
+

From c8ef4c6c5aebb994a73392ac58ad4b815f5bcfe0 Mon Sep 17 00:00:00 2001
From: Stevo John <stevehuwjohn@gmail.com>
Date: Fri, 16 Aug 2024 14:04:31 +0100
Subject: [PATCH 27/27] WIP

---
 clean.sh    | 6 ------
 src/Zen.sln | 1 +
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/clean.sh b/clean.sh
index 828d29ae..ae12a585 100755
--- a/clean.sh
+++ b/clean.sh
@@ -7,9 +7,3 @@ 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
-
-
-
-
-
-
diff --git a/src/Zen.sln b/src/Zen.sln
index 0d0f3923..ec32f322 100644
--- a/src/Zen.sln
+++ b/src/Zen.sln
@@ -50,6 +50,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{9302
 		..\test-fuse.sh = ..\test-fuse.sh
 		..\test-jsmoo.sh = ..\test-jsmoo.sh
 		..\publish-app.sh = ..\publish-app.sh
+		..\clean.sh = ..\clean.sh
 	EndProjectSection
 EndProject
 Global