gle: Emit events on main thread.

Author: freezy

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

@@ -96,6 +96,7 @@ public void OnInit(Player player, TableApi tableApi, BallManager ballManager)
 		public void Switch(string id, bool isClosed)
 		{
 			if (_switchIds.ContainsKey(id)) {
+				Logger.Info($"--> switch {id} ({_switchIds[id]}): {isClosed}");
 				_api.Switch(_switchIds[id].ToString(), isClosed);
 			} else {
 				Logger.Error("Unmapped MPF switch " + id);
@@ -113,7 +114,8 @@ public void GetMachineDescription()
 		private void OnEnableCoil(object sender, EnableCoilRequest e)
 		{
 			if (_coilNames.ContainsKey(e.CoilNumber)) {
-				OnCoilChanged?.Invoke(this, new CoilEventArgs(_coilNames[e.CoilNumber], true));
+				Logger.Info($"<-- coil {e.CoilNumber} ({_coilNames[e.CoilNumber]}): true");
+				_player.Queue(() => OnCoilChanged?.Invoke(this, new CoilEventArgs(_coilNames[e.CoilNumber], true)));
 			} else {
 				Logger.Error("Unmapped MPF coil " + e.CoilNumber);
 			}
@@ -122,7 +124,8 @@ private void OnEnableCoil(object sender, EnableCoilRequest e)
 		private void OnDisableCoil(object sender, DisableCoilRequest e)
 		{
 			if (_coilNames.ContainsKey(e.CoilNumber)) {
-				OnCoilChanged?.Invoke(this, new CoilEventArgs(_coilNames[e.CoilNumber], false));
+				Logger.Info($"<-- coil {e.CoilNumber} ({_coilNames[e.CoilNumber]}): false");
+				_player.Queue(() => OnCoilChanged?.Invoke(this, new CoilEventArgs(_coilNames[e.CoilNumber], false)));
 			} else {
 				Logger.Error("Unmapped MPF coil " + e.CoilNumber);
 			}
@@ -131,16 +134,22 @@ private void OnDisableCoil(object sender, DisableCoilRequest e)
 		private void OnPulseCoil(object sender, PulseCoilRequest e)
 		{
 			if (_coilNames.ContainsKey(e.CoilNumber)) {
-				OnCoilChanged?.Invoke(this, new CoilEventArgs(_coilNames[e.CoilNumber], true));
-				_player.ScheduleAction((int)e.PulseMs, () => OnCoilChanged?.Invoke(this, new CoilEventArgs(_coilNames[e.CoilNumber], false)));
+				var coilId = _coilNames[e.CoilNumber];
+				_player.ScheduleAction(e.PulseMs * 10, () => {
+					Logger.Info($"<-- coil {coilId} ({e.CoilNumber}): false (pulse)");
+					OnCoilChanged?.Invoke(this, new CoilEventArgs(coilId, false));
+				});
+				Logger.Info($"<-- coil {e.CoilNumber} ({coilId}): true (pulse {e.PulseMs}ms)");
+				_player.Queue(() => OnCoilChanged?.Invoke(this, new CoilEventArgs(coilId, true)));
+
 			} else {
 				Logger.Error("Unmapped MPF coil " + e.CoilNumber);
 			}
 		}
 
 		private void OnFadeLight(object sender, FadeLightRequest e)
 		{
-			Logger.Info("FADING SOME LIGHTS");
+			_player.Queue(() => Logger.Error("TODO: FADE LIGHTS."));
 		}
 
 		private void OnConfigureHardwareRule(object sender, ConfigureHardwareRuleRequest e)
@@ -154,8 +163,8 @@ private void OnConfigureHardwareRule(object sender, ConfigureHardwareRuleRequest
 				return;
 			}
 
-			_player.AddDynamicWire(_switchNames[e.SwitchNumber], _coilNames[e.CoilNumber]);
-			Logger.Info($"Added new hardware rule: {_switchNames[e.SwitchNumber]} -> {_coilNames[e.CoilNumber]}.");
+			_player.Queue(() => _player.AddDynamicWire(_switchNames[e.SwitchNumber], _coilNames[e.CoilNumber]));
+			Logger.Info($"<-- new hardware rule: {_switchNames[e.SwitchNumber]} -> {_coilNames[e.CoilNumber]}.");
 		}
 
 		private void OnRemoveHardwareRule(object sender, RemoveHardwareRuleRequest e)
@@ -169,13 +178,18 @@ private void OnRemoveHardwareRule(object sender, RemoveHardwareRuleRequest e)
 				return;
 			}
 
-			_player.RemoveDynamicWire(_switchNames[e.SwitchNumber], _coilNames[e.CoilNumber]);
-			Logger.Info($"Removed hardware rule: {_switchNames[e.SwitchNumber]} -> {_coilNames[e.CoilNumber]}.");
+			_player.Queue(() => _player.RemoveDynamicWire(_switchNames[e.SwitchNumber], _coilNames[e.CoilNumber]));
+			Logger.Info($"<-- remove hardware rule: {_switchNames[e.SwitchNumber]} -> {_coilNames[e.CoilNumber]}.");
 		}
 
 		private void OnDestroy()
 		{
 			_api.Client.OnEnableCoil -= OnEnableCoil;
+			_api.Client.OnDisableCoil -= OnDisableCoil;
+			_api.Client.OnPulseCoil -= OnPulseCoil;
+			_api.Client.OnConfigureHardwareRule -= OnConfigureHardwareRule;
+			_api.Client.OnRemoveHardwareRule -= OnRemoveHardwareRule;
+			_api.Client.OnFadeLight -= OnFadeLight;
 			_api.Dispose();
 		}
 	}

VisualPinball.Engine.Mpf/MpfClient.cs

@@ -75,7 +75,6 @@ private async void ReceiveCommands()
 			Logger.Info("Client started, retrieving commands...");
 			while (await _commandStream.ResponseStream.MoveNext()) {
 				var commands = _commandStream.ResponseStream.Current;
-				Logger.Info($"New command: {commands.CommandCase}");
 				switch (commands.CommandCase) {
 					case Commands.CommandOneofCase.None:
 						break;