From 152d22b7098b1274baca479d2f841d6557470630 Mon Sep 17 00:00:00 2001
From: CodeDevMLH <145071728+CodeDevMLH@users.noreply.github.com>
Date: Wed, 11 Feb 2026 19:56:20 +0100
Subject: [PATCH] Refine video playback logic in slideshow and update preload
 description

---
 .../Configuration/configPage.html             |  4 +--
 .../Web/mediaBarEnhanced.css                  |  1 -
 .../Web/mediaBarEnhanced.js                   | 35 +++++++++++++++----
 3 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/Jellyfin.Plugin.MediaBarEnhanced/Configuration/configPage.html b/Jellyfin.Plugin.MediaBarEnhanced/Configuration/configPage.html
index 281eef5..73e3f20 100644
--- a/Jellyfin.Plugin.MediaBarEnhanced/Configuration/configPage.html
+++ b/Jellyfin.Plugin.MediaBarEnhanced/Configuration/configPage.html
@@ -131,7 +131,7 @@
                                     <li><b>YouTube URL:</b> Play a remote trailer from YouTube.</li>
                                     <li><b>Jellyfin Item ID (GUID):</b> Play the video of another library item (e.g. a Theme Video or Backdrop Video) using the native player.</li>
                                 </ul>
-                                <br><br>
+                                <br>
                                 You can also add a description after the ID using any separator like space, pipe
                                 (|) or dash (-): <br>e.g. <code>ID DESCRIPTION</code> or <code>ID | DESCRIPTION</code>
                                 <br><br>
@@ -337,7 +337,7 @@
                         <div class="inputContainer">
                             <label class="inputLabel inputLabelUnfocused" for="PreloadCount">Preload Count</label>
                             <input is="emby-input" type="number" id="PreloadCount" name="PreloadCount" />
-                            <div class="fieldDescription">Number of images to preload.</div>
+                            <div class="fieldDescription">Number of slides to preload.</div>
                         </div>
                         <div class="inputContainer">
                             <label class="inputLabel inputLabelUnfocused" for="MaxPaginationDots">Max Pagination
diff --git a/Jellyfin.Plugin.MediaBarEnhanced/Web/mediaBarEnhanced.css b/Jellyfin.Plugin.MediaBarEnhanced/Web/mediaBarEnhanced.css
index 575c4a9..d604b52 100644
--- a/Jellyfin.Plugin.MediaBarEnhanced/Web/mediaBarEnhanced.css
+++ b/Jellyfin.Plugin.MediaBarEnhanced/Web/mediaBarEnhanced.css
@@ -997,7 +997,6 @@
 }
 
 .layout-tv .video-backdrop {
-  top: -5%;
   mask-image: linear-gradient(to top,
       #fff0 2%,
       rgb(0 0 0 / 0.5) 6%,
diff --git a/Jellyfin.Plugin.MediaBarEnhanced/Web/mediaBarEnhanced.js b/Jellyfin.Plugin.MediaBarEnhanced/Web/mediaBarEnhanced.js
index f174576..07bf2e8 100644
--- a/Jellyfin.Plugin.MediaBarEnhanced/Web/mediaBarEnhanced.js
+++ b/Jellyfin.Plugin.MediaBarEnhanced/Web/mediaBarEnhanced.js
@@ -1712,11 +1712,18 @@ const SlideCreator = {
                     event.target.setPlaybackQuality(quality);
                   }
 
-                  // Only play if this is the active slide
+                  // Only play if this is the active slide AND the slideshow is visible
                   const slide = document.querySelector(`.slide[data-item-id="${itemId}"]`);
                   const isVideoPlayerOpen = document.querySelector('.videoPlayerContainer') || document.querySelector('.youtubePlayerContainer');
 
                   if (slide && slide.classList.contains('active') && !document.hidden && (!isVideoPlayerOpen || isVideoPlayerOpen.classList.contains('hide'))) {
+                      const currentIndex = STATE.slideshow.currentSlideIndex;
+                      const currentItemId = STATE.slideshow.itemIds[currentIndex];
+                      if (currentItemId !== itemId) {
+                          console.log(`Slide ${itemId} is no longer active (current: ${currentItemId}), aborting playback.`);
+                          event.target.mute(); // Mute just in case
+                          return;
+                      }
                     event.target.playVideo();
                     
                     // Check if it actually started playing after a short delay (handling autoplay blocks)
@@ -2291,8 +2298,14 @@ const SlideshowManager = {
         Object.keys(STATE.slideshow.videoPlayers).forEach(id => {
           if (id !== currentItemId) {
             const p = STATE.slideshow.videoPlayers[id];
-            if (p && typeof p.pauseVideo === 'function') {
-              p.pauseVideo();
+            if (p) {
+               try {
+                   if (typeof p.pauseVideo === 'function') {
+                      p.pauseVideo();
+                   } else if (p.tagName === 'VIDEO') {
+                       p.pause();
+                   }
+               } catch (e) { console.warn("Error pausing player", id, e); }
             }
           }
         });
@@ -2300,8 +2313,11 @@ const SlideshowManager = {
 
       // 2. Pause all other HTML5 videos e.g. local trailers
       document.querySelectorAll('video').forEach(video => {
-        if (!video.closest(`.slide[data-item-id="${currentItemId}"]`)) {
-          video.pause();
+        const slideParent = video.closest('.slide');
+        if (slideParent && slideParent.dataset.itemId !== currentItemId) {
+          try {
+              video.pause();
+          } catch (e) {}
         }
       });
 
@@ -2505,7 +2521,14 @@ const SlideshowManager = {
       const index = STATE.slideshow.itemIds.indexOf(itemId);
       if (index === -1) return;
 
-      const distance = Math.abs(index - currentIndex);
+      const totalItems = STATE.slideshow.itemIds.length;
+      
+      // Calculate wrapped distance
+      let distance = Math.abs(index - currentIndex);
+      if (totalItems > keepRange * 2) {
+          distance = Math.min(distance, totalItems - distance);
+      }
+      
       if (distance > keepRange) {
         // Destroy video player if exists
         if (STATE.slideshow.videoPlayers[itemId]) {