Matthias Blankertz
b39262dd91
When the device is in 'tagstartstop' tag mode, and the user presents a new tag to get the serial number and create a playlist using the web UI, the playerapp still remembered the tag as the currently playing tag even though no playlist was found and no playback is running. After the user saves the playlist in the UI and puts the tag on the device again, they expect the playback to start with the new playlist. Instead, nothing happens, because this is counted as the 'stop' event of the tagstartstop mode. The user would have to remove the tag and present it again (after waiting for the tagtimeout) to play the new playlist. Fix this unexpected behaviour by not storing the current tag into the playing_tag field if no playlist existed for the tag. Signed-off-by: Matthias Blankertz <matthias@blankertz.org>
211 lines
7.6 KiB
Python
211 lines
7.6 KiB
Python
# SPDX-License-Identifier: MIT
|
|
# Copyright (c) 2025 Matthias Blankertz <matthias@blankertz.org>
|
|
|
|
from collections import namedtuple
|
|
import time
|
|
from utils import TimerManager
|
|
|
|
|
|
Dependencies = namedtuple('Dependencies', ('mp3player', 'nfcreader', 'buttons', 'playlistdb', 'hwconfig', 'leds',
|
|
'config'))
|
|
|
|
# Should be ~ 3dB steps
|
|
VOLUME_CURVE = [1, 2, 3, 4, 6, 8, 11, 16, 23, 32, 45, 64, 91, 128, 181, 255]
|
|
|
|
|
|
class PlayerApp:
|
|
class TagStateMachine:
|
|
def __init__(self, parent, timer_manager, timeout=5000):
|
|
self.parent = parent
|
|
self.timer_manager = timer_manager
|
|
self.current_tag = None
|
|
self.current_tag_time = time.ticks_ms()
|
|
self.timeout = timeout
|
|
|
|
def onTagChange(self, new_tag):
|
|
if new_tag is not None:
|
|
self.timer_manager.cancel(self.onTagRemoveDelay)
|
|
if new_tag == self.current_tag:
|
|
return
|
|
# Change playlist on new tag
|
|
if new_tag is not None:
|
|
self.current_tag_time = time.ticks_ms()
|
|
self.current_tag = new_tag
|
|
self.parent.onNewTag(new_tag)
|
|
else:
|
|
self.timer_manager.schedule(time.ticks_ms() + self.timeout, self.onTagRemoveDelay)
|
|
|
|
def onTagRemoveDelay(self):
|
|
if self.current_tag is not None:
|
|
self.current_tag = None
|
|
self.parent.onTagRemoved()
|
|
|
|
def __init__(self, deps: Dependencies):
|
|
self.timer_manager = TimerManager()
|
|
self.config = deps.config(self)
|
|
self.tag_timeout_ms = self.config.get_tag_timeout() * 1000
|
|
self.idle_timeout_ms = self.config.get_idle_timeout() * 1000
|
|
self.tag_state_machine = self.TagStateMachine(self, self.timer_manager, self.tag_timeout_ms)
|
|
self.player = deps.mp3player(self)
|
|
self.nfc = deps.nfcreader(self.tag_state_machine)
|
|
self.playlist_db = deps.playlistdb(self)
|
|
self.hwconfig = deps.hwconfig(self)
|
|
self.leds = deps.leds(self)
|
|
self.tag_mode = self.config.get_tagmode()
|
|
self.volume_max = self.config.get_volume_max()
|
|
self.volume_pos = 3 # fallback if config.get_volume_boot is nonsense
|
|
try:
|
|
for idx, val in enumerate(VOLUME_CURVE):
|
|
if val >= self.config.get_volume_boot():
|
|
self.volume_pos = idx
|
|
break
|
|
except (TypeError, ValueError):
|
|
pass
|
|
self.playing_tag = None
|
|
self.playlist = None
|
|
self.buttons = deps.buttons(self) if deps.buttons is not None else None
|
|
self.mp3file = None
|
|
self.paused = False
|
|
self.playing = False
|
|
self.player.set_volume(VOLUME_CURVE[self.volume_pos])
|
|
self._onIdle()
|
|
|
|
def __del__(self):
|
|
if self.mp3file is not None:
|
|
self.mp3file.close()
|
|
self.mp3file = None
|
|
|
|
def onNewTag(self, new_tag):
|
|
"""
|
|
Callback (typically called by TagStateMachine) to signal that a new tag has been presented.
|
|
"""
|
|
uid_str = b''.join('{:02x}'.format(x).encode() for x in new_tag)
|
|
if self.tag_mode == 'tagremains' or (self.tag_mode == 'tagstartstop' and new_tag != self.playing_tag):
|
|
self._set_playlist(uid_str)
|
|
self.playing_tag = new_tag if self.playlist is not None else None
|
|
elif self.tag_mode == 'tagstartstop':
|
|
print('Tag presented again, stopping playback')
|
|
self._unset_playlist()
|
|
self.playing_tag = None
|
|
|
|
def onTagRemoved(self):
|
|
"""
|
|
Callback (typically called by TagStateMachine) to signal that a tag has been removed.
|
|
"""
|
|
if self.tag_mode == 'tagremains':
|
|
print('Tag gone, stopping playback')
|
|
self._unset_playlist()
|
|
|
|
def onButtonPressed(self, what):
|
|
assert self.buttons is not None
|
|
if what == self.buttons.VOLUP:
|
|
new_volume = min(self.volume_pos + 1, len(VOLUME_CURVE) - 1)
|
|
if VOLUME_CURVE[new_volume] <= self.volume_max:
|
|
self.volume_pos = new_volume
|
|
self.player.set_volume(VOLUME_CURVE[self.volume_pos])
|
|
elif what == self.buttons.VOLDOWN:
|
|
self.volume_pos = max(self.volume_pos - 1, 0)
|
|
self.player.set_volume(VOLUME_CURVE[self.volume_pos])
|
|
elif what == self.buttons.NEXT:
|
|
self._play_next()
|
|
elif what == self.buttons.PREV:
|
|
self._play_prev()
|
|
elif what == self.buttons.PLAY_PAUSE:
|
|
self._pause_toggle()
|
|
|
|
def onPlaybackDone(self):
|
|
self._play_next()
|
|
|
|
def onIdleTimeout(self):
|
|
if self.hwconfig.get_on_battery():
|
|
self.hwconfig.power_off()
|
|
else:
|
|
# Check again in a minute
|
|
self.timer_manager.schedule(time.ticks_ms() + self.idle_timeout_ms, self.onIdleTimeout)
|
|
|
|
def reset_idle_timeout(self):
|
|
if not self.playing:
|
|
self.timer_manager.schedule(time.ticks_ms() + self.idle_timeout_ms, self.onIdleTimeout)
|
|
|
|
def is_playing(self) -> bool:
|
|
return self.playing
|
|
|
|
def _set_playlist(self, tag: bytes):
|
|
if self.playlist is not None:
|
|
pos = self.player.stop()
|
|
if pos is not None:
|
|
self.playlist.setPlaybackOffset(pos)
|
|
self.playlist = self.playlist_db.getPlaylistForTag(tag)
|
|
self._play(self.playlist.getCurrentPath() if self.playlist is not None else None,
|
|
self.playlist.getPlaybackOffset() if self.playlist is not None else 0)
|
|
|
|
def _unset_playlist(self):
|
|
if self.playlist is not None:
|
|
pos = self.player.stop()
|
|
self._onIdle()
|
|
if pos is not None:
|
|
self.playlist.setPlaybackOffset(pos)
|
|
self.playlist = None
|
|
|
|
def _play_next(self):
|
|
filename = self.playlist.getNextPath() if self.playlist is not None else None
|
|
self._play(filename)
|
|
if filename is None:
|
|
self.playlist = None
|
|
self.playing_tag = None
|
|
|
|
def _play_prev(self):
|
|
if self.playlist is None:
|
|
return
|
|
filename = self.playlist.getPrevPath()
|
|
self._play(filename)
|
|
if filename is None:
|
|
self.playlist = None
|
|
self.playing_tag = None
|
|
|
|
def _play(self, filename: bytes | None, offset=0):
|
|
if self.mp3file is not None:
|
|
self.player.stop()
|
|
self.mp3file.close()
|
|
self.mp3file = None
|
|
self._onIdle()
|
|
if filename is not None:
|
|
print(f'Playing {filename!r}')
|
|
try:
|
|
self.mp3file = open(filename, 'rb')
|
|
except OSError as ex:
|
|
print(f"Could not play file {filename}: {ex}")
|
|
return
|
|
self.player.play(self.mp3file, offset)
|
|
self.paused = False
|
|
self._onActive()
|
|
|
|
def _pause_toggle(self):
|
|
if self.playlist is None:
|
|
return
|
|
if self.paused:
|
|
self._play(self.playlist.getCurrentPath(), self.pause_offset)
|
|
else:
|
|
self.pause_offset = self.player.stop()
|
|
self.paused = True
|
|
self._onIdle()
|
|
|
|
def _onIdle(self):
|
|
self.timer_manager.schedule(time.ticks_ms() + self.idle_timeout_ms, self.onIdleTimeout)
|
|
self.leds.set_state(self.leds.IDLE)
|
|
self.playing = False
|
|
|
|
def _onActive(self):
|
|
self.timer_manager.cancel(self.onIdleTimeout)
|
|
self.leds.set_state(self.leds.PLAYING)
|
|
self.playing = True
|
|
|
|
def get_nfc(self):
|
|
return self.nfc
|
|
|
|
def get_playlist_db(self):
|
|
return self.playlist_db
|
|
|
|
def get_leds(self):
|
|
return self.leds
|