From 336ee67aa4b6c467d3d936124db16ce7dcd5a3b3 Mon Sep 17 00:00:00 2001 From: Eddy Pedroni Date: Sat, 22 Feb 2025 10:44:50 +0100 Subject: Simplify session management --- solo-tool-project/src/solo_tool/solo_tool.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'solo-tool-project/src/solo_tool/solo_tool.py') diff --git a/solo-tool-project/src/solo_tool/solo_tool.py b/solo-tool-project/src/solo_tool/solo_tool.py index 47e31ca..743c8d5 100644 --- a/solo-tool-project/src/solo_tool/solo_tool.py +++ b/solo-tool-project/src/solo_tool/solo_tool.py @@ -2,7 +2,7 @@ import os from .playlist import Playlist from .abcontroller import ABController -from .session_manager import SessionManager +from .session_manager import loadSession, saveSession from .notifier import Notifier from .player_vlc import Player @@ -11,7 +11,6 @@ class SoloTool: self._player = Player() if playerOverride is None else playerOverride self._playlist = Playlist(self._playlistCallback) self._abController = ABController(enabled=False, callback=self._abControllerCallback) - self._sessionManager = SessionManager(self._playlist, self._abController) self._notifier = Notifier(self._player) def _playlistCallback(self, path): @@ -31,7 +30,7 @@ class SoloTool: def addSong(self, path: str) -> None: if os.path.isfile(path): - self._sessionManager.addSong(path) + self._playlist.addSong(path) @property def song(self) -> int: @@ -96,11 +95,11 @@ class SoloTool: def loadSession(self, path): with open(path, "r") as f: - self._sessionManager.loadSession(f) + loadSession(f, self._playlist, self._abController) def saveSession(self, path): with open(path, "w") as f: - self._sessionManager.saveSession(f) + saveSession(f, self._playlist, self._abController) def play(self): self._player.play() -- cgit v1.2.3