Merge pull request #1828 from 4shadoww/master

Fix Spotify search and SDL3 crash

Author: Taiko2k

src/tauon/t_modules/t_draw.py

@@ -23,7 +23,7 @@
 import logging
 import math
 import sys
-from ctypes import c_bool, c_int, c_size_t, pointer
+from ctypes import c_bool, c_float, byref, c_size_t, pointer
 from typing import TYPE_CHECKING
 
 import sdl3
@@ -111,11 +111,11 @@ def prime(self) -> None:
 		texture = sdl3.SDL_CreateTextureFromSurface(self.renderer, self.surface)
 		sdl3.SDL_DestroySurface(self.surface)
 		self.surface = None
-		tex_w = pointer(c_int(0))
-		tex_h = pointer(c_int(0))
-		sdl3.SDL_QueryTexture(texture, None, None, tex_w, tex_h)
-		self.rect.w = int(tex_w.contents.value)
-		self.rect.h = int(tex_h.contents.value)
+		tex_w = c_float(0.0)
+		tex_h = c_float(0.0)
+		sdl3.SDL_GetTextureSize(texture, byref(tex_w), byref(tex_h))
+		self.rect.w = int(tex_w.value)
+		self.rect.h = int(tex_h.value)
 		self.texture = texture
 
 	def draw(self, x: int, y: int) -> bool | None:
@@ -131,7 +131,7 @@ def draw(self, x: int, y: int) -> bool | None:
 			self.prime()
 		self.rect.x = round(x)
 		self.rect.y = round(y)
-		sdl3.SDL_RenderCopy(self.renderer, self.texture, None, self.rect)
+		sdl3.SDL_RenderTexture(self.renderer, self.texture, None, self.rect)
 
 		return True
 
@@ -842,12 +842,12 @@ def __draw_text_windows(
 		ke = sdl3.SDL_MapRGB(s_image.contents.format, bg.r, bg.g, bg.b)
 		sdl3.SDL_SetColorKey(s_image, True, ke)
 		c = sdl3.SDL_CreateTextureFromSurface(self.renderer, s_image)
-		tex_w = pointer(c_int(0))
-		tex_h = pointer(c_int(0))
-		sdl3.SDL_QueryTexture(c, None, None, tex_w, tex_h)
+		tex_w = c_float(0.0)
+		tex_h = c_float(0.0)
+		sdl3.SDL_GetTextureSize(c, byref(tex_w), byref(tex_h))
 		dst = sdl3.SDL_FRect(round(x), round(y))
-		dst.w = int(tex_w.contents.value)
-		dst.h = int(tex_h.contents.value)
+		dst.w = int(tex_w.value)
+		dst.h = int(tex_h.value)
 
 		sdl3.SDL_DestroySurface(s_image)
 		#im.close()

src/tauon/t_modules/t_spot.py

@@ -370,6 +370,9 @@ def search(self, text: str) -> list[TrackClass] | None:
 
 		if results[0]:
 			for i, album in enumerate(results[0].items[1:]):
+				if hasattr(album, "album"):
+					album = album.album
+
 				img = QuickThumbnail(self.tauon)
 				img.url = album.images[-1].url
 				img.size = round(50 * self.tauon.gui.scale)