diff --git a/modules/active_modifier.py b/modules/active_modifier.py index 0e11ff1..3173bad 100644 --- a/modules/active_modifier.py +++ b/modules/active_modifier.py @@ -3,7 +3,7 @@ class ActiveModifier: This changes the next song to be played live, which means that this picks the next song, not the playlist, but this is affected by the playlist """ """Tuple consists of the track path, to fade out, fade in, official, and args""" - def play(self, index: int, track: tuple[str, bool, bool, bool, dict[str, str]]): return track + def play(self, index: int, track: tuple[str, bool, bool, bool, dict[str, str]]): return track, False def on_new_playlist(self, playlist: list[tuple[str, bool, bool, bool, dict[str, str]]]): pass import os, log95 @@ -39,9 +39,9 @@ class Module(ActiveModifier): logger.info(f"Playing {song} instead, as instructed by toplay") - return song, last_track_to_fade_out, next_track_to_fade_in, True, {} + return (song, last_track_to_fade_out, next_track_to_fade_in, True, {}), True elif len(self.originals): - return self.originals.pop(0) + return self.originals.pop(0), False return track activemod = Module() \ No newline at end of file diff --git a/radioPlayer.py b/radioPlayer.py index 55b4f1e..c3a9d5c 100644 --- a/radioPlayer.py +++ b/radioPlayer.py @@ -35,7 +35,7 @@ class ActiveModifier: """ This changes the next song to be played live, which means that this picks the next song, not the playlist, but this is affected by the playlist """ - def play(self, index:int, track: tuple[str, bool, bool, bool, dict[str, str]]): return track + def play(self, index:int, track: tuple[str, bool, bool, bool, dict[str, str]]): return track, False def on_new_playlist(self, playlist: list[tuple[str, bool, bool, bool, dict[str, str]]]): pass simple_modules: list[PlayerModule] = [] @@ -229,9 +229,9 @@ def play_playlist(playlist_path): track_tuple = playlist[i] if active_modifier: - track_tuple = active_modifier.play(i, track_tuple) + track_tuple, to_max = active_modifier.play(i, track_tuple) modified = True - max_iterator += 1 + if to_max: max_iterator += 1 else: modified = False track, to_fade_in, to_fade_out, official, args = track_tuple