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"
+                                <input is="emby-checkbox" type="checkbox" id="ApplyLimitsToCustomIds"
-                                    name="EnableSeasonalContent" />
+                                    name="ApplyLimitsToCustomIds" />
-                                <span>Enable Seasonal Content Mode</span>
+                                <span>Apply Limits to Custom IDs</span>
                             </label>
-                            <div class="fieldDescription">Enable this to define time-based lists in the field below.
+                            <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>
                         <div class="inputContainer">
                             <label class="inputLabel inputLabelUnfocused" for="CustomMediaIds">Media/Collection/Playlist
@@ -123,9 +122,15 @@
                             <div class="fieldDescription" id="customMediaIdsDesc">Enter the IDs of the items you want to show in the slideshow.
                                 You can separate them by new line or comma.
                                 <br><br>
-                                <b>Manual Trailer Override:</b> You can specify a YouTube URL for an item by adding it in
+                                <b>Manual Trailer/Video Override:</b> You can specify a YouTube URL <b>OR</b> a Jellyfin Item ID (e.g. for a Theme Video) for an item by adding it in
-                                brackets: <br> <code>e.g. ID DESCRIPTION [https://youtu.be/...]</code> or <code>ID [https://youtu.be/...] DESCRIPTION</code>
+                                brackets: <br> <code>e.g. ID DESCRIPTION [https://youtu.be/...]</code> or <code>ID [Method] DESCRIPTION</code>.
-                                <br><br>
+                                <br>
+                                Methods:
+                                <ul>
+                                    <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>
                                 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>
@@ -182,8 +187,7 @@
                         </div>
                         <div class="selectContainer">
                             <label class="selectLabel" for="PreferredVideoQuality">Preferred YouTube Quality</label>
-                            <select is="emby-select" id="PreferredVideoQuality" name="PreferredVideoQuality"
+                            <select is="emby-select" id="PreferredVideoQuality" name="PreferredVideoQuality" class="selectLayout emby-select-withcolor emby-select">
-                                class="emby-select-withcolor emby-select">
                                 <option value="Auto">Auto (Smart)</option>
                                 <option value="Maximum">Maximum (4K+)</option>
                                 <option value="1080p">1080p</option>
@@ -285,7 +289,7 @@
                         <h2 class="sectionTitle">Content Sorting</h2>
                         <div class="selectContainer">
                             <label class="selectLabel" for="SortBy">Sort By</label>
-                            <select is="emby-select" id="SortBy" name="SortBy" class="emby-select-withcolor emby-select">
+                            <select is="emby-select" id="SortBy" name="SortBy" class="selectLayout emby-select-withcolor emby-select">
                                 <option value="Random">Random</option>
                                 <option value="Original">Original (Custom List Order)</option>
                                 <option value="PremiereDate">Premiere Date</option>
@@ -299,7 +303,7 @@
                         </div>
                         <div class="selectContainer">
                             <label class="selectLabel" for="SortOrder">Sort Order</label>
-                            <select is="emby-select" id="SortOrder" name="SortOrder" class="emby-select-withcolor emby-select">
+                            <select is="emby-select" id="SortOrder" name="SortOrder" class="selectLayout emby-select-withcolor emby-select">
                                 <option value="Ascending">Ascending</option>
                                 <option value="Descending">Descending</option>
                             </select>
@@ -332,7 +336,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
@@ -406,7 +410,7 @@
                             'ShowTrailerButton', 'AlwaysShowArrows', 'EnableKeyboardControls',
                             'EnableCustomMediaIds', 'CustomMediaIds', 'EnableLoadingScreen',
                             'EnableSeasonalContent', 'EnableClientSideSettings', 'SortBy', 'SortOrder',
-                            'PreferLocalTrailers'
+                            'PreferLocalTrailers', 'ApplyLimitsToCustomIds', 'SeasonalSections'
                         ];
 
                         keys.forEach(function (key) {
@@ -473,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.5.0.23</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

@@ -1,6 +1,6 @@
 /*
- * Jellyfin Slideshow by M0RPH3US v3.0.9
+ * Jellyfin Slideshow by M0RPH3US v4.0.1
- * Modified by CodeDevMLH v1.1.0.0
+ * Modified by CodeDevMLH
  * 
  * New features:
  * - optional Trailer background video support
@@ -14,6 +14,9 @@
  * - option to disable loading screen
  * - option to put collection (boxsets) IDs into the slideshow to display their items
  * - option to enable client-side settings (allow users to override settings locally on their device)
+ * - option to enable seasonal content (only show items that are relevant to the current season/holiday)
+ * - option to prefer local trailers (from the media item) over online sources
+ * - options to sort the content by various criteria (PremiereDate, ProductionYear, Random, Original order, etc.)
  */
 
 @import url(https://fonts.googleapis.com/css2?family=Archivo+Narrow:ital,wght@0,400..700;1,400..700&display=swap);
@@ -161,7 +164,7 @@
 
 .homeSectionsContainer {
   position: relative;
-  margin-top: 65vh;
+  top: 65vh;
   z-index: 6;
 }
 
@@ -172,6 +175,7 @@
   overflow: hidden;
   margin: 0 auto;
   pointer-events: auto;
+  outline: none;
 }
 
 #slides-container[style*="display: none"],
@@ -992,3 +996,7 @@
 .dots-container .slide-counter {
   margin: 0;
 }
+
+.layout-tv .backdrop-container{
+  top: -5%;
+}

Jellyfin.Plugin.MediaBarEnhanced/Web/mediaBarEnhanced.js

@@ -1,6 +1,6 @@
 /*
  * Jellyfin Slideshow by M0RPH3US v4.0.1
- * Modified by CodeDevMLH v1.1.0.0
+ * Modified by CodeDevMLH
  * 
  * New features:
  * - optional Trailer background video support
@@ -14,6 +14,9 @@
  * - option to disable loading screen
  * - option to put collection (boxsets) IDs into the slideshow to display their items
  * - option to enable client-side settings (allow users to override settings locally on their device)
+ * - option to enable seasonal content (only show items that are relevant to the current season/holiday)
+ * - option to prefer local trailers (from the media item) over online sources
+ * - options to sort the content by various criteria (PremiereDate, ProductionYear, Random, Original order, etc.)
  */
 
 //Core Module Configuration
@@ -54,6 +57,8 @@ const CONFIG = {
   enableClientSideSettings: false,
   sortBy: "Random",
   sortOrder: "Ascending",
+  applyLimitsToCustomIds: false,
+  seasonalSections: "[]",
 };
 
 // State management
@@ -608,7 +613,8 @@ const SlideUtils = {
     if (!container) {
       container = this.createElement("div", { 
         id: "slides-container",
-        className: "noautofocus"
+        className: "noautofocus",
+        tabIndex: "-1"
       });
       document.body.appendChild(container);
     }
@@ -737,7 +743,11 @@ const SlideUtils = {
             autoplay: 1,
             controls: 1,
             iv_load_policy: 3,
-            rel: 0
+            rel: 0,
+            playsinline: 1,
+            origin: window.location.origin,
+            widget_referrer: window.location.href,
+            enablejsapi: 1
           }
         });
       });
@@ -1333,7 +1343,7 @@ const ApiUtils = {
   /**
    * Fetches the first local trailer for an item
    * @param {string} itemId - Item ID
-   * @returns {Promise<string|null>} Stream URL or null
+   * @returns {Promise<Object|null>} Trailer data object {id, url} or null
    */
   async fetchLocalTrailer(itemId) {
     try {
@@ -1353,8 +1363,11 @@ const ApiUtils = {
         const trailer = trailers[0];
         const mediaSourceId = trailer.MediaSources && trailer.MediaSources[0] ? trailer.MediaSources[0].Id : trailer.Id;
         
-        // Construct stream URL
+        // Return object with ID and URL
-        return `${STATE.jellyfinData.serverAddress}/Videos/${trailer.Id}/stream.mp4?Static=true&mediaSourceId=${mediaSourceId}&api_key=${STATE.jellyfinData.accessToken}`;
+        return {
+            id: trailer.Id,
+            url: `${STATE.jellyfinData.serverAddress}/Videos/${trailer.Id}/stream.mp4?Static=true&mediaSourceId=${mediaSourceId}&api_key=${STATE.jellyfinData.accessToken}`
+        };
       }
       return null;
     } catch (error) {
@@ -1422,6 +1435,8 @@ 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'))) {
+        if (this._lastVisibleState !== 'player-active') {
+            this._lastVisibleState = 'player-active';
             const container = document.getElementById("slides-container");
             if (container) {
                 container.style.display = "none";
@@ -1432,6 +1447,7 @@ const VisibilityObserver = {
                 STATE.slideshow.slideInterval.stop();
             }
             SlideshowManager.stopAllPlayback();
+        }
         return;
     }
 
@@ -1446,6 +1462,12 @@ const VisibilityObserver = {
       activeTab &&
       activeTab.getAttribute("data-index") === "0";
 
+    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";
@@ -1461,13 +1483,20 @@ const VisibilityObserver = {
         }
         SlideshowManager.stopAllPlayback();
       }
+    }
   },
 
   /**
    * 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());
@@ -1566,9 +1595,25 @@ const SlideCreator = {
 
     // 1a. Custom URL override
     if (STATE.slideshow.customTrailerUrls && STATE.slideshow.customTrailerUrls[itemId]) {
-      trailerUrl = STATE.slideshow.customTrailerUrls[itemId];
+      const customValue = STATE.slideshow.customTrailerUrls[itemId];
+      
+      // Check if the custom value is a Jellyfin Item ID (GUID)
+      const guidMatch = customValue.match(/^([0-9a-f]{32})$/i);
+      
+      if (guidMatch) {
+          const videoId = guidMatch[1];
+          console.log(`Using custom local video ID for ${itemId}: ${videoId}`);
+          
+          trailerUrl = {
+              id: videoId,
+              url: `${STATE.jellyfinData.serverAddress}/Videos/${videoId}/stream.mp4?Static=true&api_key=${STATE.jellyfinData.accessToken}`
+          };
+      } else {
+          // Assume it's a standard URL (YouTube, etc.)
+          trailerUrl = customValue;
           console.log(`Using custom trailer URL for ${itemId}: ${trailerUrl}`);
       }
+    } 
     // 1b. Check Local Trailer if preferred
     else if (CONFIG.preferLocalTrailers && item.LocalTrailerCount > 0 && item.localTrailerUrl) {
          trailerUrl = item.localTrailerUrl;
@@ -1592,12 +1637,17 @@ const SlideCreator = {
       let videoId = null;
 
       try {
-        const urlObj = new URL(trailerUrl);
+        let urlToCheck = trailerUrl;
-        if (urlObj.hostname.includes('youtube.com') || urlObj.hostname.includes('youtu.be')) {
+        if (typeof trailerUrl === 'object' && trailerUrl.url) {
+            urlToCheck = trailerUrl.url;
+        }
+
+        const urlObjChecked = new URL(urlToCheck);
+        if (urlObjChecked.hostname.includes('youtube.com') || urlObjChecked.hostname.includes('youtu.be')) {
           isYoutube = true;
-          videoId = urlObj.searchParams.get('v');
+          videoId = urlObjChecked.searchParams.get('v');
-          if (!videoId && urlObj.hostname.includes('youtu.be')) {
+          if (!videoId && urlObjChecked.hostname.includes('youtu.be')) {
-            videoId = urlObj.pathname.substring(1);
+            videoId = urlObjChecked.pathname.substring(1);
           }
         }
       } catch (e) {
@@ -1626,7 +1676,11 @@ const SlideCreator = {
               fs: 0,
               iv_load_policy: 3,
               rel: 0,
-              loop: 0
+              loop: 0,
+              playsinline: 1,
+              origin: window.location.origin,
+              widget_referrer: window.location.href,
+              enablejsapi: 1
             };
 
             // Determine video quality
@@ -1661,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;
@@ -1677,11 +1738,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)
@@ -1715,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();
@@ -1739,7 +1804,7 @@ const SlideCreator = {
 
         const videoAttributes = {
           className: "backdrop video-backdrop",
-          src: trailerUrl,
+          src: (typeof trailerUrl === 'object' ? trailerUrl.url : trailerUrl),
           autoplay: false,
           preload: "auto",
           loop: false,
@@ -1758,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', () => {
@@ -2030,11 +2104,20 @@ const SlideCreator = {
 
   /**
    * Creates a trailer button
-   * @param {string} url - Trailer URL
+   * @param {string|Object} trailerInfo - Trailer URL string or object {id, url}
    * @returns {HTMLElement} Trailer button element
    */
-  createTrailerButton(url) {
+  createTrailerButton(trailerInfo) {
     const trailerText = LocalizationUtils.getLocalizedString('Trailer', 'Trailer');
+    
+    let url = trailerInfo;
+    let localTrailerId = null;
+
+    if (typeof trailerInfo === 'object' && trailerInfo !== null) {
+        url = trailerInfo.url;
+        localTrailerId = trailerInfo.id;
+    }
+
     return SlideUtils.createElement("button", {
       className: "detailButton trailer-button",
       innerHTML: `<span class="material-icons">movie</span> <span class="trailer-text">${trailerText}</span>`,
@@ -2042,7 +2125,13 @@ const SlideCreator = {
       onclick: (e) => {
         e.preventDefault();
         e.stopPropagation();
+        
+        if (localTrailerId) {
+            // Play local trailer using native player
+            ApiUtils.playItem(localTrailerId);
+        } else {
             SlideUtils.openVideoModal(url);
+        }
       },
     });
   },
@@ -2187,6 +2276,16 @@ const SlideshowManager = {
     let previousVisibleSlide;
     try {
       const container = SlideUtils.getOrCreateSlidesContainer();
+      
+      const activeElement = document.activeElement;
+      let focusSelector = null;
+      if (container.contains(activeElement)) {
+          if (activeElement.classList.contains('play-button')) focusSelector = '.play-button';
+          else if (activeElement.classList.contains('detail-button')) focusSelector = '.detail-button';
+          else if (activeElement.classList.contains('favorite-button')) focusSelector = '.favorite-button';
+          else if (activeElement.classList.contains('trailer-button')) focusSelector = '.trailer-button';
+      }
+
       const totalItems = STATE.slideshow.totalItems;
 
       index = Math.max(0, Math.min(index, totalItems - 1));
@@ -2215,91 +2314,27 @@ const SlideshowManager = {
 
       currentSlide.classList.add("active");
       
+      // Restore focus for TV mode navigation continuity
+      requestAnimationFrame(() => {
+        if (focusSelector) {
+          const target = currentSlide.querySelector(focusSelector);
+          if (target) {
+            target.focus();
+            return;
+          }
+        }
+        // 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 });
+        }
+      });
+
       // Manage Video Playback: Stop others, Play current
-
+      this.pauseOtherVideos(currentItemId);
-      // 1. Pause all other YouTube players
+      this.playCurrentVideo(currentSlide, currentItemId);
-      if (STATE.slideshow.videoPlayers) {
-        Object.keys(STATE.slideshow.videoPlayers).forEach(id => {
-          if (id !== currentItemId) {
-            const p = STATE.slideshow.videoPlayers[id];
-            if (p && typeof p.pauseVideo === 'function') {
-              p.pauseVideo();
-            }
-          }
-        });
-      }
-
-      // 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();
-        }
-      });
-
-      // 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();
-          }
-        }
-      }
 
       const enableAnimations = MediaBarEnhancedSettingsManager.getSetting('slideAnimations', CONFIG.slideAnimationEnabled);
 
@@ -2308,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;
@@ -2391,17 +2427,19 @@ 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;
+    // 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);
+    // Preload previous slides
-
+    for (let i = 1; i <= preloadCount; i++) {
-    if (preloadCount > 1) {
+        const prevIndex = (currentIndex - i + totalItems) % totalItems;
-      const prevIndex = (currentIndex - 1 + totalItems) % totalItems;
         const prevItemId = STATE.slideshow.itemIds[prevIndex];
-
         SlideCreator.createSlideForItemId(prevItemId);
     }
   },
@@ -2431,12 +2469,20 @@ 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);
       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]) {
@@ -2455,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() {
@@ -2577,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
@@ -2606,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);
         }
       });
     }
@@ -2631,18 +2804,24 @@ const SlideshowManager = {
     const currentSlide = document.querySelector(`.slide[data-item-id="${currentItemId}"]`);
     if (!currentSlide) return;
 
-    // 1. Try YouTube Player
+    // YouTube player: just resume, don't reload
-    const ytPlayer = STATE.slideshow.videoPlayers[currentItemId];
+    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
+    // HTML5 video: just resume, don't reset currentTime
-    const html5Video = currentSlide.querySelector('video');
+    const html5Video = currentSlide.querySelector('video.video-backdrop');
     if (html5Video) {
-      if (STATE.slideshow.isMuted) {
+      html5Video.muted = STATE.slideshow.isMuted;
-        html5Video.muted = true;
+      if (!STATE.slideshow.isMuted) html5Video.volume = 0.4;
-      }
       html5Video.play().catch(e => console.warn("Error resuming HTML5 video:", e));
     }
   },
@@ -2705,50 +2884,63 @@ const SlideshowManager = {
       }
 
       const activeElement = document.activeElement;
-      const isTvMode = window.layoutManager && window.layoutManager.tv;
+      const isTvDevice = window.browser && window.browser.tv;
-      const isSlideshowFocused = container.contains(activeElement) || activeElement === container || (!isTvMode && activeElement === document.body);
+      const isTvLayout = window.layoutManager && window.layoutManager.tv;
+      const hasTvClass = document.documentElement.classList.contains('layout-tv') || document.body.classList.contains('layout-tv');
+      const isTvMode = isTvDevice || isTvLayout || hasTvClass;
 
+      // Check Focus State
+      const isBodyFocused = activeElement === document.body;
+      const hasDirectFocus = container.contains(activeElement) || activeElement === container;
+      
+      // 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)
+      let canControlSlideshow = isTvMode ? hasDirectFocus : (hasDirectFocus || isBodyFocused);
+
+      // Check for Input Fields (always ignore typing)
       const isInputElement = activeElement && (activeElement.tagName === 'INPUT' || activeElement.tagName === 'TEXTAREA' || activeElement.isContentEditable);
+      if (isInputElement) return;
 
-      if (isInputElement) {
+      // Check active video players (ignore if video is playing/overlay is open)
-        return;
-      }
-
-      // Check if video player is open
       const videoPlayer = document.querySelector('.videoPlayerContainer');
       const trailerPlayer = document.querySelector('.youtubePlayerContainer');
-      if ((videoPlayer && !videoPlayer.classList.contains('hide')) || (trailerPlayer && !trailerPlayer.classList.contains('hide'))) {
+      const isVideoOpen = (videoPlayer && !videoPlayer.classList.contains('hide')) || (trailerPlayer && !trailerPlayer.classList.contains('hide'));
-          return;
+      if (isVideoOpen) return;
-      }
 
       switch (e.key) {
         case "ArrowRight":
-          if (isTvMode && !isSlideshowFocused) return;
+          if (canControlSlideshow) {
             SlideshowManager.nextSlide();
             e.preventDefault();
+          }
           break;
 
         case "ArrowLeft":
-          if (isTvMode && !isSlideshowFocused) return;
+          if (canControlSlideshow) {
             SlideshowManager.prevSlide();
             e.preventDefault();
+          }
           break;
 
         case " ": // Space bar
-          if (isTvMode && !isSlideshowFocused) return;
+          if (canControlSlideshow) {
             this.togglePause();
             e.preventDefault();
+          }
           break;
 
         case "m": // Mute toggle
         case "M":
-          if (isTvMode && !isSlideshowFocused) return;
+          if (canControlSlideshow) {
             this.toggleMute();
             e.preventDefault();
+          }
           break;
 
         case "Enter":
-          if (!isSlideshowFocused) return;
+          // Enter always requires direct focus on the slideshow to avoid conflicts
+          if (hasDirectFocus) {
             const currentItemId = STATE.slideshow.itemIds[STATE.slideshow.currentSlideIndex];
             if (currentItemId) {
                if (window.Emby && window.Emby.Page) {
@@ -2760,6 +2952,7 @@ const SlideshowManager = {
                }
             }
             e.preventDefault();
+          }
           break;
       }
     });
@@ -2921,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;
@@ -2940,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)
@@ -3319,76 +3518,70 @@ const MediaBarEnhancedSettingsManager = {
  * Initialize page visibility handling to pause when tab is inactive
  */
 const initPageVisibilityHandler = () => {
-  let wasVideoPlayingBeforeHide = false;
-
   document.addEventListener("visibilitychange", () => {
-    if (document.hidden) {
+    const isVideoPlayerOpen = document.querySelector('.videoPlayerContainer:not(.hide)') ||
-      console.log("Tab inactive - pausing slideshow and videos");
+      document.querySelector('.youtubePlayerContainer:not(.hide)');
-      wasVideoPlayingBeforeHide = STATE.slideshow.isVideoPlaying;
 
+    if (document.hidden) {
+      // Stop slide timer
       if (STATE.slideshow.slideInterval) {
         STATE.slideshow.slideInterval.stop();
       }
 
-      // Pause active video if playing
+      if (isVideoPlayerOpen) {
-      const currentItemId = STATE.slideshow.itemIds[STATE.slideshow.currentSlideIndex];
+        // 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); }
+            }
+          });
+        }
+
+        // Pause only the current video
         if (currentItemId) {
-        // YouTube
+          const player = STATE.slideshow.videoPlayers?.[currentItemId];
-        if (STATE.slideshow.videoPlayers && STATE.slideshow.videoPlayers[currentItemId]) {
+          if (player) {
-          const player = STATE.slideshow.videoPlayers[currentItemId];
-          if (typeof player.pauseVideo === "function") {
             try {
+              if (typeof player.pauseVideo === 'function') {
                 player.pauseVideo();
-              STATE.slideshow.isVideoPlaying = false;
+              } else if (player.tagName === 'VIDEO') {
-            } catch (e) {
-              console.warn("Error pausing video on tab hide:", e);
-            }
-          } else if (player.tagName === 'VIDEO') { // HTML5 Video
                 player.pause();
-             STATE.slideshow.isVideoPlaying = false;
+              }
+            } catch (e) { console.warn("Error pausing video on tab hide:", e); }
           }
         }
       }
     } else {
-      console.log("Tab active - resuming slideshow");
+      console.log("Tab active. Resuming slideshow");
-      if (!STATE.slideshow.isPaused) {
+      const isOnHome = window.location.hash === "#/home.html" || window.location.hash === "#/home";
-        const currentItemId = STATE.slideshow.itemIds[STATE.slideshow.currentSlideIndex];
 
-        if (wasVideoPlayingBeforeHide && currentItemId && STATE.slideshow.videoPlayers && STATE.slideshow.videoPlayers[currentItemId]) {
+      if (isOnHome && !STATE.slideshow.isPaused && !isVideoPlayerOpen) {
-          const player = STATE.slideshow.videoPlayers[currentItemId];
+        SlideshowManager.resumeActivePlayback();
 
-          // YouTube
+        if (STATE.slideshow.slideInterval && !CONFIG.waitForTrailerToEnd) {
-          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();
-             }
-          }
-        }
-        wasVideoPlayingBeforeHide = false;
-      }
     }
   });
 };

manifest.json

@@ -9,12 +9,36 @@
     "imageUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/raw/branch/main/logo.png",
     "versions": [
       {
-        "version": "1.5.0.23",
+        "version": "1.6.1.8",
-        "changelog": "- fix: Keyboard controls in TV mode\n- Add sorting options for content\n- Update mediaBarEnhanced.js and mediaBarEnhanced.css with version 4.0.1 from original repo",
+        "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.5.0.23/Jellyfin.Plugin.MediaBarEnhanced.zip",
+        "sourceUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/releases/download/v1.6.1.8/Jellyfin.Plugin.MediaBarEnhanced.zip",
-        "checksum": "f4d3c0e717b1662dbfa3831a71827505",
+        "checksum": "96db191473dc77edead21e8230c1115b",
-        "timestamp": "2026-02-09T23:34:10Z"
+        "timestamp": "2026-02-12T23:51:47Z"
+      },
+      {
+        "version": "1.6.0.2",
+        "changelog": "- add local trailer support on trailer button\nfix: iOS/MacOS playback issue?",
+        "targetAbi": "10.11.0.0",
+        "sourceUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/releases/download/v1.6.0.2/Jellyfin.Plugin.MediaBarEnhanced.zip",
+        "checksum": "cdd0208f8cc4f4b04f50e7138e508370",
+        "timestamp": "2026-02-10T22:07:33Z"
+      },
+      {
+        "version": "1.5.1.3",
+        "changelog": "- fix: iOS/MacOS playback issue?",
+        "targetAbi": "10.11.0.0",
+        "sourceUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/releases/download/v1.5.1.3/Jellyfin.Plugin.MediaBarEnhanced.zip",
+        "checksum": "9d9dbed453673d4b78acf2adaaaee126",
+        "timestamp": "2026-02-10T20:12:59Z"
+      },
+      {
+        "version": "1.5.0.28",
+        "changelog": "- fix: Keyboard controls in TV mode\n- Add sorting options for content\n- Add local trailer support\n- fix performance issue\n- Update mediaBarEnhanced.js and mediaBarEnhanced.css with version 4.0.1 from upstream repo",
+        "targetAbi": "10.11.0.0",
+        "sourceUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/releases/download/v1.5.0.28/Jellyfin.Plugin.MediaBarEnhanced.zip",
+        "checksum": "0261ff27be18d48cefa5078706954240",
+        "timestamp": "2026-02-10T00:35:41Z"
       },
       {
         "version": "1.3.0.3",