Merge pull request #1824 from missionpinball/pluginplayer-template-eval

Evaluate PluginPlayer Templates prior to BCP

Author: avanwinkle

mpf/config_players/plugin_player.py

@@ -1,5 +1,6 @@
 """Plugin config player."""
 from mpf.config_players.device_config_player import DeviceConfigPlayer
+from mpf.core.placeholder_manager import BaseTemplate, NativeTypeTemplate
 
 
 class PluginPlayer(DeviceConfigPlayer):
@@ -85,9 +86,19 @@ def play(self, settings, context, calling_context, priority=0, **kwargs):
         # this play event won't be swallowed.
         if '_from_bcp' in kwargs:
             del kwargs['_from_bcp']
+        # If any templates need evaluating, do so *before* sending via BCP
+        eval_settings = {}
+        for s, settings_dict in settings.items():
+            for key, value in settings_dict.items():
+                if isinstance(value, (BaseTemplate, NativeTypeTemplate)):
+                    if s not in eval_settings:
+                        eval_settings[s] = settings_dict.copy()
+                    eval_settings[s][key] = value.evaluate(kwargs)
+
         self.machine.bcp.interface.bcp_trigger(
             name='{}_play'.format(self.show_section),
-            settings=settings, context=context, calling_context=calling_context,
+            settings={**settings, **eval_settings},
+            context=context, calling_context=calling_context,
             priority=priority, **kwargs)
 
     def clear_context(self, context):

mpf/config_spec.yaml

@@ -1699,7 +1699,7 @@ sound_player:
     pan: single|float_or_token|None
     loops: single|int_or_token|None
     priority: single|int_or_token|None
-    start_at: single|secs|None
+    start_at: single|template_secs|None
     fade_in: single|secs|None
     fade_out: single|secs|None
     about_to_finish_time: single|secs|-1

mpf/modes/attract/code/attract.py

@@ -2,6 +2,7 @@
 
 from mpf.modes.carousel.code.carousel import Carousel
 
+
 class Attract(Carousel):
 
     """Default mode running in a machine when a game is not in progress.