From c87c63618b3c79172c505964136d138c119dd874 Mon Sep 17 00:00:00 2001
From: KubaPro010 <132459354+KubaPro010@users.noreply.github.com>
Date: Wed, 5 Nov 2025 21:25:02 +0100
Subject: [PATCH] better procman api

---
 modules/__init__.py |  2 +-
 radioPlayer.py      | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/modules/__init__.py b/modules/__init__.py
index 8eb12d9..9c35d8c 100644
--- a/modules/__init__.py
+++ b/modules/__init__.py
@@ -22,7 +22,7 @@ class Process:
 class Skeleton_ProcessManager:
     processes: list[Process]
     def _get_audio_duration(self, file_path): ...
-    def play(self, track_path: str, fade_in: bool=False, fade_out: bool=False, fade_time: int=5, offset: float=0.0) -> Process: ...
+    def play(self, track: Track, fade_time: int=5) -> Process: ...
     def anything_playing(self) -> bool: ...
     def stop_all(self, timeout: float | None = None) -> None: ...
     def wait_all(self, timeout: float | None = None) -> None: ...
diff --git a/radioPlayer.py b/radioPlayer.py
index bf685e4..f3132c2 100644
--- a/radioPlayer.py
+++ b/radioPlayer.py
@@ -36,23 +36,23 @@ class ProcessManager(Skeleton_ProcessManager):
             self.duration_cache.saveElement(file_path, result, (60*60), False, True)
             return result
         return None
-    def play(self, track_path: str, fade_in: bool=False, fade_out: bool=False, fade_time: int=5, offset: float=0.0) -> Process:
+    def play(self, track: Track, fade_time: int=5) -> Process:
         cmd = ['ffplay', '-nodisp', '-hide_banner', '-autoexit', '-loglevel', 'quiet']
 
-        duration = self._get_audio_duration(track_path)
-        if not duration: raise Exception("Failed to get file duration, does it actually exist?", track_path)
-        if offset >= duration: offset = max(duration - 0.1, 0)
-        if offset > 0: cmd.extend(['-ss', str(offset)])
+        duration = self._get_audio_duration(track.path)
+        if not duration: raise Exception("Failed to get file duration, does it actually exist?", track.path)
+        if track.offset >= duration: track.offset = max(duration - 0.1, 0)
+        if track.offset > 0: cmd.extend(['-ss', str(track.offset)])
 
         filters = []
-        if fade_in: filters.append(f"afade=t=in:st=0:d={fade_time}")
-        if fade_out: filters.append(f"afade=t=out:st={duration - fade_time - offset}:d={fade_time}")
+        if track.fade_in: filters.append(f"afade=t=in:st=0:d={fade_time}")
+        if track.fade_out: filters.append(f"afade=t=out:st={duration - fade_time - track.offset}:d={fade_time}")
         if filters: cmd.extend(['-af', ",".join(filters)])
 
-        cmd.append(track_path)
+        cmd.append(track.path)
 
         proc = Popen(cmd, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, start_new_session=True)
-        pr = Process(proc, track_path, time.monotonic(), duration - offset)
+        pr = Process(proc, track.path, time.monotonic(), duration - track.offset)
         with self.lock: self.processes.append(pr)
         return pr
     def anything_playing(self) -> bool:
@@ -195,7 +195,7 @@ def play_playlist(playlist_path, starting_index: int = 0):
 
         for module in simple_modules: module.on_new_track(song_i, track)
 
-        pr = procman.play(track_path, track.fade_in, track.fade_out, cross_fade, track.offset)
+        pr = procman.play(track, cross_fade)
 
         ttw = pr.duration
         if track.fade_out: ttw -= cross_fade