deps: bump pinmame-dotnet. Add disable audio

Author: jsm174

VisualPinball.Engine.PinMAME.Unity/Editor/PinMameGamelogicEngineInspector.cs

@@ -48,7 +48,11 @@ public class PinMameGamelogicEngineInspector : UnityEditor.Editor
 		private bool _toggleStartup = true;
 
 		private SerializedProperty _disableMechsProperty;
-		private SerializedProperty _solenoidDelayProperty;
+		private SerializedProperty _solenoidDelayProperty;
+
+		private bool _toggleDebug = true;
+
+		private SerializedProperty _disableAudioProperty;
 
 		private void OnEnable()
 		{
@@ -91,6 +95,7 @@ private void OnEnable()
 
 			_solenoidDelayProperty = serializedObject.FindProperty(nameof(_gle.SolenoidDelay));
 			_disableMechsProperty = serializedObject.FindProperty(nameof(_gle.DisableMechs));
+			_disableAudioProperty = serializedObject.FindProperty(nameof(_gle.DisableAudio));
 		}
 
 		public override void OnInspectorGUI()
@@ -159,11 +164,31 @@ public override void OnInspectorGUI()
 				if (EditorGUI.EndChangeCheck())
 				{
 					serializedObject.ApplyModifiedProperties();
-				}
+				}
 
 				EditorGUI.indentLevel--;
 			}
 
+			EditorGUILayout.EndFoldoutHeaderGroup();
+
+			if (_toggleDebug = EditorGUILayout.BeginFoldoutHeaderGroup(_toggleStartup, "Debug"))
+			{
+				EditorGUI.indentLevel++;
+
+				EditorGUI.BeginChangeCheck();
+
+				EditorGUILayout.PropertyField(_disableAudioProperty, new GUIContent("Disable Audio"));
+
+				if (EditorGUI.EndChangeCheck())
+				{
+					serializedObject.ApplyModifiedProperties();
+				}
+
+				EditorGUI.indentLevel--;
+			}
+
+			EditorGUILayout.EndFoldoutHeaderGroup();
+
 			GUILayout.EndVertical();
 
 			EditorGUILayout.Space();

VisualPinball.Engine.PinMAME.Unity/Runtime/PinMameGamelogicEngine.cs

@@ -52,8 +52,11 @@ public class PinMameGamelogicEngine : MonoBehaviour, IGamelogicEngine
 
 		[Min(0f)]
 		[Tooltip("Delay after startup to listen for solenoid events.")]
-		public float SolenoidDelay = 0;
-	
+		public float SolenoidDelay = 0;
+
+		[Tooltip("Disable audio")]
+		public bool DisableAudio = false;
+
 		public GamelogicEngineSwitch[] AvailableSwitches {
 			get {
 				UpdateCaches();
@@ -138,14 +141,18 @@ public void OnInit(Player player, TableApi tableApi, BallManager ballManager)
 			_pinMame = PinMame.PinMame.Instance(AudioSettings.outputSampleRate);
 
 			_pinMame.SetHandleKeyboard(false);
-			_pinMame.SetHandleMechanics(false);
+			_pinMame.SetHandleMechanics(DisableMechs ? 0 : 1);
 
 			_pinMame.OnGameStarted += OnGameStarted;
 			_pinMame.OnGameEnded += OnGameEnded;
 			_pinMame.OnDisplayAvailable += OnDisplayAvailable;
 			_pinMame.OnDisplayUpdated += OnDisplayUpdated;
-			_pinMame.OnAudioAvailable += OnAudioAvailable;
-			_pinMame.OnAudioUpdated += OnAudioUpdated;
+
+			if (!DisableAudio) {
+				_pinMame.OnAudioAvailable += OnAudioAvailable;
+				_pinMame.OnAudioUpdated += OnAudioUpdated;
+			}
+
 			_pinMame.OnMechAvailable += OnMechAvailable;
 			_pinMame.OnMechUpdated += OnMechUpdated;
 			_pinMame.OnSolenoidUpdated += OnSolenoidUpdated;
@@ -166,16 +173,6 @@ private void OnGameStarted()
 			Logger.Info($"[PinMAME] Game started.");
 			_isRunning = true;
 
-			if (DisableMechs)
-			{
-				for (int id = 0; id < 10; id++)
-				{
-					Logger.Info($"Disabling mech {id}");
-
-					_pinMame.SetMech(id, null);
-				}
-			}
-
 			SendInitialSwitches();
 
 			_solenoidDelayStart = DateTimeOffset.Now.ToUnixTimeMilliseconds();
@@ -498,9 +495,14 @@ public void StopGame()
 				_pinMame.OnGameStarted -= OnGameStarted;
 				_pinMame.OnGameEnded -= OnGameEnded;
 				_pinMame.OnDisplayAvailable -= OnDisplayAvailable;
-				_pinMame.OnDisplayUpdated -= OnDisplayUpdated;
-				_pinMame.OnAudioAvailable -= OnAudioAvailable;
-				_pinMame.OnAudioUpdated -= OnAudioUpdated;
+				_pinMame.OnDisplayUpdated -= OnDisplayUpdated;
+
+				if (!DisableAudio)
+				{
+					_pinMame.OnAudioAvailable -= OnAudioAvailable;
+					_pinMame.OnAudioUpdated -= OnAudioUpdated;
+				}
+
 				_pinMame.OnMechAvailable -= OnMechAvailable;
 				_pinMame.OnMechUpdated -= OnMechUpdated;
 				_pinMame.OnSolenoidUpdated -= OnSolenoidUpdated;

VisualPinball.Engine.PinMAME/VisualPinball.Engine.PinMAME.csproj

@@ -16,8 +16,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="PinMame" Version="0.1.0-preview.43" />
-    <PackageReference Include="PinMame.Native" Version="3.4.0-preview.303" />
+    <PackageReference Include="PinMame" Version="0.1.0-preview.44" />
+    <PackageReference Include="PinMame.Native" Version="3.4.0-preview.307" />
     <PackageReference Include="VisualPinball.Engine" Version="0.0.1-preview.70" />
   </ItemGroup>