Update manifest.json for release v1.6.1.8 [skip ci]

Jellyfin.Plugin.MediaBarEnhanced/Configuration/PluginConfiguration.cs

@@ -36,6 +36,7 @@ namespace Jellyfin.Plugin.MediaBarEnhanced.Configuration
         public bool EnableSeasonalContent { get; set; } = false;
         public bool IsEnabled { get; set; } = true;
         public bool EnableClientSideSettings { get; set; } = false;
+        public bool ApplyLimitsToCustomIds { get; set; } = false;
         public string SortBy { get; set; } = "Random";
         public string SortOrder { get; set; } = "Ascending";
     }

Jellyfin.Plugin.MediaBarEnhanced/Configuration/configPage.html

@@ -107,12 +107,11 @@
                         </div>
                         <div class="checkboxContainer checkboxContainer-withDescription">
                             <label>
-                                <input is="emby-checkbox" type="checkbox" id="EnableSeasonalContent"
-                                    name="EnableSeasonalContent" />
-                                <span>Enable Seasonal Content Mode</span>
+                                <input is="emby-checkbox" type="checkbox" id="ApplyLimitsToCustomIds"
+                                    name="ApplyLimitsToCustomIds" />
+                                <span>Apply Limits to Custom IDs</span>
                             </label>
-                            <div class="fieldDescription">Enable this to define time-based lists in the field below.
-                            </div>
+                            <div class="fieldDescription">If enabled, the Max Items limit (Advanced &rarr; Content Limits) will also apply to Custom Media IDs and Collections. By default, custom lists are not limited.</div>
                         </div>
                         <div class="inputContainer">
                             <label class="inputLabel inputLabelUnfocused" for="CustomMediaIds">Media/Collection/Playlist
@@ -411,7 +410,7 @@
                             'ShowTrailerButton', 'AlwaysShowArrows', 'EnableKeyboardControls',
                             'EnableCustomMediaIds', 'CustomMediaIds', 'EnableLoadingScreen',
                             'EnableSeasonalContent', 'EnableClientSideSettings', 'SortBy', 'SortOrder',
-                            'PreferLocalTrailers'
+                            'PreferLocalTrailers', 'ApplyLimitsToCustomIds', 'SeasonalSections'
                         ];
 
                         keys.forEach(function (key) {
@@ -478,7 +477,7 @@
                         'ShowTrailerButton', 'AlwaysShowArrows', 'EnableKeyboardControls',
                         'EnableCustomMediaIds', 'CustomMediaIds', 'EnableLoadingScreen',
                         'EnableSeasonalContent', 'EnableClientSideSettings', 'SortBy', 'SortOrder',
-                        'PreferLocalTrailers'
+                        'PreferLocalTrailers', 'ApplyLimitsToCustomIds', 'SeasonalSections'
                     ];
 
                     keys.forEach(function (key) {

Jellyfin.Plugin.MediaBarEnhanced/Jellyfin.Plugin.MediaBarEnhanced.csproj

@@ -12,7 +12,7 @@
     <!-- <TreatWarningsAsErrors>false</TreatWarningsAsErrors> -->
     <Title>Jellyfin Media Bar Enhanced Plugin</Title>
     <Authors>CodeDevMLH</Authors>
-    <Version>1.6.1.1</Version>
+    <Version>1.6.1.8</Version>
     <RepositoryUrl>https://github.com/CodeDevMLH/jellyfin-plugin-media-bar-enhanced</RepositoryUrl>
   </PropertyGroup>
 

Jellyfin.Plugin.MediaBarEnhanced/Web/mediaBarEnhanced.css

@@ -175,6 +175,7 @@
   overflow: hidden;
   margin: 0 auto;
   pointer-events: auto;
+  outline: none;
 }
 
 #slides-container[style*="display: none"],
@@ -996,13 +997,6 @@
   margin: 0;
 }
 
-.layout-tv .video-backdrop {
-  mask-image: linear-gradient(to top,
-      #fff0 2%,
-      rgb(0 0 0 / 0.5) 6%,
-      #000000 8%);
-  -webkit-mask-image: linear-gradient(to top,
-      #fff0 2%,
-      rgb(0 0 0 / 0.5) 6%,
-      #000000 8%);
+.layout-tv .backdrop-container{
+  top: -5%;
 }

Jellyfin.Plugin.MediaBarEnhanced/Web/mediaBarEnhanced.js

@@ -57,6 +57,8 @@ const CONFIG = {
   enableClientSideSettings: false,
   sortBy: "Random",
   sortOrder: "Ascending",
+  applyLimitsToCustomIds: false,
+  seasonalSections: "[]",
 };
 
 // State management
@@ -611,7 +613,8 @@ const SlideUtils = {
     if (!container) {
       container = this.createElement("div", { 
         id: "slides-container",
-        className: "noautofocus"
+        className: "noautofocus",
+        tabIndex: "-1"
       });
       document.body.appendChild(container);
     }
@@ -1432,16 +1435,19 @@ const VisibilityObserver = {
     
     // If a full screen video player is active, hide slideshow and stop playback
     if ((videoPlayer && !videoPlayer.classList.contains('hide')) || (trailerPlayer && !trailerPlayer.classList.contains('hide'))) {
-        const container = document.getElementById("slides-container");
-        if (container) {
-            container.style.display = "none";
-            container.style.visibility = "hidden";
-            container.style.pointerEvents = "none";
+        if (this._lastVisibleState !== 'player-active') {
+            this._lastVisibleState = 'player-active';
+            const container = document.getElementById("slides-container");
+            if (container) {
+                container.style.display = "none";
+                container.style.visibility = "hidden";
+                container.style.pointerEvents = "none";
+            }
+            if (STATE.slideshow.slideInterval) {
+                STATE.slideshow.slideInterval.stop();
+            }
+            SlideshowManager.stopAllPlayback();
         }
-        if (STATE.slideshow.slideInterval) {
-            STATE.slideshow.slideInterval.stop();
-        }
-        SlideshowManager.stopAllPlayback();
         return;
     }
 
@@ -1456,20 +1462,27 @@ const VisibilityObserver = {
       activeTab &&
       activeTab.getAttribute("data-index") === "0";
 
-    container.style.display = isVisible ? "block" : "none";
-    container.style.visibility = isVisible ? "visible" : "hidden";
-    container.style.pointerEvents = isVisible ? "auto" : "none";
+    const newState = isVisible ? 'visible' : 'hidden';
+    
+    // Only update DOM and trigger actions when state actually changes
+    if (this._lastVisibleState !== newState) {
+      this._lastVisibleState = newState;
+      
+      container.style.display = isVisible ? "block" : "none";
+      container.style.visibility = isVisible ? "visible" : "hidden";
+      container.style.pointerEvents = isVisible ? "auto" : "none";
 
-    if (isVisible) {
-      if (STATE.slideshow.slideInterval && !STATE.slideshow.isPaused) {
-        STATE.slideshow.slideInterval.start();
-        SlideshowManager.resumeActivePlayback();
+      if (isVisible) {
+        if (STATE.slideshow.slideInterval && !STATE.slideshow.isPaused) {
+          STATE.slideshow.slideInterval.start();
+          SlideshowManager.resumeActivePlayback();
+        }
+      } else {
+        if (STATE.slideshow.slideInterval) {
+          STATE.slideshow.slideInterval.stop();
+        }
+        SlideshowManager.stopAllPlayback();
       }
-    } else {
-      if (STATE.slideshow.slideInterval) {
-        STATE.slideshow.slideInterval.stop();
-      }
-      SlideshowManager.stopAllPlayback();
     }
   },
 
@@ -1477,7 +1490,13 @@ const VisibilityObserver = {
    * Initializes visibility observer
    */
   init() {
+    // MARK: Mark
     const observer = new MutationObserver(() => this.updateVisibility());
+    // let debounceTimer = null;
+    // const observer = new MutationObserver(() => {
+    //   if (debounceTimer) clearTimeout(debounceTimer);
+    //   debounceTimer = setTimeout(() => this.updateVisibility(), 250);
+    // });
     observer.observe(document.body, { childList: true, subtree: true });
 
     document.body.addEventListener("click", () => this.updateVisibility());
@@ -1696,6 +1715,13 @@ const SlideCreator = {
               playerVars: playerVars,
               events: {
                 'onReady': (event) => {
+                  // Prevent iframe from stealing focus (critical for TV mode)
+                  const iframe = event.target.getIframe();
+                  if (iframe) {
+                    iframe.setAttribute('tabindex', '-1');
+                    iframe.setAttribute('inert', '');
+                  }
+
                   // Store start/end time and videoId for later use
                   event.target._startTime = playerVars.start || 0;
                   event.target._endTime = playerVars.end || undefined;
@@ -1757,14 +1783,11 @@ const SlideCreator = {
                 },
                 'onStateChange': (event) => {
                   if (event.data === YT.PlayerState.ENDED) {
-                    if (CONFIG.waitForTrailerToEnd) {
                       SlideshowManager.nextSlide();
-                    } else {
-                      event.target.playVideo(); // Loop if not waiting for end if trailer is shorter than slide duration
-                    }
                   }
                 },
-                'onError': () => {
+                'onError': (event) => {
+                  console.warn(`YouTube player error ${event.data} for video ${videoId}`);
                   // Fallback to next slide on error
                   if (CONFIG.waitForTrailerToEnd) {
                     SlideshowManager.nextSlide();
@@ -1800,16 +1823,25 @@ const SlideCreator = {
 
         STATE.slideshow.videoPlayers[itemId] = backdrop;
 
-        backdrop.addEventListener('play', () => {
+        backdrop.addEventListener('play', (event) => {
+          const slide = document.querySelector(`.slide[data-item-id="${itemId}"]`);
+          const currentIndex = STATE.slideshow.currentSlideIndex;
+          const currentItemId = STATE.slideshow.itemIds[currentIndex];
+          
+          if (!slide || !slide.classList.contains('active') || currentItemId !== itemId) {
+              console.log(`Local video ${itemId} started playing but is not active, pausing.`);
+              event.target.pause();
+              event.target.currentTime = 0;
+              return;
+          }
+
           if (CONFIG.waitForTrailerToEnd && STATE.slideshow.slideInterval) {
             STATE.slideshow.slideInterval.stop();
           }
         });
 
         backdrop.addEventListener('ended', () => {
-          if (CONFIG.waitForTrailerToEnd) {
             SlideshowManager.nextSlide();
-          }
         });
 
         backdrop.addEventListener('error', () => {
@@ -2282,109 +2314,27 @@ const SlideshowManager = {
 
       currentSlide.classList.add("active");
       
-      if (focusSelector) {
+      // Restore focus for TV mode navigation continuity
+      requestAnimationFrame(() => {
+        if (focusSelector) {
           const target = currentSlide.querySelector(focusSelector);
           if (target) {
-              requestAnimationFrame(() => {
-                  target.focus();
-              });
+            target.focus();
+            return;
           }
-      }
-
-      // Manage Video Playback: Stop others, Play current
-
-      // 1. Pause all other YouTube players
-      if (STATE.slideshow.videoPlayers) {
-        Object.keys(STATE.slideshow.videoPlayers).forEach(id => {
-          if (id !== currentItemId) {
-            const p = STATE.slideshow.videoPlayers[id];
-            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); }
-            }
-          }
-        });
-      }
-
-      // 2. Pause all other HTML5 videos e.g. local trailers
-      document.querySelectorAll('video').forEach(video => {
-        const slideParent = video.closest('.slide');
-        if (slideParent && slideParent.dataset.itemId !== currentItemId) {
-          try {
-              video.pause();
-          } catch (e) {}
+        }
+        // Always ensure container has focus in TV mode to keep keyboard navigation working
+        const isTvMode = (window.layoutManager && window.layoutManager.tv) ||
+          document.documentElement.classList.contains('layout-tv') ||
+          document.body.classList.contains('layout-tv');
+        if (isTvMode) {
+          container.focus({ preventScroll: true });
         }
       });
 
-      // 3. Play and Reset current video
-      const videoBackdrop = currentSlide.querySelector('.video-backdrop');
-
-      // Update mute button visibility
-      const muteButton = document.querySelector('.mute-button');
-      if (muteButton) {
-        const hasVideo = !!videoBackdrop;
-        muteButton.style.display = hasVideo ? 'block' : 'none';
-      }
-
-      if (videoBackdrop) {
-        if (videoBackdrop.tagName === 'VIDEO') {
-          videoBackdrop.currentTime = 0;
-
-          videoBackdrop.muted = STATE.slideshow.isMuted;
-          if (!STATE.slideshow.isMuted) {
-            videoBackdrop.volume = 0.4;
-          }
-
-          videoBackdrop.play().catch(e => {
-            // Check if it actually started playing after a short delay (handling autoplay blocks)
-            setTimeout(() => {
-              if (videoBackdrop.paused) {
-                console.warn(`Autoplay blocked for ${itemId}, attempting muted fallback`);
-                videoBackdrop.muted = true;
-                videoBackdrop.play().catch(err => console.error("Muted fallback failed", err));
-              }
-            }, 1000);
-          });
-        } else if (STATE.slideshow.videoPlayers && STATE.slideshow.videoPlayers[currentItemId]) {
-          const player = STATE.slideshow.videoPlayers[currentItemId];
-          if (player && typeof player.loadVideoById === 'function' && player._videoId) {
-            // Use loadVideoById to enforce start and end times
-            player.loadVideoById({
-              videoId: player._videoId,
-              startSeconds: player._startTime || 0,
-              endSeconds: player._endTime
-            });
-
-            if (STATE.slideshow.isMuted) {
-              player.mute();
-            } else {
-              player.unMute();
-              player.setVolume(40);
-            }
-
-            // Check if playback successfully started, otherwise fallback to muted
-            setTimeout(() => {
-              if (player.getPlayerState &&
-                player.getPlayerState() !== YT.PlayerState.PLAYING &&
-                player.getPlayerState() !== YT.PlayerState.BUFFERING) {
-                console.log("YouTube loadVideoById didn't start playback, retrying muted...");
-                player.mute();
-                player.playVideo();
-              }
-            }, 1000);
-          } else if (player && typeof player.seekTo === 'function') {
-            // Fallback if loadVideoById is not available or videoId missing
-            const startTime = player._startTime || 0;
-            player.seekTo(startTime);
-            player.playVideo();
-          }
-        }
-      }
+      // Manage Video Playback: Stop others, Play current
+      this.pauseOtherVideos(currentItemId);
+      this.playCurrentVideo(currentSlide, currentItemId);
 
       const enableAnimations = MediaBarEnhancedSettingsManager.getSetting('slideAnimations', CONFIG.slideAnimationEnabled);
 
@@ -2393,7 +2343,8 @@ const SlideshowManager = {
         if (backdrop && !backdrop.classList.contains("video-backdrop")) {
           backdrop.classList.add("animate");
         }
-        currentSlide.querySelector(".logo").classList.add("animate");
+        const logo = currentSlide.querySelector(".logo");
+        if (logo) logo.classList.add("animate");
       }
 
       STATE.slideshow.currentSlideIndex = index;
@@ -2476,18 +2427,20 @@ const SlideshowManager = {
    */
   async preloadAdjacentSlides(currentIndex) {
     const totalItems = STATE.slideshow.totalItems;
-    const preloadCount = CONFIG.preloadCount;
+    const preloadCount = Math.min(Math.max(CONFIG.preloadCount || 1, 1), 5);
 
-    const nextIndex = (currentIndex + 1) % totalItems;
-    const itemId = STATE.slideshow.itemIds[nextIndex];
+    // Preload next slides
+    for (let i = 1; i <= preloadCount; i++) {
+        const nextIndex = (currentIndex + i) % totalItems;
+        const itemId = STATE.slideshow.itemIds[nextIndex];
+        SlideCreator.createSlideForItemId(itemId);
+    }
 
-    await SlideCreator.createSlideForItemId(itemId);
-
-    if (preloadCount > 1) {
-      const prevIndex = (currentIndex - 1 + totalItems) % totalItems;
-      const prevItemId = STATE.slideshow.itemIds[prevIndex];
-
-      SlideCreator.createSlideForItemId(prevItemId);
+    // Preload previous slides
+    for (let i = 1; i <= preloadCount; i++) {
+        const prevIndex = (currentIndex - i + totalItems) % totalItems;
+        const prevItemId = STATE.slideshow.itemIds[prevIndex];
+        SlideCreator.createSlideForItemId(prevItemId);
     }
   },
 
@@ -2516,6 +2469,7 @@ const SlideshowManager = {
   pruneSlideCache() {
     const currentIndex = STATE.slideshow.currentSlideIndex;
     const keepRange = 5;
+    let prunedAny = false;
 
     Object.keys(STATE.slideshow.createdSlides).forEach((itemId) => {
       const index = STATE.slideshow.itemIds.indexOf(itemId);
@@ -2547,10 +2501,27 @@ const SlideshowManager = {
         if (slide) slide.remove();
 
         delete STATE.slideshow.createdSlides[itemId];
+        prunedAny = true;
 
         console.log(`Pruned slide ${itemId} at distance ${distance} from view`);
       }
     });
+
+    // After pruning, restore focus to container in TV mode
+    if (prunedAny) {
+      const isTvMode = (window.layoutManager && window.layoutManager.tv) ||
+        document.documentElement.classList.contains('layout-tv') ||
+        document.body.classList.contains('layout-tv');
+      if (isTvMode) {
+        // Use setTimeout to execute AFTER Jellyfin's focus manager processes the iframe removal
+        setTimeout(() => {
+          const container = document.getElementById("slides-container");
+          if (container && container.style.display !== 'none') {
+            container.focus({ preventScroll: true });
+          }
+        }, 0);
+      }
+    }
   },
 
   toggleMute() {
@@ -2669,6 +2640,114 @@ const SlideshowManager = {
     }
   },
 
+  /**
+   * Pauses all video players except the one with the given item ID
+   * @param {string} excludeItemId - Item ID to exclude from pausing
+   */
+  pauseOtherVideos(excludeItemId) {
+    // Pause YouTube players
+    if (STATE.slideshow.videoPlayers) {
+      Object.keys(STATE.slideshow.videoPlayers).forEach(id => {
+        if (id !== excludeItemId) {
+          const p = STATE.slideshow.videoPlayers[id];
+          if (p) {
+            try {
+              if (typeof p.pauseVideo === 'function') {
+                p.pauseVideo();
+                if (typeof p.mute === 'function') {
+                  p.mute();
+                }
+              }
+              else if (p.tagName === 'VIDEO') {
+                p.pause();
+                p.muted = true;
+              }
+            } catch (e) { console.warn("Error pausing player", id, e); }
+          }
+        }
+      });
+    }
+    // Pause HTML5 videos
+    document.querySelectorAll('video').forEach(video => {
+      const slideParent = video.closest('.slide');
+      if (slideParent && slideParent.dataset.itemId !== excludeItemId) {
+        try {
+          video.pause();
+          video.muted = true;
+        } catch (e) {}
+      }
+    });
+  },
+
+  /**
+   * Plays the video backdrop on the given slide and updates mute button visibility
+   * @param {Element} slide - The slide DOM element
+   * @param {string} itemId - The item ID of the slide
+   * @returns {boolean} Whether a video was found and playback attempted
+   */
+  playCurrentVideo(slide, itemId) {
+    const videoBackdrop = slide.querySelector('.video-backdrop');
+
+    // Update mute button visibility
+    const muteButton = document.querySelector('.mute-button');
+    if (muteButton) {
+      muteButton.style.display = videoBackdrop ? 'block' : 'none';
+    }
+
+    if (!videoBackdrop) return false;
+
+    if (videoBackdrop.tagName === 'VIDEO') {
+      videoBackdrop.currentTime = 0;
+      videoBackdrop.muted = STATE.slideshow.isMuted;
+      if (!STATE.slideshow.isMuted) videoBackdrop.volume = 0.4;
+
+      videoBackdrop.play().catch(() => {
+        setTimeout(() => {
+          if (videoBackdrop.paused) {
+            console.warn(`Autoplay blocked for ${itemId}, attempting muted fallback`);
+            videoBackdrop.muted = true;
+            videoBackdrop.play().catch(err => console.error("Muted fallback failed", err));
+          }
+        }, 1000);
+      });
+      return true;
+    }
+
+    // YouTube player
+    const player = STATE.slideshow.videoPlayers?.[itemId];
+    if (player && typeof player.loadVideoById === 'function' && player._videoId) {
+      player.loadVideoById({
+        videoId: player._videoId,
+        startSeconds: player._startTime || 0,
+        endSeconds: player._endTime
+      });
+
+      if (STATE.slideshow.isMuted) {
+        player.mute();
+      } else {
+        player.unMute();
+        player.setVolume(40);
+      }
+
+      setTimeout(() => {
+        if (player.getPlayerState &&
+          player.getPlayerState() !== YT.PlayerState.PLAYING &&
+          player.getPlayerState() !== YT.PlayerState.BUFFERING) {
+          console.log("YouTube loadVideoById didn't start playback, retrying muted...");
+          player.mute();
+          player.playVideo();
+        }
+      }, 1000);
+      return true;
+    } else if (player && typeof player.seekTo === 'function') {
+      player.seekTo(player._startTime || 0);
+      player.playVideo();
+      return true;
+    }
+
+    return false;
+  },
+
   /**
    * Stops all video playback (YouTube and HTML5)
    * Used when navigating away from the home screen
@@ -2698,14 +2777,16 @@ const SlideshowManager = {
       });
     }
 
-    // 2. Pause all HTML5 videos
+    // 2. Stop and mute all HTML5 videos
     const container = document.getElementById("slides-container");
     if (container) {
       container.querySelectorAll('video').forEach(video => {
         try {
           video.pause();
+          video.muted = true;
+          video.currentTime = 0;
         } catch (e) {
-          console.warn("Error pausing HTML5 video:", e);
+          console.warn("Error stopping HTML5 video:", e);
         }
       });
     }
@@ -2723,18 +2804,24 @@ const SlideshowManager = {
     const currentSlide = document.querySelector(`.slide[data-item-id="${currentItemId}"]`);
     if (!currentSlide) return;
 
-    // 1. Try YouTube Player
-    const ytPlayer = STATE.slideshow.videoPlayers[currentItemId];
+    // YouTube player: just resume, don't reload
+    const ytPlayer = STATE.slideshow.videoPlayers?.[currentItemId];
     if (ytPlayer && typeof ytPlayer.playVideo === 'function') {
+      if (STATE.slideshow.isMuted) {
+        if (typeof ytPlayer.mute === 'function') ytPlayer.mute();
+      } else {
+        if (typeof ytPlayer.unMute === 'function') ytPlayer.unMute();
+        if (typeof ytPlayer.setVolume === 'function') ytPlayer.setVolume(40);
+      }
       ytPlayer.playVideo();
+      return;
     }
 
-    // 2. Try HTML5 Video
-    const html5Video = currentSlide.querySelector('video');
+    // HTML5 video: just resume, don't reset currentTime
+    const html5Video = currentSlide.querySelector('video.video-backdrop');
     if (html5Video) {
-      if (STATE.slideshow.isMuted) {
-        html5Video.muted = true;
-      }
+      html5Video.muted = STATE.slideshow.isMuted;
+      if (!STATE.slideshow.isMuted) html5Video.volume = 0.4;
       html5Video.play().catch(e => console.warn("Error resuming HTML5 video:", e));
     }
   },
@@ -2809,7 +2896,7 @@ const SlideshowManager = {
       // Determine if we should handle navigation keys (Arrows, Space, M)
       // TV Mode: Strict focus required (must be on slideshow)
       // Desktop Mode: Loose focus allowed (slideshow OR body/nothing focused)
-      const canControlSlideshow = isTvMode ? hasDirectFocus : (hasDirectFocus || isBodyFocused);
+      let canControlSlideshow = isTvMode ? hasDirectFocus : (hasDirectFocus || isBodyFocused);
 
       // Check for Input Fields (always ignore typing)
       const isInputElement = activeElement && (activeElement.tagName === 'INPUT' || activeElement.tagName === 'TEXTAREA' || activeElement.isContentEditable);
@@ -3027,7 +3114,7 @@ const SlideshowManager = {
           finalIds.push(id);
         }
       } catch (e) {
-        console.warn(`Error resolving item ${id}:`, e);
+        console.warn(`Error resolving item ${rawId}:`, e);
       }
     }
     return finalIds;
@@ -3046,6 +3133,12 @@ const SlideshowManager = {
         console.log("Using Custom Media IDs from configuration");
         const rawIds = this.parseCustomIds();
         itemIds = await this.resolveCollectionsAndItems(rawIds);
+
+        // Apply max items limit to custom IDs if enabled
+        if (CONFIG.applyLimitsToCustomIds && itemIds.length > CONFIG.maxItems) {
+          console.log(`Limiting custom IDs from ${itemIds.length} to ${CONFIG.maxItems}`);
+          itemIds = itemIds.slice(0, CONFIG.maxItems);
+        }
       }
 
       // 2. Try Avatar List (list.txt)
@@ -3425,75 +3518,69 @@ const MediaBarEnhancedSettingsManager = {
  * Initialize page visibility handling to pause when tab is inactive
  */
 const initPageVisibilityHandler = () => {
-  let wasVideoPlayingBeforeHide = false;
-
   document.addEventListener("visibilitychange", () => {
+    const isVideoPlayerOpen = document.querySelector('.videoPlayerContainer:not(.hide)') ||
+      document.querySelector('.youtubePlayerContainer:not(.hide)');
+
     if (document.hidden) {
-      console.log("Tab inactive - pausing slideshow and videos");
-      wasVideoPlayingBeforeHide = STATE.slideshow.isVideoPlaying;
-      
+      // Stop slide timer
       if (STATE.slideshow.slideInterval) {
         STATE.slideshow.slideInterval.stop();
       }
-      
-      // Pause active video if playing
-      const currentItemId = STATE.slideshow.itemIds[STATE.slideshow.currentSlideIndex];
-      if (currentItemId) {
-        // YouTube
-        if (STATE.slideshow.videoPlayers && STATE.slideshow.videoPlayers[currentItemId]) {
-          const player = STATE.slideshow.videoPlayers[currentItemId];
-          if (typeof player.pauseVideo === "function") {
-            try {
-              player.pauseVideo();
-              STATE.slideshow.isVideoPlaying = false;
-            } catch (e) {
-              console.warn("Error pausing video on tab hide:", e);
+
+      if (isVideoPlayerOpen) {
+        // Jellyfin video is playing --> full stop to free all resources
+        console.log("Tab inactive and Jellyfin player active - stopping all playback");
+        SlideshowManager.stopAllPlayback();
+      } else {
+        // Simple tab switch: stop all others, pause only the current
+        console.log("Tab inactive. Pausing current video, stopping others");
+        const currentItemId = STATE.slideshow.itemIds?.[STATE.slideshow.currentSlideIndex];
+
+        // Stop all players except the current one
+        if (STATE.slideshow.videoPlayers) {
+          Object.keys(STATE.slideshow.videoPlayers).forEach(id => {
+            if (id === currentItemId) return;
+            const p = STATE.slideshow.videoPlayers[id];
+            if (p) {
+              try {
+                if (typeof p.stopVideo === 'function') {
+                  p.stopVideo();
+                  if (typeof p.clearVideo === 'function') p.clearVideo();
+                } else if (p.tagName === 'VIDEO') {
+                  p.pause();
+                  p.muted = true;
+                  p.currentTime = 0;
+                }
+              } catch (e) { console.warn("Error stopping background player", id, e); }
             }
-          } else if (player.tagName === 'VIDEO') { // HTML5 Video
-             player.pause();
-             STATE.slideshow.isVideoPlaying = false;
+          });
+        }
+
+        // Pause only the current video
+        if (currentItemId) {
+          const player = STATE.slideshow.videoPlayers?.[currentItemId];
+          if (player) {
+            try {
+              if (typeof player.pauseVideo === 'function') {
+                player.pauseVideo();
+              } else if (player.tagName === 'VIDEO') {
+                player.pause();
+              }
+            } catch (e) { console.warn("Error pausing video on tab hide:", e); }
           }
         }
       }
     } else {
-      console.log("Tab active - resuming slideshow");
-      if (!STATE.slideshow.isPaused) {
-        const currentItemId = STATE.slideshow.itemIds[STATE.slideshow.currentSlideIndex];
-        
-        if (wasVideoPlayingBeforeHide && currentItemId && STATE.slideshow.videoPlayers && STATE.slideshow.videoPlayers[currentItemId]) {
-          const player = STATE.slideshow.videoPlayers[currentItemId];
-          
-          // YouTube
-          if (typeof player.playVideo === "function") {
-            try {
-              player.playVideo();
-              STATE.slideshow.isVideoPlaying = true;
-            } catch (e) {
-              console.warn("Error resuming video on tab show:", e);
-              if (STATE.slideshow.slideInterval) {
-                STATE.slideshow.slideInterval.start();
-              }
-            }
-          } else if (player.tagName === 'VIDEO') { // HTML5 Video
-             try {
-                player.play().catch(e => console.warn("Error resuming HTML5 video:", e));
-                STATE.slideshow.isVideoPlaying = true;
-             } catch(e) { console.warn(e); }
-          }
-        } else {
-          // No video was playing, just restart interval
-          const activeSlide = document.querySelector('.slide.active');
-          const hasVideo = activeSlide && activeSlide.querySelector('.video-backdrop');
-          
-          if (CONFIG.waitForTrailerToEnd && hasVideo) {
-             // Don't restart interval if waiting for trailer
-          } else {
-             if (STATE.slideshow.slideInterval) {
-               STATE.slideshow.slideInterval.start();
-             }
-          }
+      console.log("Tab active. Resuming slideshow");
+      const isOnHome = window.location.hash === "#/home.html" || window.location.hash === "#/home";
+
+      if (isOnHome && !STATE.slideshow.isPaused && !isVideoPlayerOpen) {
+        SlideshowManager.resumeActivePlayback();
+
+        if (STATE.slideshow.slideInterval && !CONFIG.waitForTrailerToEnd) {
+          STATE.slideshow.slideInterval.start();
         }
-        wasVideoPlayingBeforeHide = false;
       }
     }
   });

manifest.json

@@ -9,12 +9,12 @@
     "imageUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/raw/branch/main/logo.png",
     "versions": [
       {
-        "version": "1.6.1.1",
-        "changelog": "- fix tv mode issue",
+        "version": "1.6.1.8",
+        "changelog": "- fix tv mode issue\n- refactor video playback management",
         "targetAbi": "10.11.0.0",
-        "sourceUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/releases/download/v1.6.1.1/Jellyfin.Plugin.MediaBarEnhanced.zip",
-        "checksum": "74483dae57374e338f933768c2c79862",
-        "timestamp": "2026-02-11T18:57:35Z"
+        "sourceUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/releases/download/v1.6.1.8/Jellyfin.Plugin.MediaBarEnhanced.zip",
+        "checksum": "96db191473dc77edead21e8230c1115b",
+        "timestamp": "2026-02-12T23:51:47Z"
       },
       {
         "version": "1.6.0.2",