Fixes for issue #290.

PixelVision8 · May 27, 2020 · 9b2e678 · 9b2e678
1 parent fc3b339
commit 9b2e678
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 19 deletions.
diff --git a/Disks/PixelVisionOS/System/Tools/SettingsTool/code-monitor-panel.lua b/Disks/PixelVisionOS/System/Tools/SettingsTool/code-monitor-panel.lua
@@ -57,14 +57,10 @@ end
 
     if(self.lastMuteValue ~= newMuteValue) then
       self.lastMuteValue = newMuteValue
-      -- editorUI:Enable(self.volumeKnobData, not self.lastMuteValue)
-      -- editorUI:ToggleButton(muteBtnData, lastMuteValue, false)
-      editorUI:ChangeKnob(self.volumeKnobData, Volume() / 100, false)
+      editorUI:ChangeKnob(self.volumeKnobData, Volume() / 100, true)
       pixelVisionOS.titleBar.muteInvalid = true
     end
 
-
-
     local newCRTValue = EnableCRT()
 
     if(self.lastCRTValue ~= newCRTValue) then

diff --git a/SDK/Runner/GameRunner.cs b/SDK/Runner/GameRunner.cs
@@ -71,7 +71,7 @@ public enum RunnerMode
 
         private static bool _mute;
         private static int lastVolume;
-        private static int muteVoldume;
+        private static int muteVolume;
 
         public readonly Dictionary<InputMap, int> defaultKeys = new Dictionary<InputMap, int>
         {
@@ -197,33 +197,46 @@ protected virtual bool RunnerActive
 
         public virtual int Volume(int? value = null)
         {
-            if (value.HasValue) lastVolume = value.Value;
+            if (value.HasValue) 
+                lastVolume = value.Value;
 
             SoundEffect.MasterVolume = lastVolume / 100f;
 
+            if (_mute == true && lastVolume > 0)
+            {
+                muteVolume = lastVolume;
+            }
+
             return lastVolume;
         }
 
         public virtual bool Mute(bool? value = null)
         {
             if (value.HasValue)
-                if (_mute != value)
-                {
-                    _mute = value.Value;
+            {
+                // if (_mute != value)
+                // {
+                _mute = value.Value;
 
-                    if (_mute)
-                    {
-                        muteVoldume = lastVolume;
+                if (_mute)
+                {
+                    muteVolume = lastVolume;
 
-                        Volume(0);
-                    }
-                    else
+                    Volume(0);
+                }
+                else
+                {
+                    // Restore volume to halfway if un-muting and last  value was 0
+                    if (muteVolume < 5)
                     {
-                        Volume(muteVoldume);
+                        muteVolume = 50;
                     }
+                    Volume(muteVolume);
                 }
+                // }
+            }
 
-            return _mute;
+            return SoundEffect.MasterVolume == 0 || _mute;
         }
 
 

diff --git a/UnitTests/Tests/ColorChipTest.cs b/UnitTests/Tests/ColorChipTest.cs
@@ -199,7 +199,7 @@ public void BGDefaultValueTest()
 
             if (LoadColorChip())
             {
-                Assert.AreEqual(colorChip.backgroundColor, 1);
+                Assert.AreEqual(colorChip.backgroundColor, 0);
             }
             else
             {