dmd: Fix spinup mode (needs mc enabled).

Author: freezy

VisualPinball.Engine.Mpf.Unity/Runtime/MpfGamelogicEngine.cs

@@ -57,6 +57,8 @@ public class MpfGamelogicEngine : MonoBehaviour, IGamelogicEngine
 
 		private bool _displaysAnnounced;
 
+		private readonly Queue<Action> _dispatchQueue = new Queue<Action>();
+
 		private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
 		public void OnInit(Player player, TableApi tableApi, BallManager ballManager)
@@ -79,7 +81,7 @@ public void OnInit(Player player, TableApi tableApi, BallManager ballManager)
 			_api.Launch(new MpfConsoleOptions {
 				ShowLogInsteadOfConsole = false,
 				VerboseLogging = true,
-				UseMediaController = false,
+				UseMediaController = true,
 			});
 
 			_api.Client.OnEnableCoil += OnEnableCoil;
@@ -100,6 +102,16 @@ public void OnInit(Player player, TableApi tableApi, BallManager ballManager)
 				}
 			}
 			_api.StartGame(mappedSwitchStatuses);
+			Logger.Info("Game started.");
+		}
+
+		private void Update()
+		{
+			lock (_dispatchQueue) {
+				while (_dispatchQueue.Count > 0) {
+					_dispatchQueue.Dequeue().Invoke();
+				}
+			}
 		}
 
 		public void Switch(string id, bool isClosed)
@@ -203,15 +215,25 @@ private void OnRemoveHardwareRule(object sender, RemoveHardwareRuleRequest e)
 
 		private void OnDmdFrame(object sender, SetDmdFrameRequest frame)
 		{
+			Logger.Info($"<-- dmd frame: {frame.Name}");
 			if (!_displaysAnnounced) {
 				_displaysAnnounced = true;
 				var config = _api.GetMachineDescription();
+				Logger.Info($"[MPF] Announcing {config.Dmds} display(s)");
 				foreach (var dmd in config.Dmds) {
-					OnDisplaysAvailable?.Invoke(this, new AvailableDisplays(
-						new DisplayConfig(dmd.Name, dmd.Width, dmd.Height)));
+					Logger.Info($"[MPF] Announcing display \"{dmd.Name}\" @ {dmd.Width}x{dmd.Height}");
+					lock (_dispatchQueue) {
+						_dispatchQueue.Enqueue(() => OnDisplaysAvailable?.Invoke(this,
+							new AvailableDisplays(new DisplayConfig(dmd.Name, dmd.Width, dmd.Height))));
+					}
 				}
+				Logger.Info("[MPF] Displays announced.");
+			}
+
+			lock (_dispatchQueue) {
+				_dispatchQueue.Enqueue(() => OnDisplayFrame?.Invoke(this,
+					new DisplayFrameData(frame.Name, DisplayFrameFormat.Dmd24, frame.FrameData())));
 			}
-			OnDisplayFrame?.Invoke(this, new DisplayFrameData(frame.Name, DisplayFrameFormat.Dmd8, frame.FrameData()));
 		}
 
 		private void OnDestroy()
@@ -223,6 +245,7 @@ private void OnDestroy()
 				_api.Client.OnConfigureHardwareRule -= OnConfigureHardwareRule;
 				_api.Client.OnRemoveHardwareRule -= OnRemoveHardwareRule;
 				_api.Client.OnFadeLight -= OnFadeLight;
+				_api.Client.OnDmdFrame -= OnDmdFrame;
 				_api.Dispose();
 			}
 		}

VisualPinball.Engine.Mpf/MpfSpawner.cs

@@ -14,6 +14,7 @@
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading;
+using NLog;
 
 namespace VisualPinball.Engine.Mpf
 {
@@ -24,6 +25,7 @@ internal class MpfSpawner
 		private readonly string _machineFolder;
 
 		private readonly SemaphoreSlim _ready = new SemaphoreSlim(0, 1);
+		private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
 		public MpfSpawner(string machineFolder)
 		{
@@ -51,9 +53,12 @@ public void Spawn(MpfConsoleOptions options)
 		private void RunMpf(string mpfExePath, MpfConsoleOptions options)
 		{
 			var args = $"\"{_machineFolder}\"";
-			if (!options.UseMediaController) {
+			if (options.UseMediaController) {
+				args = "both " + args;
+			} else {
 				args += " -b";
 			}
+
 			if (options.ShowLogInsteadOfConsole) {
 				args += " -t";
 			}
@@ -68,6 +73,8 @@ private void RunMpf(string mpfExePath, MpfConsoleOptions options)
 				RedirectStandardOutput = options.CatchStdOut,
 			};
 
+			Logger.Info($"[MPF] Spawning: > {mpfExePath} {args}");
+
 			using (var process = Process.Start(info)) {
 				_ready.Release();
 				if (!options.CatchStdOut) {

VisualPinball.Engine.Mpf/VisualPinball.Engine.Mpf.csproj

@@ -46,6 +46,10 @@
     <InputAssemblies Include="$(OutDir)Grpc.Core.dll" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="machine\logs" />
+  </ItemGroup>
+
   <Target Name="ILRepack" AfterTargets="Build">
     <Exec Condition="$([MSBuild]::IsOSPlatform('Windows')) == 'true'" Command="tools\ILRepack.exe /target:library /internalize $(OutDir)$(AssemblyName).dll @(InputAssemblies, ' ') /out:$(OutDir)$(AssemblyName).dll" />
     <Exec Condition="$([MSBuild]::IsOSPlatform('Windows')) != 'true'" Command="mono tools/ILRepack.exe /target:library /internalize $(OutDir)$(AssemblyName).dll @(InputAssemblies, ' ') /out:$(OutDir)$(AssemblyName).dll" />

VisualPinball.Engine.Mpf/machine/config/config.yaml

@@ -1,8 +1,40 @@
 #config_version=5
 
+displays:
+  dmd:  # source display for the DMD
+    width: 128
+    height: 32
+    default: true
+
 hardware:
   platform: visual_pinball_engine
 
+rgb_dmds:
+  default:
+    fps: 30
+
+mpf-mc:
+  fps: 30
+
+slides:
+  dmd_slide_1:  # slide we'll show on the physical DMD
+    - type: text
+      text: MISSION PINBALL
+      font_size: 30
+      color: red
+      x: 0
+      animations:
+        add_to_slide:
+          - property: x
+            value: 250
+            duration: 30
+            relative: true
+
+slide_player:
+  init_done:
+    dmd_slide_1:
+      target: dmd
+
 vpe:
   debug: True