From 83402f3a1f195de497fc9a41d19c0d0a3a0027ba Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Fri, 1 Aug 2025 12:30:18 -0400 Subject: [PATCH] Update JEPlayer for adafruit_progressbar changes; fix background.bmp --- CircuitPython_JEplayer_mp3/code.py | 15 +++++++++------ .../rsrc/background.bmp | Bin 18502 -> 27786 bytes 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/CircuitPython_JEplayer_mp3/code.py b/CircuitPython_JEplayer_mp3/code.py index d2b58cbc5..67992e192 100644 --- a/CircuitPython_JEplayer_mp3/code.py +++ b/CircuitPython_JEplayer_mp3/code.py @@ -38,7 +38,7 @@ import time import adafruit_bitmap_font.bitmap_font import adafruit_display_text.label -from adafruit_progressbar import ProgressBar +from adafruit_progressbar.horizontalprogressbar import HorizontalProgressBar import sdcardio import analogjoy import audioio @@ -75,9 +75,12 @@ class PlaybackDisplay: def __init__(self): self.group = displayio.Group() self.glyph_width, self.glyph_height = font.get_bounding_box()[:2] - self.pbar = ProgressBar(0, 0, board.DISPLAY.width, - self.glyph_height*2, bar_color=0x0000ff, - outline_color=0x333333, stroke=1) + self.pbar = HorizontalProgressBar((0, 0), + (board.DISPLAY.width, self.glyph_height*2), + min_value = 0.0, max_value = 1.0, + bar_color=0x0000ff, + outline_color=0x333333, + fill_color=0x000000) self.iconbar = icons.IconBar() self.iconbar.group.y = 1000 for i in range(5, 8): @@ -115,11 +118,11 @@ class PlaybackDisplay: @property def progress(self): """The fraction of progress through the current track""" - return self.pbar.progress + return self.pbar.value @progress.setter def progress(self, frac): - self.pbar.progress = frac + self.pbar.value = frac def set_bitmap(self, candidates): """Find and use a background from among candidates, or else the fallback bitmap""" diff --git a/CircuitPython_JEplayer_mp3/rsrc/background.bmp b/CircuitPython_JEplayer_mp3/rsrc/background.bmp index 8922329a4dcb89ad8fbd7101a4d25892a8d9fc39..f0e9b0ccedb47250662734d1c1b7aee22c0d3e03 100644 GIT binary patch literal 27786 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 literal 18502 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 QKO=8%?*E_ZZE)a!0m+HAJOBUy