Move phazor init to Tauon to avoid None case

C0rn3j · Mar 3, 2025 · f796666 · f796666
1 parent 4eb719c
commit f796666
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/tauon/t_modules/t_main.py b/src/tauon/t_modules/t_main.py
@@ -164,7 +164,7 @@
 from tauon.t_modules.t_jellyfin import Jellyfin
 from tauon.t_modules.t_launch import Launch
 from tauon.t_modules.t_lyrics import genius, lyric_sources, uses_scraping
-from tauon.t_modules.t_phazor import phazor_exists, player4, Cachement, LibreSpot
+from tauon.t_modules.t_phazor import get_phazor_path, phazor_exists, player4, Cachement, LibreSpot
 from tauon.t_modules.t_prefs import Prefs
 from tauon.t_modules.t_search import bandcamp_search
 from tauon.t_modules.t_spot import SpotCtl
@@ -5662,7 +5662,8 @@ def __init__(self, holder: Holder, bag: Bag, gui: GuiVar) -> None:
 		self.quick_close = False
 
 		self.copied_track = None
-		self.aud:                 CDLL | None = None
+		self.aud:                        CDLL = ctypes.cdll.LoadLibrary(str(get_phazor_path(self.pctl)))
+		logging.debug(f"Loaded Phazor path at: {get_phazor_path(self.pctl)}")
 		self.player4_state:               int = 0
 		self.librespot_p: Popen[bytes] | None = None
 		self.spot_ctl                         = SpotCtl(self)

diff --git a/src/tauon/t_modules/t_phazor.py b/src/tauon/t_modules/t_phazor.py
@@ -714,8 +714,7 @@ def start_librespot() -> None:
 	loaded_track = None
 	fade_time = 400
 
-	aud = ctypes.cdll.LoadLibrary(str(get_phazor_path(pctl)))
-	logging.debug("Loaded Phazor path at: " + str(get_phazor_path(pctl)))
+	aud = tauon.aud
 
 	aud.config_set_dev_name(prefs.phazor_device_selected.encode())
 
@@ -725,7 +724,6 @@ def start_librespot() -> None:
 
 	aud.feed_raw.argtypes = (ctypes.c_int,ctypes.c_char_p)
 	aud.feed_raw.restype = None
-	tauon.aud = aud
 	aud.set_volume(int(pctl.player_volume))
 
 	bins1 = (ctypes.c_float * 24)()