feat(media): add session switching functionality

Author: Dusk-afk

src/core/utils/win32/media.py

@@ -98,12 +98,19 @@ def _run_setup(self):
         # Manually trigger the callback on startup
         self._on_current_session_changed(self._session_manager, None, is_setup=True)
 
-    def _on_current_session_changed(self, manager: SessionManager, args: SessionsChangedEventArgs, is_setup=False):
+    def _on_current_session_changed(
+        self,
+        manager: SessionManager,
+        args: SessionsChangedEventArgs,
+        is_setup=False,
+        is_overridden=False,
+    ):
         if DEBUG:
             self._log.debug('MediaCallback: _on_current_session_changed')
 
         with self._current_session_lock:
-            self._current_session = manager.get_current_session()
+            if not is_overridden:
+                self._current_session = manager.get_current_session()
 
             if self._current_session is not None:
 
@@ -121,7 +128,19 @@ def _on_current_session_changed(self, manager: SessionManager, args: SessionsCha
 
             for callback in callbacks:
                 callback(self._current_session is not None)
+    
+    def _current_session_only(fn):
+        """
+        Decorator to ensure that the function is only called if the session is the same as the current session
+        """
+
+        def wrapper(self: "WindowsMedia", session: Session, *args, **kwargs):
+            with self._current_session_lock:
+                if self._are_same_sessions(session, self._current_session):
+                    return fn(self, session, *args, **kwargs)
+        return wrapper
 
+    @_current_session_only
     def _on_playback_info_changed(self, session: Session, args: PlaybackInfoChangedEventArgs):
         if DEBUG:
             self._log.info('MediaCallback: _on_playback_info_changed')
@@ -136,6 +155,7 @@ def _on_playback_info_changed(self, session: Session, args: PlaybackInfoChangedE
             for callback in callbacks:
                 callback(self._playback_info)
 
+    @_current_session_only
     def _on_timeline_properties_changed(self, session: Session, args: TimelinePropertiesChangedEventArgs):
         if DEBUG:
             self._log.info('MediaCallback: _on_timeline_properties_changed')
@@ -150,6 +170,7 @@ def _on_timeline_properties_changed(self, session: Session, args: TimelineProper
             for callback in callbacks:
                 callback(self._timeline_info)
 
+    @_current_session_only
     def _on_media_properties_changed(self, session: Session, args: MediaPropertiesChangedEventArgs):
         if DEBUG:
             self._log.debug('MediaCallback: _on_media_properties_changed')
@@ -162,6 +183,7 @@ def _on_media_properties_changed(self, session: Session, args: MediaPropertiesCh
             # Only for the initial timer based update, because it is called from an event loop
             asyncio.create_task(self._update_media_properties(session))
 
+    @_current_session_only
     async def _update_media_properties(self, session: Session):
         if DEBUG:
             self._log.debug('MediaCallback: Attempting media info update')
@@ -171,14 +193,9 @@ async def _update_media_properties(self, session: Session):
 
             media_info = self._properties_2_dict(media_info)
 
-            # Skip initial change calls where the thumbnail is None. This prevents processing multiple updates.
-            # Might prevent showing info for no-thumbnail media
-            if media_info['thumbnail'] is None:
-                if DEBUG:
-                    self._log.debug('MediaCallback: Skipping media info update: no thumbnail')
-                return
+            if media_info['thumbnail'] is not None:
+                media_info['thumbnail'] = await self.get_thumbnail(media_info['thumbnail'])
 
-            media_info['thumbnail'] = await self.get_thumbnail(media_info['thumbnail'])
         except Exception as e:
             self._log.error(f'MediaCallback: Error occurred whilst fetching media properties and thumbnail: {e}')
             return
@@ -228,21 +245,40 @@ async def get_thumbnail(thumbnail_stream_reference: IRandomAccessStreamReference
         finally:
             # Close the stream
             readable_stream.close()
+    
+    def _are_same_sessions(self, session1: Session, session2: Session) -> bool:
+        return session1.source_app_user_model_id == session2.source_app_user_model_id
+    
+    def switch_session(self, direction: int):
+        sessions = self._session_manager.get_sessions()
+        if len(sessions) == 0:
+            return
 
-    @staticmethod
-    def play_pause():
-        user32 = ctypes.windll.user32
-        user32.keybd_event(VK_MEDIA_PLAY_PAUSE, 0, KEYEVENTF_EXTENDEDKEY, 0)
-        user32.keybd_event(VK_MEDIA_PLAY_PAUSE, 0, KEYEVENTF_KEYUP, 0)
+        with self._current_session_lock:
+            current_session_idx = -1
+            for i, session in enumerate(sessions):
+                if self._current_session is None or self._are_same_sessions(session, self._current_session):
+                    current_session_idx = i
+                    break
+            
+            idx = (current_session_idx + direction) % len(sessions)
+            if self._are_same_sessions(sessions[idx], self._current_session):
+                return
+            self._log.info(f"Switching to session {idx} ({sessions[idx].source_app_user_model_id})")
+            self._current_session = sessions[idx]
+            self._on_current_session_changed(self._session_manager, None, is_overridden=True)
 
-    @staticmethod
-    def prev():
-        user32 = ctypes.windll.user32
-        user32.keybd_event(VK_MEDIA_PREV_TRACK, 0, KEYEVENTF_EXTENDEDKEY, 0)
-        user32.keybd_event(VK_MEDIA_PREV_TRACK, 0, KEYEVENTF_KEYUP, 0)
+    def play_pause(self):
+        with self._current_session_lock:
+            if self._current_session is not None:
+                self._current_session.try_toggle_play_pause_async()
 
-    @staticmethod
-    def next():
-        user32 = ctypes.windll.user32
-        user32.keybd_event(VK_MEDIA_NEXT_TRACK, 0, KEYEVENTF_EXTENDEDKEY, 0)
-        user32.keybd_event(VK_MEDIA_NEXT_TRACK, 0, KEYEVENTF_KEYUP, 0)
+    def prev(self):
+        with self._current_session_lock:
+            if self._current_session is not None:
+                self._current_session.try_skip_previous_async()
+
+    def next(self):
+        with self._current_session_lock:
+            if self._current_session is not None:
+                self._current_session.try_skip_next_async()

src/core/widgets/yasb/media.py

@@ -6,6 +6,7 @@
 from PIL.ImageQt import QPixmap
 from PyQt6 import QtCore
 from PyQt6.QtCore import Qt
+from PyQt6.QtGui import QWheelEvent
 from PIL.ImageQt import ImageQt
 from winsdk.windows.media.control import GlobalSystemMediaTransportControlsSessionPlaybackInfo
 
@@ -193,6 +194,11 @@ def _on_media_properties_changed(self, media_info: Optional[dict[str, Any]]):
         if not self._show_thumbnail:
             return
 
+        # If no media in session, hide thumbnail and stop here
+        if media_info['thumbnail'] is None and not media_info['title']:
+            self._thumbnail_label.hide()
+            return
+
         # Only update the thumbnail if the title/artist changes or if we did a toggle (resize)
         try:
             if media_info['thumbnail'] is not None:
@@ -248,16 +254,21 @@ def _create_media_button(self, icon, action):
             return label
 
     def _create_media_buttons(self):
-        return (self._create_media_button(self._media_button_icons['prev_track'], WindowsMedia.prev),
-                self._create_media_button(
-            self._media_button_icons['play'], WindowsMedia.play_pause), self._create_media_button(
-            self._media_button_icons['next_track'], WindowsMedia.next))
+        return (self._create_media_button(self._media_button_icons['prev_track'], WindowsMedia().prev),
+                self._create_media_button(self._media_button_icons['play'], WindowsMedia().play_pause),
+                self._create_media_button( self._media_button_icons['next_track'], WindowsMedia().next))
 
     def execute_code(self, func):
         try:
             func()
         except Exception as e:
             logging.error(f"Error executing code: {e}")
+
+    def wheelEvent(self, event: QWheelEvent):
+        if event.angleDelta().y() > 0:
+            self.media.switch_session(+1) # Next
+        elif event.angleDelta().y() < 0:
+            self.media.switch_session(-1) # Prev
 
 class ClickableLabel(QLabel):
     def __init__(self, parent=None):