A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
merge: remote-tracking branch 'origin' into feature/audio-spectograph
aminnausin1d946e8e35b5
diff --cc resources/js/components/video/VideoPlayer.vueindex 9e8b8c26,274e4cff..97cf3a98--- a/resources/js/components/video/VideoPlayer.vue+++ b/resources/js/components/video/VideoPlayer.vue@@@ -26,9 -26,11 +26,12 @@@ import { FLAGS } from '@/config/featureimport VideoControlWrapper from '@/components/video/VideoControlWrapper.vue';import VideoPopoverSlider from '@/components/video/VideoPopoverSlider.vue';+import AudioSpectrograph from '@/components/audio/AudioSpectrograph.vue';import VideoPopoverItem from '@/components/video/VideoPopoverItem.vue';+ import PlayerSubtitles from '@/components/video/subtitles/PlayerSubtitles.vue';import VideoPartyPanel from '@/components/video/VideoPartyPanel.vue';+ import PlayerSkipIntro from '@/components/video/PlayerSkipIntro.vue';+ import PlayerBackdrop from '@/components/video/PlayerBackdrop.vue';import VideoTimeline from '@/components/video/VideoTimeline.vue';import VideoHeatmap from '@/components/video/VideoHeatmap.vue';import VideoPopover from '@/components/video/VideoPopover.vue';@@@ -1607,19 -1817,11 +1818,15 @@@ defineExpose(v-show="(isAudio || stateFolder.is_majority_audio) && isShowingLyrics"></div></Transition>- </section>- <section style="z-index: 4" :class="['pointer-events-none absolute bottom-0 w-full transition-all duration-400', { '': isShowingControls }]">+ </div>+++ <div style="z-index: 4" :class="['pointer-events-none absolute bottom-0 w-full transition-all duration-400', { '': isShowingControls }]">+ <AudioSpectrograph v-if="player" />- </section>- <!-- Is a blurred copy of the thumbnail or poster as a backdrop to the clear poster -->- <div- v-if="isAudio"- id="audio-poster"- class="absolute top-0 left-0 flex h-full w-full cursor-pointer items-center justify-center blur-sm"- :style="`background: transparent url('${audioPoster}') 50% 50% / cover no-repeat;`"- ></div>- <div class="absolute top-0 left-0 h-full w-full" v-show="isFullScreen">- <ToastController :teleport-disabled="true" :position="'bottom-left'" />++ </div>+++ <div class="pointer-events-none absolute top-0 left-0 h-full w-full" v-show="isFullScreen || isTheatreView">+ <GlobalModal :teleport-disabled="true" v-if="isFullScreen || isTheatreView" />+ <ToastController :teleport-disabled="true" :position="'bottom-left'" v-if="isFullScreen || isTheatreView" /><ContextMenuref="contextMenu":items="contextMenuItems"