From 9cc5f25326166509b02907797454dad9f8f6b8c1 Mon Sep 17 00:00:00 2001 From: Anthony van Winkle Date: Fri, 9 Aug 2024 15:43:50 -0700 Subject: [PATCH 1/3] Bugfix sound_player delay exiting loop and skipping sounds --- mpfmc/config_players/sound_player.py | 6 +++--- mpfmc/mcconfig.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mpfmc/config_players/sound_player.py b/mpfmc/config_players/sound_player.py index f17a2e99..f3eabd1c 100644 --- a/mpfmc/config_players/sound_player.py +++ b/mpfmc/config_players/sound_player.py @@ -94,7 +94,7 @@ def play(self, settings, context, calling_context, priority=0, **kwargs): # noq for sound_name, s in settings.items(): if self.check_delayed_play(sound_name, s, context, calling_context, priority, **kwargs): - return + continue # adjust priority try: @@ -108,7 +108,7 @@ def play(self, settings, context, calling_context, priority=0, **kwargs): # noq except KeyError: self.machine.log.error("SoundPlayer: The specified sound " "does not exist ('{}').".format(sound_name)) - return + continue s.update(kwargs) @@ -122,7 +122,7 @@ def play(self, settings, context, calling_context, priority=0, **kwargs): # noq "does not exist. Unable to perform '{}' action " "on sound '{}'." .format(s['track'], action, sound_name)) - return + continue # a block will block any other lower priority sound from being triggered by the same event # the calling_context contains the name of the triggering event diff --git a/mpfmc/mcconfig.yaml b/mpfmc/mcconfig.yaml index ecfbe06d..9d73c808 100644 --- a/mpfmc/mcconfig.yaml +++ b/mpfmc/mcconfig.yaml @@ -107,7 +107,7 @@ assets: load: mode_start images: default: - load: preload + load: on_demand preload: load: preload on_demand: From 13b7c608b0d1a85ad65bc6339a0a1da39e627619 Mon Sep 17 00:00:00 2001 From: Anthony van Winkle Date: Fri, 9 Aug 2024 15:52:10 -0700 Subject: [PATCH 2/3] Increment dev version 0.57.1 --- mpfmc/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mpfmc/_version.py b/mpfmc/_version.py index 73cf672c..bf116d30 100644 --- a/mpfmc/_version.py +++ b/mpfmc/_version.py @@ -1,6 +1,6 @@ import os -__version__ = '0.57.0' +__version__ = '0.57.1' __short_version__ = '0.57' __bcp_version__ = '1.1' __config_version__ = '6' From e35a64477ddab3e8b15dfd9d658b3c90d37720a6 Mon Sep 17 00:00:00 2001 From: Anthony van Winkle Date: Fri, 9 Aug 2024 16:05:08 -0700 Subject: [PATCH 3/3] Increment ciwheelbuild version to bypass mirror.centos.org EOL --- .github/workflows/build_wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 5995b7bb..bfb8e417 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -77,7 +77,7 @@ jobs: with: python-version: ${{ matrix.python-version }} - name: Run cibuildwheel - uses: pypa/cibuildwheel@v2.16.1 # Oct 2, 2023 + uses: pypa/cibuildwheel@v2.19.2 # Aug 9 2024 env: CIBW_BEFORE_ALL_LINUX: > # This is done here and not as its own step as this runs inside the cibw containered environment yum install -y SDL2.x86_64 SDL2-devel.x86_64 SDL2_image.x86_64 SDL2_image-devel.x86_64