Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
10f2a38add | ||
|
|
9bfa3ba5ea | ||
|
|
5c00c07b8a |
@@ -12,7 +12,7 @@
|
|||||||
<!-- <TreatWarningsAsErrors>false</TreatWarningsAsErrors> -->
|
<!-- <TreatWarningsAsErrors>false</TreatWarningsAsErrors> -->
|
||||||
<Title>Jellyfin Media Bar Enhanced Plugin</Title>
|
<Title>Jellyfin Media Bar Enhanced Plugin</Title>
|
||||||
<Authors>CodeDevMLH</Authors>
|
<Authors>CodeDevMLH</Authors>
|
||||||
<Version>1.6.1.25</Version>
|
<Version>1.6.1.26</Version>
|
||||||
<RepositoryUrl>https://github.com/CodeDevMLH/jellyfin-plugin-media-bar-enhanced</RepositoryUrl>
|
<RepositoryUrl>https://github.com/CodeDevMLH/jellyfin-plugin-media-bar-enhanced</RepositoryUrl>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
|||||||
@@ -1758,11 +1758,7 @@ const SlideCreator = {
|
|||||||
},
|
},
|
||||||
'onStateChange': (event) => {
|
'onStateChange': (event) => {
|
||||||
if (event.data === YT.PlayerState.ENDED) {
|
if (event.data === YT.PlayerState.ENDED) {
|
||||||
if (CONFIG.waitForTrailerToEnd) {
|
SlideshowManager.nextSlide();
|
||||||
SlideshowManager.nextSlide();
|
|
||||||
} else {
|
|
||||||
event.target.playVideo(); // Loop if not waiting for end if trailer is shorter than slide duration
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
'onError': (event) => {
|
'onError': (event) => {
|
||||||
@@ -1804,15 +1800,23 @@ const SlideCreator = {
|
|||||||
STATE.slideshow.videoPlayers[itemId] = backdrop;
|
STATE.slideshow.videoPlayers[itemId] = backdrop;
|
||||||
|
|
||||||
backdrop.addEventListener('play', () => {
|
backdrop.addEventListener('play', () => {
|
||||||
|
|
||||||
|
// backdrop.addEventListener('play', (event) => {
|
||||||
|
// const slide = document.querySelector(`.slide[data-item-id="${itemId}"]`);
|
||||||
|
|
||||||
|
// if (!slide || !slide.classList.contains('active')) {
|
||||||
|
// 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) {
|
if (CONFIG.waitForTrailerToEnd && STATE.slideshow.slideInterval) {
|
||||||
STATE.slideshow.slideInterval.stop();
|
STATE.slideshow.slideInterval.stop();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
backdrop.addEventListener('ended', () => {
|
backdrop.addEventListener('ended', () => {
|
||||||
if (CONFIG.waitForTrailerToEnd) {
|
|
||||||
SlideshowManager.nextSlide();
|
SlideshowManager.nextSlide();
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
|
||||||
backdrop.addEventListener('error', () => {
|
backdrop.addEventListener('error', () => {
|
||||||
@@ -2271,9 +2275,25 @@ const SlideshowManager = {
|
|||||||
|
|
||||||
if (previousVisibleSlide) {
|
if (previousVisibleSlide) {
|
||||||
previousVisibleSlide.classList.remove("active");
|
previousVisibleSlide.classList.remove("active");
|
||||||
|
previousVisibleSlide.setAttribute("inert", "");
|
||||||
|
previousVisibleSlide.setAttribute("tabindex", "-1");
|
||||||
}
|
}
|
||||||
|
|
||||||
currentSlide.classList.add("active");
|
currentSlide.classList.add("active");
|
||||||
|
currentSlide.removeAttribute("inert");
|
||||||
|
currentSlide.setAttribute("tabindex", "0");
|
||||||
|
|
||||||
|
// Update Play/Pause Button State if it was paused
|
||||||
|
if (STATE.slideshow.isPaused) {
|
||||||
|
STATE.slideshow.isPaused = false;
|
||||||
|
const pauseButton = document.querySelector('.pause-button');
|
||||||
|
if (pauseButton) {
|
||||||
|
pauseButton.innerHTML = '<i class="material-icons">pause</i>';
|
||||||
|
const pauseLabel = LocalizationUtils.getLocalizedString('ButtonPause', 'Pause');
|
||||||
|
pauseButton.setAttribute("aria-label", pauseLabel);
|
||||||
|
pauseButton.setAttribute("title", pauseLabel);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Manage Video Playback: Stop others, Play current
|
// Manage Video Playback: Stop others, Play current
|
||||||
|
|
||||||
@@ -2293,6 +2313,7 @@ const SlideshowManager = {
|
|||||||
document.querySelectorAll('video').forEach(video => {
|
document.querySelectorAll('video').forEach(video => {
|
||||||
if (!video.closest(`.slide[data-item-id="${currentItemId}"]`)) {
|
if (!video.closest(`.slide[data-item-id="${currentItemId}"]`)) {
|
||||||
video.pause();
|
video.pause();
|
||||||
|
video.muted = true;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -2394,7 +2415,8 @@ const SlideshowManager = {
|
|||||||
this.updateDots();
|
this.updateDots();
|
||||||
|
|
||||||
// Only restart interval if we are NOT waiting for a video to end
|
// Only restart interval if we are NOT waiting for a video to end
|
||||||
const hasVideo = currentSlide.querySelector('.video-backdrop');
|
const hasVideo = currentSlide.querySelector('.video-backdrop') ||
|
||||||
|
(STATE.slideshow.videoPlayers && STATE.slideshow.videoPlayers[currentItemId]);
|
||||||
if (STATE.slideshow.slideInterval && !STATE.slideshow.isPaused) {
|
if (STATE.slideshow.slideInterval && !STATE.slideshow.isPaused) {
|
||||||
if (CONFIG.waitForTrailerToEnd && hasVideo) {
|
if (CONFIG.waitForTrailerToEnd && hasVideo) {
|
||||||
STATE.slideshow.slideInterval.stop();
|
STATE.slideshow.slideInterval.stop();
|
||||||
@@ -2454,20 +2476,24 @@ const SlideshowManager = {
|
|||||||
const totalItems = STATE.slideshow.totalItems;
|
const totalItems = STATE.slideshow.totalItems;
|
||||||
const preloadCount = Math.min(Math.max(CONFIG.preloadCount || 1, 1), 5);
|
const preloadCount = Math.min(Math.max(CONFIG.preloadCount || 1, 1), 5);
|
||||||
const preloadedIds = new Set();
|
const preloadedIds = new Set();
|
||||||
|
|
||||||
// Preload next slides
|
// Preload next slides
|
||||||
for (let i = 1; i <= preloadCount; i++) {
|
for (let i = 1; i <= preloadCount; i++) {
|
||||||
const nextIndex = (currentIndex + i) % totalItems;
|
const nextIndex = (currentIndex + i) % totalItems;
|
||||||
if (nextIndex === currentIndex) break;
|
if (nextIndex === currentIndex) break;
|
||||||
|
|
||||||
const itemId = STATE.slideshow.itemIds[nextIndex];
|
const itemId = STATE.slideshow.itemIds[nextIndex];
|
||||||
if (!preloadedIds.has(itemId)) {
|
if (!preloadedIds.has(itemId)) {
|
||||||
preloadedIds.add(itemId);
|
preloadedIds.add(itemId);
|
||||||
SlideCreator.createSlideForItemId(itemId);
|
SlideCreator.createSlideForItemId(itemId);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Preload previous slides
|
// Preload previous slides
|
||||||
for (let i = 1; i <= preloadCount; i++) {
|
for (let i = 1; i <= preloadCount; i++) {
|
||||||
const prevIndex = (currentIndex - i + totalItems) % totalItems;
|
const prevIndex = (currentIndex - i + totalItems) % totalItems;
|
||||||
if (prevIndex === currentIndex) break;
|
if (prevIndex === currentIndex) break;
|
||||||
|
|
||||||
const prevItemId = STATE.slideshow.itemIds[prevIndex];
|
const prevItemId = STATE.slideshow.itemIds[prevIndex];
|
||||||
if (!preloadedIds.has(prevItemId)) {
|
if (!preloadedIds.has(prevItemId)) {
|
||||||
preloadedIds.add(prevItemId);
|
preloadedIds.add(prevItemId);
|
||||||
@@ -2724,18 +2750,24 @@ const SlideshowManager = {
|
|||||||
const currentSlide = document.querySelector(`.slide[data-item-id="${currentItemId}"]`);
|
const currentSlide = document.querySelector(`.slide[data-item-id="${currentItemId}"]`);
|
||||||
if (!currentSlide) return;
|
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 (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();
|
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 (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));
|
html5Video.play().catch(e => console.warn("Error resuming HTML5 video:", e));
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -9,12 +9,12 @@
|
|||||||
"imageUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/raw/branch/main/logo.png",
|
"imageUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/raw/branch/main/logo.png",
|
||||||
"versions": [
|
"versions": [
|
||||||
{
|
{
|
||||||
"version": "1.6.1.25",
|
"version": "1.6.1.27",
|
||||||
"changelog": "- fix tv mode issue\n- refactor video playback management",
|
"changelog": "- fix tv mode issue\n- refactor video playback management",
|
||||||
"targetAbi": "10.11.0.0",
|
"targetAbi": "10.11.0.0",
|
||||||
"sourceUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/releases/download/v1.6.1.25/Jellyfin.Plugin.MediaBarEnhanced.zip",
|
"sourceUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/releases/download/v1.6.1.27/Jellyfin.Plugin.MediaBarEnhanced.zip",
|
||||||
"checksum": "283886aa51ccd1d40f057b65617b7ea4",
|
"checksum": "44b532e881c7ed128d6e76e387f41710",
|
||||||
"timestamp": "2026-02-14T02:21:14Z"
|
"timestamp": "2026-02-14T14:22:58Z"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"version": "1.6.0.2",
|
"version": "1.6.0.2",
|
||||||
|
|||||||
Reference in New Issue
Block a user