spawner: Make command line options configurable.

Author: freezy

VisualPinball.Engine.Mpf.Test/Program.cs

@@ -38,7 +38,7 @@ public static async Task Main(string[] args)
 			var s = Stopwatch.StartNew();
 			var mpfApi = new MpfApi(machineFolder);
 
-			mpfApi.Launch();
+			mpfApi.Launch(new MpfConsoleOptions { ShowLogInsteadOfConsole = false });
 
 			mpfApi.StartGame(new Dictionary<string, bool> {
 				{"sw_11", false},
@@ -60,9 +60,6 @@ public static async Task Main(string[] args)
 			};
 			mpfApi.Client.OnFadeLight += (_, request) => {
 				Console.WriteLine($"[MPF] light fades ({request.CommonFadeMs}ms):");
-				foreach (var fade in request.Fades.ToList()) {
-					Console.WriteLine($"  l{fade.LightNumber} @{fade.TargetBrightness}");
-				}
 			};
 
 			var descr = mpfApi.GetMachineDescription();
@@ -76,7 +73,7 @@ public static async Task Main(string[] args)
 						await mpfApi.Switch("0", true);
 						break;
 					case ConsoleKey.S:
-						await mpfApi.Switch("1", false);
+						await mpfApi.Switch("0", false);
 						break;
 				}
 			} while (key.Key != ConsoleKey.Escape);

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

@@ -68,7 +68,11 @@ public void OnInit(Player player, TableApi tableApi, BallManager ballManager)
 				_coilNames[coil.InternalId.ToString()] = coil.Id;
 			}
 			_api = new MpfApi(machineFolder);
-			_api.Launch();
+			_api.Launch(new MpfConsoleOptions {
+				ShowLogInsteadOfConsole = false,
+				VerboseLogging = true,
+				UseMediaController = false,
+			});
 
 			_api.Client.OnEnableCoil += OnEnableCoil;
 			_api.Client.OnDisableCoil += OnDisableCoil;

VisualPinball.Engine.Mpf/MpfApi.cs

@@ -31,7 +31,7 @@ public static MachineDescription GetMachineDescription(string machineFolder)
 		{
 			var client = new MpfClient();
 			var spawner = new MpfSpawner(machineFolder);
-			spawner.Spawn();
+			spawner.Spawn(new MpfConsoleOptions());
 			client.Connect("localhost:50051");
 			client.StartGame(new Dictionary<string, bool>(), false);
 			var description = client.GetMachineDescription();
@@ -42,11 +42,12 @@ public static MachineDescription GetMachineDescription(string machineFolder)
 		/// <summary>
 		/// Launches MPF in the background and connects to it via gRPC.
 		/// </summary>
+		/// <param name="options">MPF options</param>
 		/// <param name="port">gRPC port to use for MPC/VPE communication</param>
 		/// <returns></returns>
-		public void Launch(int port = 50051)
+		public void Launch(MpfConsoleOptions options, int port = 50051)
 		{
-			_spawner.Spawn();
+			_spawner.Spawn(options);
 			Client.Connect($"localhost:{port}");
 		}
 

VisualPinball.Engine.Mpf/MpfSpawner.cs

@@ -31,7 +31,7 @@ public MpfSpawner(string machineFolder)
 			_machineFolder = Path.GetFileName(machineFolder);
 		}
 
-		public void Spawn()
+		public void Spawn(MpfConsoleOptions options)
 		{
 			var mpfExe = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "mpf.exe" : "mpf";
 			var mpfExePath = GetFullPath(mpfExe);
@@ -41,28 +41,36 @@ public void Spawn()
 
 			_thread = new Thread(() => {
 				Thread.CurrentThread.IsBackground = true;
-				RunMpf(mpfExePath);
+				RunMpf(mpfExePath, options);
 			});
 
 			_thread.Start();
 			_ready.Wait();
 		}
 
-		private void RunMpf(string mpfExePath)
+		private void RunMpf(string mpfExePath, MpfConsoleOptions options)
 		{
+			var args = $"\"{_machineFolder}\"";
+			if (!options.UseMediaController) {
+				args += " -b";
+			}
+			if (options.ShowLogInsteadOfConsole) {
+				args += " -t";
+			}
+			if (options.VerboseLogging) {
+				args += " -v -V";
+			}
 			var info = new ProcessStartInfo {
 				FileName = mpfExePath,
 				WorkingDirectory = _pwd,
-				Arguments = $"\"{_machineFolder}\" -t -v -V -b",
-				UseShellExecute = false,
-				RedirectStandardOutput = true,
+				Arguments = args,
+				UseShellExecute = true,
+				RedirectStandardOutput = false,
+
 			};
 
-			using (var process = Process.Start(info))
-			using (var reader = process.StandardOutput) {
+			using (var process = Process.Start(info)) {
 				_ready.Release();
-				var result = reader.ReadToEnd();
-				Console.Write(result);
 				process.WaitForExit();
 			}
 		}
@@ -90,4 +98,16 @@ private static string GetFullPath(string fileName)
 			return null;
 		}
 	}
+
+	/// <summary>
+	/// A few things we can configure when launching MPF
+	/// <seealso cref="https://docs.missionpinball.org/en/latest/running/commands/game.html">Documentation</seealso>
+	///
+	/// </summary>
+	public class MpfConsoleOptions
+	{
+		public bool UseMediaController;
+		public bool ShowLogInsteadOfConsole;
+		public bool VerboseLogging = true;
+	}
 }