radio95/RadioPlayer
0
1
Fork 0
mirror of https://github.com/radio95-rnt/RadioPlayer.git synced 2026-02-26 21:53:54 +01:00
Code Issues Activity

better logic?

Browse Source
This commit is contained in:
KubaPro010
2025-11-17 16:18:00 +01:00
parent e0e7071a3d
commit 929acecf16
1 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
radioPlayer.py
View File

@@ -230,6 +230,10 @@ class RadioPlayer:
max_iterator = len(playlist) max_iterator = len(playlist)
song_i = i = 0 song_i = i = 0
track = None
next_track = None
extend = None
while i < max_iterator: while i < max_iterator:
if self.exit_pending: if self.exit_pending:
self.logger.info("Quit received, waiting for song end.") self.logger.info("Quit received, waiting for song end.")
@@ -244,15 +248,16 @@ class RadioPlayer:
return_pending = True return_pending = True
continue continue
track = playlist[song_i % len(playlist)] if not track:
next_track = playlist[song_i + 1] if song_i + 1 < len(playlist) else None track = playlist[song_i % len(playlist)]
if self.active_modifier: next_track = playlist[song_i + 1] if song_i + 1 < len(playlist) else None
(track, next_track), extend = self.active_modifier.play(song_i, track, next_track) if self.active_modifier:
if track is None: (track, next_track), extend = self.active_modifier.play(song_i, track, next_track)
song_i += 1 if track is None:
continue song_i += 1
if extend: max_iterator += 1 continue
else: extend = False if extend: max_iterator += 1
else: extend = False
prefetch(track.path) prefetch(track.path)
self.logger.info(f"Now playing: {track.path.name}") self.logger.info(f"Now playing: {track.path.name}")
@@ -270,10 +275,20 @@ class RadioPlayer:
remaining_until_end = end_time - time.monotonic() remaining_until_end = end_time - time.monotonic()
if elapsed < 1 and remaining_until_end > 0: time.sleep(min(1 - elapsed, remaining_until_end)) if elapsed < 1 and remaining_until_end > 0: time.sleep(min(1 - elapsed, remaining_until_end))
if next_track: prefetch(next_track.path)
i += 1 i += 1
if not extend: song_i += 1 if not extend: song_i += 1
track = playlist[song_i % len(playlist)]
next_track = playlist[song_i + 1] if song_i + 1 < len(playlist) else None
if self.active_modifier:
(track, next_track), extend = self.active_modifier.play(song_i, track, next_track)
if track is None:
song_i += 1
continue
if extend: max_iterator += 1
else: extend = False
if track: prefetch(track.path)
def loop(self): def loop(self):
self.logger.info("Starting playback.") self.logger.info("Starting playback.")
try: try: