From 05671db391b58abebcd4ca7de1a736c79cad048b Mon Sep 17 00:00:00 2001 From: Felix Boehme Date: Thu, 31 Aug 2023 18:32:46 +0200 Subject: [PATCH 01/10] Improved Chromecast integration --- .../actions/CaptionRendererAction.tsx | 3 + .../components/actions/ProgressAction.tsx | 3 +- .../state/providers/castingStateProvider.ts | 65 +++++++++++++++++-- 3 files changed, 66 insertions(+), 5 deletions(-) diff --git a/src/video/components/actions/CaptionRendererAction.tsx b/src/video/components/actions/CaptionRendererAction.tsx index 8858ee28..343bdbaf 100644 --- a/src/video/components/actions/CaptionRendererAction.tsx +++ b/src/video/components/actions/CaptionRendererAction.tsx @@ -5,6 +5,7 @@ import { ContentCaption } from "subsrt-ts/dist/types/handler"; import { parseSubtitles, sanitize } from "@/backend/helpers/captions"; import { Transition } from "@/components/Transition"; import { useSettings } from "@/state/settings"; +import { getPlayerState } from "@/video/state/cache"; import { useVideoPlayerDescriptor } from "../../state/hooks"; import { useProgress } from "../../state/logic/progress"; @@ -52,6 +53,7 @@ export function CaptionRendererAction({ const videoTime = useProgress(descriptor).time; const { captionSettings, setCaptionDelay } = useSettings(); const captions = useRef([]); + const casting = getPlayerState(descriptor).casting.isCasting; const captionSetRef = useRef<(delay: number) => void>(setCaptionDelay); useEffect(() => { @@ -96,6 +98,7 @@ export function CaptionRendererAction({ }, [] ); + if (casting) return null; if (!captions.current.length) return null; const visibileCaptions = captions.current.filter(({ start, end }) => isVisible(start, end, captionSettings.delay, videoTime) diff --git a/src/video/components/actions/ProgressAction.tsx b/src/video/components/actions/ProgressAction.tsx index 17e081e6..5d8f4682 100644 --- a/src/video/components/actions/ProgressAction.tsx +++ b/src/video/components/actions/ProgressAction.tsx @@ -22,6 +22,7 @@ export function ProgressAction() { const controlRef = useRef(controls); const [hoverPosition, setHoverPosition] = useState(0); const [isThumbnailVisible, setIsThumbnailVisible] = useState(false); + const casting = getPlayerState(descriptor).casting; const onMouseOver = useCallback((e: MouseActivity) => { setHoverPosition(e.clientX); setIsThumbnailVisible(true); @@ -106,7 +107,7 @@ export function ProgressAction() { - {isThumbnailVisible ? ( + {isThumbnailVisible && !casting ? ( console.log("Captions cleared"), + (error) => console.log(error) + ); + updateSource(descriptor, state); } }, From 146323f817b47c7ec0aa1bfaedcf0cbd5b6ee5ef Mon Sep 17 00:00:00 2001 From: Felix Boehme Date: Thu, 31 Aug 2023 18:46:12 +0200 Subject: [PATCH 02/10] Swap out testing link --- src/video/state/providers/castingStateProvider.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/video/state/providers/castingStateProvider.ts b/src/video/state/providers/castingStateProvider.ts index 72f6639a..8c7f5746 100644 --- a/src/video/state/providers/castingStateProvider.ts +++ b/src/video/state/providers/castingStateProvider.ts @@ -153,8 +153,7 @@ export function createCastingStateProvider( 1, chrome.cast.media.TrackType.TEXT ); - subtitles.trackContentId = - "https://cc.2cdns.com/a8/d8/a8d8c98288d4db1d6404e54c644091f5/eng-9.vtt"; + subtitles.trackContentId = state.source?.caption?.url; subtitles.trackContentType = "text/vtt"; subtitles.subtype = chrome.cast.media.TextTrackType.SUBTITLES; subtitles.name = "Subtitles"; From a8662d02d4e0c556f527ab522a96ab1391b06b5b Mon Sep 17 00:00:00 2001 From: Felix Boehme Date: Thu, 31 Aug 2023 18:58:36 +0200 Subject: [PATCH 03/10] Show Thumbnail --- src/video/components/actions/ProgressAction.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/video/components/actions/ProgressAction.tsx b/src/video/components/actions/ProgressAction.tsx index 5d8f4682..82c56a8f 100644 --- a/src/video/components/actions/ProgressAction.tsx +++ b/src/video/components/actions/ProgressAction.tsx @@ -22,7 +22,7 @@ export function ProgressAction() { const controlRef = useRef(controls); const [hoverPosition, setHoverPosition] = useState(0); const [isThumbnailVisible, setIsThumbnailVisible] = useState(false); - const casting = getPlayerState(descriptor).casting; + const casting = getPlayerState(descriptor).casting.isCasting; const onMouseOver = useCallback((e: MouseActivity) => { setHoverPosition(e.clientX); setIsThumbnailVisible(true); From 2ecfe57a2e21874c0114ef1c5ea5f7d0bbf7c6f5 Mon Sep 17 00:00:00 2001 From: Felix Boehme Date: Thu, 31 Aug 2023 19:11:07 +0200 Subject: [PATCH 04/10] Renamed casting to isCasting --- src/video/components/actions/CaptionRendererAction.tsx | 4 ++-- src/video/components/actions/ProgressAction.tsx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/video/components/actions/CaptionRendererAction.tsx b/src/video/components/actions/CaptionRendererAction.tsx index 343bdbaf..a5a77a02 100644 --- a/src/video/components/actions/CaptionRendererAction.tsx +++ b/src/video/components/actions/CaptionRendererAction.tsx @@ -53,7 +53,7 @@ export function CaptionRendererAction({ const videoTime = useProgress(descriptor).time; const { captionSettings, setCaptionDelay } = useSettings(); const captions = useRef([]); - const casting = getPlayerState(descriptor).casting.isCasting; + const isCasting = getPlayerState(descriptor).casting.isCasting; const captionSetRef = useRef<(delay: number) => void>(setCaptionDelay); useEffect(() => { @@ -98,7 +98,7 @@ export function CaptionRendererAction({ }, [] ); - if (casting) return null; + if (isCasting) return null; if (!captions.current.length) return null; const visibileCaptions = captions.current.filter(({ start, end }) => isVisible(start, end, captionSettings.delay, videoTime) diff --git a/src/video/components/actions/ProgressAction.tsx b/src/video/components/actions/ProgressAction.tsx index 82c56a8f..be3d4305 100644 --- a/src/video/components/actions/ProgressAction.tsx +++ b/src/video/components/actions/ProgressAction.tsx @@ -22,7 +22,7 @@ export function ProgressAction() { const controlRef = useRef(controls); const [hoverPosition, setHoverPosition] = useState(0); const [isThumbnailVisible, setIsThumbnailVisible] = useState(false); - const casting = getPlayerState(descriptor).casting.isCasting; + const isCasting = getPlayerState(descriptor).casting.isCasting; const onMouseOver = useCallback((e: MouseActivity) => { setHoverPosition(e.clientX); setIsThumbnailVisible(true); @@ -107,7 +107,7 @@ export function ProgressAction() { - {isThumbnailVisible && !casting ? ( + {isThumbnailVisible && !isCasting ? ( Date: Thu, 31 Aug 2023 23:38:26 +0200 Subject: [PATCH 05/10] Use data url --- .../state/providers/castingStateProvider.ts | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/video/state/providers/castingStateProvider.ts b/src/video/state/providers/castingStateProvider.ts index 8c7f5746..3914d8ea 100644 --- a/src/video/state/providers/castingStateProvider.ts +++ b/src/video/state/providers/castingStateProvider.ts @@ -148,12 +148,26 @@ export function createCastingStateProvider( let captions = null; - if (state.source?.caption?.url) { + if (state.source?.caption?.id) { + let captionIndex: number | undefined; + const linkedCaptions = state.meta?.captions; + const captionId = state.source?.caption?.id; + let trackContentId = ""; + + if (linkedCaptions) { + linkedCaptions.forEach((caption, index) => { + if (!captionIndex && captionId.includes(caption.langIso)) + captionIndex = index; + }); + if (captionIndex) { + trackContentId = linkedCaptions[captionIndex].url; + } + } const subtitles = new chrome.cast.media.Track( 1, chrome.cast.media.TrackType.TEXT ); - subtitles.trackContentId = state.source?.caption?.url; + subtitles.trackContentId = trackContentId; subtitles.trackContentType = "text/vtt"; subtitles.subtype = chrome.cast.media.TextTrackType.SUBTITLES; subtitles.name = "Subtitles"; From 04f67df289ed731b3576e563d0d889db95e72333 Mon Sep 17 00:00:00 2001 From: Felix Boehme Date: Fri, 1 Sep 2023 15:03:10 +0200 Subject: [PATCH 06/10] cleaned up --- src/video/state/providers/castingStateProvider.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/video/state/providers/castingStateProvider.ts b/src/video/state/providers/castingStateProvider.ts index 3914d8ea..633a3ca2 100644 --- a/src/video/state/providers/castingStateProvider.ts +++ b/src/video/state/providers/castingStateProvider.ts @@ -151,14 +151,16 @@ export function createCastingStateProvider( if (state.source?.caption?.id) { let captionIndex: number | undefined; const linkedCaptions = state.meta?.captions; - const captionId = state.source?.caption?.id; + const captionLangIso = state.source?.caption?.id.slice(7); let trackContentId = ""; if (linkedCaptions) { - linkedCaptions.forEach((caption, index) => { - if (!captionIndex && captionId.includes(caption.langIso)) + for (let index = 0; index < linkedCaptions.length; index += 1) { + if (captionLangIso === linkedCaptions[index].langIso) { captionIndex = index; - }); + break; + } + } if (captionIndex) { trackContentId = linkedCaptions[captionIndex].url; } From e5e35c05e083d38d2dec3d12dcbd98dfc3863914 Mon Sep 17 00:00:00 2001 From: Felix Boehme Date: Sat, 2 Sep 2023 16:12:57 +0200 Subject: [PATCH 07/10] resolve merge conflicts --- src/{video => _oldvideo}/components/VideoPlayer.tsx | 0 src/{video => _oldvideo}/components/VideoPlayerBase.tsx | 0 src/{video => _oldvideo}/components/actions/AirplayAction.tsx | 0 src/{video => _oldvideo}/components/actions/BackdropAction.tsx | 0 .../components/actions/CaptionRendererAction.tsx | 0 src/{video => _oldvideo}/components/actions/CastingTextAction.tsx | 0 src/{video => _oldvideo}/components/actions/ChromecastAction.tsx | 0 src/{video => _oldvideo}/components/actions/DividerAction.tsx | 0 src/{video => _oldvideo}/components/actions/FullscreenAction.tsx | 0 src/{video => _oldvideo}/components/actions/HeaderAction.tsx | 0 .../components/actions/KeyboardShortcutsAction.tsx | 0 src/{video => _oldvideo}/components/actions/LoadingAction.tsx | 0 src/{video => _oldvideo}/components/actions/MetaAction.tsx | 0 src/{video => _oldvideo}/components/actions/MiddlePauseAction.tsx | 0 .../components/actions/MobileCenterAction.tsx | 0 src/{video => _oldvideo}/components/actions/PageTitleAction.tsx | 0 src/{video => _oldvideo}/components/actions/PauseAction.tsx | 0 .../components/actions/PictureInPictureAction.tsx | 0 src/{video => _oldvideo}/components/actions/ProgressAction.tsx | 0 .../components/actions/SeriesSelectionAction.tsx | 0 src/{video => _oldvideo}/components/actions/SettingsAction.tsx | 0 src/{video => _oldvideo}/components/actions/ShowTitleAction.tsx | 0 src/{video => _oldvideo}/components/actions/SkipTimeAction.tsx | 0 src/{video => _oldvideo}/components/actions/ThumbnailAction.tsx | 0 src/{video => _oldvideo}/components/actions/TimeAction.tsx | 0 src/{video => _oldvideo}/components/actions/VolumeAction.tsx | 0 .../components/actions/VolumeAdjustedAction.tsx | 0 .../components/actions/list-entries/CaptionsSelectionAction.tsx | 0 .../components/actions/list-entries/DownloadAction.tsx | 0 .../actions/list-entries/PlaybackSpeedSelectionAction.tsx | 0 .../components/actions/list-entries/QualityDisplayAction.tsx | 0 .../components/actions/list-entries/SourceSelectionAction.tsx | 0 .../components/controllers/MetaController.tsx | 0 .../components/controllers/ProgressListenerController.tsx | 0 .../components/controllers/SeriesController.tsx | 0 .../components/controllers/SourceController.tsx | 0 .../components/hooks/useCurrentSeriesEpisodeInfo.ts | 0 src/{video => _oldvideo}/components/hooks/useInitialized.ts | 0 src/{video => _oldvideo}/components/hooks/useSyncPopouts.ts | 0 src/{video => _oldvideo}/components/hooks/volumeStore.ts | 0 src/{video => _oldvideo}/components/internal/CastingInternal.tsx | 0 .../components/internal/ThumbnailGeneratorInternal.tsx | 0 .../components/internal/VideoElementInternal.tsx | 0 .../components/internal/WrapperRegisterInternal.tsx | 0 src/{video => _oldvideo}/components/parts/VideoErrorBoundary.tsx | 0 src/{video => _oldvideo}/components/parts/VideoPlayerError.tsx | 0 src/{video => _oldvideo}/components/parts/VideoPlayerHeader.tsx | 0 .../components/parts/VideoPlayerIconButton.tsx | 0 src/{video => _oldvideo}/components/parts/VideoPopout.tsx | 0 .../components/popouts/CaptionSelectionPopout.tsx | 0 .../components/popouts/CaptionSettingsPopout.tsx | 0 .../components/popouts/EpisodeSelectionPopout.tsx | 0 .../components/popouts/PlaybackSpeedPopout.tsx | 0 src/{video => _oldvideo}/components/popouts/PopoutAnchor.tsx | 0 .../components/popouts/PopoutProviderAction.tsx | 0 src/{video => _oldvideo}/components/popouts/PopoutUtils.tsx | 0 src/{video => _oldvideo}/components/popouts/SettingsPopout.tsx | 0 .../components/popouts/SourceSelectionPopout.tsx | 0 src/{video => _oldvideo}/state/cache.ts | 0 src/{video => _oldvideo}/state/events.ts | 0 src/{video => _oldvideo}/state/hooks.tsx | 0 src/{video => _oldvideo}/state/init.ts | 0 src/{video => _oldvideo}/state/logic/controls.ts | 0 src/{video => _oldvideo}/state/logic/error.ts | 0 src/{video => _oldvideo}/state/logic/interface.ts | 0 src/{video => _oldvideo}/state/logic/mediaplaying.ts | 0 src/{video => _oldvideo}/state/logic/meta.ts | 0 src/{video => _oldvideo}/state/logic/misc.ts | 0 src/{video => _oldvideo}/state/logic/progress.ts | 0 src/{video => _oldvideo}/state/logic/source.ts | 0 src/{video => _oldvideo}/state/providers/castingStateProvider.ts | 0 src/{video => _oldvideo}/state/providers/helpers.ts | 0 src/{video => _oldvideo}/state/providers/providerTypes.ts | 0 src/{video => _oldvideo}/state/providers/utils.ts | 0 src/{video => _oldvideo}/state/providers/videoStateProvider.ts | 0 src/{video => _oldvideo}/state/types.ts | 0 76 files changed, 0 insertions(+), 0 deletions(-) rename src/{video => _oldvideo}/components/VideoPlayer.tsx (100%) rename src/{video => _oldvideo}/components/VideoPlayerBase.tsx (100%) rename src/{video => _oldvideo}/components/actions/AirplayAction.tsx (100%) rename src/{video => _oldvideo}/components/actions/BackdropAction.tsx (100%) rename src/{video => _oldvideo}/components/actions/CaptionRendererAction.tsx (100%) rename src/{video => _oldvideo}/components/actions/CastingTextAction.tsx (100%) rename src/{video => _oldvideo}/components/actions/ChromecastAction.tsx (100%) rename src/{video => _oldvideo}/components/actions/DividerAction.tsx (100%) rename src/{video => _oldvideo}/components/actions/FullscreenAction.tsx (100%) rename src/{video => _oldvideo}/components/actions/HeaderAction.tsx (100%) rename src/{video => _oldvideo}/components/actions/KeyboardShortcutsAction.tsx (100%) rename src/{video => _oldvideo}/components/actions/LoadingAction.tsx (100%) rename src/{video => _oldvideo}/components/actions/MetaAction.tsx (100%) rename src/{video => _oldvideo}/components/actions/MiddlePauseAction.tsx (100%) rename src/{video => _oldvideo}/components/actions/MobileCenterAction.tsx (100%) rename src/{video => _oldvideo}/components/actions/PageTitleAction.tsx (100%) rename src/{video => _oldvideo}/components/actions/PauseAction.tsx (100%) rename src/{video => _oldvideo}/components/actions/PictureInPictureAction.tsx (100%) rename src/{video => _oldvideo}/components/actions/ProgressAction.tsx (100%) rename src/{video => _oldvideo}/components/actions/SeriesSelectionAction.tsx (100%) rename src/{video => _oldvideo}/components/actions/SettingsAction.tsx (100%) rename src/{video => _oldvideo}/components/actions/ShowTitleAction.tsx (100%) rename src/{video => _oldvideo}/components/actions/SkipTimeAction.tsx (100%) rename src/{video => _oldvideo}/components/actions/ThumbnailAction.tsx (100%) rename src/{video => _oldvideo}/components/actions/TimeAction.tsx (100%) rename src/{video => _oldvideo}/components/actions/VolumeAction.tsx (100%) rename src/{video => _oldvideo}/components/actions/VolumeAdjustedAction.tsx (100%) rename src/{video => _oldvideo}/components/actions/list-entries/CaptionsSelectionAction.tsx (100%) rename src/{video => _oldvideo}/components/actions/list-entries/DownloadAction.tsx (100%) rename src/{video => _oldvideo}/components/actions/list-entries/PlaybackSpeedSelectionAction.tsx (100%) rename src/{video => _oldvideo}/components/actions/list-entries/QualityDisplayAction.tsx (100%) rename src/{video => _oldvideo}/components/actions/list-entries/SourceSelectionAction.tsx (100%) rename src/{video => _oldvideo}/components/controllers/MetaController.tsx (100%) rename src/{video => _oldvideo}/components/controllers/ProgressListenerController.tsx (100%) rename src/{video => _oldvideo}/components/controllers/SeriesController.tsx (100%) rename src/{video => _oldvideo}/components/controllers/SourceController.tsx (100%) rename src/{video => _oldvideo}/components/hooks/useCurrentSeriesEpisodeInfo.ts (100%) rename src/{video => _oldvideo}/components/hooks/useInitialized.ts (100%) rename src/{video => _oldvideo}/components/hooks/useSyncPopouts.ts (100%) rename src/{video => _oldvideo}/components/hooks/volumeStore.ts (100%) rename src/{video => _oldvideo}/components/internal/CastingInternal.tsx (100%) rename src/{video => _oldvideo}/components/internal/ThumbnailGeneratorInternal.tsx (100%) rename src/{video => _oldvideo}/components/internal/VideoElementInternal.tsx (100%) rename src/{video => _oldvideo}/components/internal/WrapperRegisterInternal.tsx (100%) rename src/{video => _oldvideo}/components/parts/VideoErrorBoundary.tsx (100%) rename src/{video => _oldvideo}/components/parts/VideoPlayerError.tsx (100%) rename src/{video => _oldvideo}/components/parts/VideoPlayerHeader.tsx (100%) rename src/{video => _oldvideo}/components/parts/VideoPlayerIconButton.tsx (100%) rename src/{video => _oldvideo}/components/parts/VideoPopout.tsx (100%) rename src/{video => _oldvideo}/components/popouts/CaptionSelectionPopout.tsx (100%) rename src/{video => _oldvideo}/components/popouts/CaptionSettingsPopout.tsx (100%) rename src/{video => _oldvideo}/components/popouts/EpisodeSelectionPopout.tsx (100%) rename src/{video => _oldvideo}/components/popouts/PlaybackSpeedPopout.tsx (100%) rename src/{video => _oldvideo}/components/popouts/PopoutAnchor.tsx (100%) rename src/{video => _oldvideo}/components/popouts/PopoutProviderAction.tsx (100%) rename src/{video => _oldvideo}/components/popouts/PopoutUtils.tsx (100%) rename src/{video => _oldvideo}/components/popouts/SettingsPopout.tsx (100%) rename src/{video => _oldvideo}/components/popouts/SourceSelectionPopout.tsx (100%) rename src/{video => _oldvideo}/state/cache.ts (100%) rename src/{video => _oldvideo}/state/events.ts (100%) rename src/{video => _oldvideo}/state/hooks.tsx (100%) rename src/{video => _oldvideo}/state/init.ts (100%) rename src/{video => _oldvideo}/state/logic/controls.ts (100%) rename src/{video => _oldvideo}/state/logic/error.ts (100%) rename src/{video => _oldvideo}/state/logic/interface.ts (100%) rename src/{video => _oldvideo}/state/logic/mediaplaying.ts (100%) rename src/{video => _oldvideo}/state/logic/meta.ts (100%) rename src/{video => _oldvideo}/state/logic/misc.ts (100%) rename src/{video => _oldvideo}/state/logic/progress.ts (100%) rename src/{video => _oldvideo}/state/logic/source.ts (100%) rename src/{video => _oldvideo}/state/providers/castingStateProvider.ts (100%) rename src/{video => _oldvideo}/state/providers/helpers.ts (100%) rename src/{video => _oldvideo}/state/providers/providerTypes.ts (100%) rename src/{video => _oldvideo}/state/providers/utils.ts (100%) rename src/{video => _oldvideo}/state/providers/videoStateProvider.ts (100%) rename src/{video => _oldvideo}/state/types.ts (100%) diff --git a/src/video/components/VideoPlayer.tsx b/src/_oldvideo/components/VideoPlayer.tsx similarity index 100% rename from src/video/components/VideoPlayer.tsx rename to src/_oldvideo/components/VideoPlayer.tsx diff --git a/src/video/components/VideoPlayerBase.tsx b/src/_oldvideo/components/VideoPlayerBase.tsx similarity index 100% rename from src/video/components/VideoPlayerBase.tsx rename to src/_oldvideo/components/VideoPlayerBase.tsx diff --git a/src/video/components/actions/AirplayAction.tsx b/src/_oldvideo/components/actions/AirplayAction.tsx similarity index 100% rename from src/video/components/actions/AirplayAction.tsx rename to src/_oldvideo/components/actions/AirplayAction.tsx diff --git a/src/video/components/actions/BackdropAction.tsx b/src/_oldvideo/components/actions/BackdropAction.tsx similarity index 100% rename from src/video/components/actions/BackdropAction.tsx rename to src/_oldvideo/components/actions/BackdropAction.tsx diff --git a/src/video/components/actions/CaptionRendererAction.tsx b/src/_oldvideo/components/actions/CaptionRendererAction.tsx similarity index 100% rename from src/video/components/actions/CaptionRendererAction.tsx rename to src/_oldvideo/components/actions/CaptionRendererAction.tsx diff --git a/src/video/components/actions/CastingTextAction.tsx b/src/_oldvideo/components/actions/CastingTextAction.tsx similarity index 100% rename from src/video/components/actions/CastingTextAction.tsx rename to src/_oldvideo/components/actions/CastingTextAction.tsx diff --git a/src/video/components/actions/ChromecastAction.tsx b/src/_oldvideo/components/actions/ChromecastAction.tsx similarity index 100% rename from src/video/components/actions/ChromecastAction.tsx rename to src/_oldvideo/components/actions/ChromecastAction.tsx diff --git a/src/video/components/actions/DividerAction.tsx b/src/_oldvideo/components/actions/DividerAction.tsx similarity index 100% rename from src/video/components/actions/DividerAction.tsx rename to src/_oldvideo/components/actions/DividerAction.tsx diff --git a/src/video/components/actions/FullscreenAction.tsx b/src/_oldvideo/components/actions/FullscreenAction.tsx similarity index 100% rename from src/video/components/actions/FullscreenAction.tsx rename to src/_oldvideo/components/actions/FullscreenAction.tsx diff --git a/src/video/components/actions/HeaderAction.tsx b/src/_oldvideo/components/actions/HeaderAction.tsx similarity index 100% rename from src/video/components/actions/HeaderAction.tsx rename to src/_oldvideo/components/actions/HeaderAction.tsx diff --git a/src/video/components/actions/KeyboardShortcutsAction.tsx b/src/_oldvideo/components/actions/KeyboardShortcutsAction.tsx similarity index 100% rename from src/video/components/actions/KeyboardShortcutsAction.tsx rename to src/_oldvideo/components/actions/KeyboardShortcutsAction.tsx diff --git a/src/video/components/actions/LoadingAction.tsx b/src/_oldvideo/components/actions/LoadingAction.tsx similarity index 100% rename from src/video/components/actions/LoadingAction.tsx rename to src/_oldvideo/components/actions/LoadingAction.tsx diff --git a/src/video/components/actions/MetaAction.tsx b/src/_oldvideo/components/actions/MetaAction.tsx similarity index 100% rename from src/video/components/actions/MetaAction.tsx rename to src/_oldvideo/components/actions/MetaAction.tsx diff --git a/src/video/components/actions/MiddlePauseAction.tsx b/src/_oldvideo/components/actions/MiddlePauseAction.tsx similarity index 100% rename from src/video/components/actions/MiddlePauseAction.tsx rename to src/_oldvideo/components/actions/MiddlePauseAction.tsx diff --git a/src/video/components/actions/MobileCenterAction.tsx b/src/_oldvideo/components/actions/MobileCenterAction.tsx similarity index 100% rename from src/video/components/actions/MobileCenterAction.tsx rename to src/_oldvideo/components/actions/MobileCenterAction.tsx diff --git a/src/video/components/actions/PageTitleAction.tsx b/src/_oldvideo/components/actions/PageTitleAction.tsx similarity index 100% rename from src/video/components/actions/PageTitleAction.tsx rename to src/_oldvideo/components/actions/PageTitleAction.tsx diff --git a/src/video/components/actions/PauseAction.tsx b/src/_oldvideo/components/actions/PauseAction.tsx similarity index 100% rename from src/video/components/actions/PauseAction.tsx rename to src/_oldvideo/components/actions/PauseAction.tsx diff --git a/src/video/components/actions/PictureInPictureAction.tsx b/src/_oldvideo/components/actions/PictureInPictureAction.tsx similarity index 100% rename from src/video/components/actions/PictureInPictureAction.tsx rename to src/_oldvideo/components/actions/PictureInPictureAction.tsx diff --git a/src/video/components/actions/ProgressAction.tsx b/src/_oldvideo/components/actions/ProgressAction.tsx similarity index 100% rename from src/video/components/actions/ProgressAction.tsx rename to src/_oldvideo/components/actions/ProgressAction.tsx diff --git a/src/video/components/actions/SeriesSelectionAction.tsx b/src/_oldvideo/components/actions/SeriesSelectionAction.tsx similarity index 100% rename from src/video/components/actions/SeriesSelectionAction.tsx rename to src/_oldvideo/components/actions/SeriesSelectionAction.tsx diff --git a/src/video/components/actions/SettingsAction.tsx b/src/_oldvideo/components/actions/SettingsAction.tsx similarity index 100% rename from src/video/components/actions/SettingsAction.tsx rename to src/_oldvideo/components/actions/SettingsAction.tsx diff --git a/src/video/components/actions/ShowTitleAction.tsx b/src/_oldvideo/components/actions/ShowTitleAction.tsx similarity index 100% rename from src/video/components/actions/ShowTitleAction.tsx rename to src/_oldvideo/components/actions/ShowTitleAction.tsx diff --git a/src/video/components/actions/SkipTimeAction.tsx b/src/_oldvideo/components/actions/SkipTimeAction.tsx similarity index 100% rename from src/video/components/actions/SkipTimeAction.tsx rename to src/_oldvideo/components/actions/SkipTimeAction.tsx diff --git a/src/video/components/actions/ThumbnailAction.tsx b/src/_oldvideo/components/actions/ThumbnailAction.tsx similarity index 100% rename from src/video/components/actions/ThumbnailAction.tsx rename to src/_oldvideo/components/actions/ThumbnailAction.tsx diff --git a/src/video/components/actions/TimeAction.tsx b/src/_oldvideo/components/actions/TimeAction.tsx similarity index 100% rename from src/video/components/actions/TimeAction.tsx rename to src/_oldvideo/components/actions/TimeAction.tsx diff --git a/src/video/components/actions/VolumeAction.tsx b/src/_oldvideo/components/actions/VolumeAction.tsx similarity index 100% rename from src/video/components/actions/VolumeAction.tsx rename to src/_oldvideo/components/actions/VolumeAction.tsx diff --git a/src/video/components/actions/VolumeAdjustedAction.tsx b/src/_oldvideo/components/actions/VolumeAdjustedAction.tsx similarity index 100% rename from src/video/components/actions/VolumeAdjustedAction.tsx rename to src/_oldvideo/components/actions/VolumeAdjustedAction.tsx diff --git a/src/video/components/actions/list-entries/CaptionsSelectionAction.tsx b/src/_oldvideo/components/actions/list-entries/CaptionsSelectionAction.tsx similarity index 100% rename from src/video/components/actions/list-entries/CaptionsSelectionAction.tsx rename to src/_oldvideo/components/actions/list-entries/CaptionsSelectionAction.tsx diff --git a/src/video/components/actions/list-entries/DownloadAction.tsx b/src/_oldvideo/components/actions/list-entries/DownloadAction.tsx similarity index 100% rename from src/video/components/actions/list-entries/DownloadAction.tsx rename to src/_oldvideo/components/actions/list-entries/DownloadAction.tsx diff --git a/src/video/components/actions/list-entries/PlaybackSpeedSelectionAction.tsx b/src/_oldvideo/components/actions/list-entries/PlaybackSpeedSelectionAction.tsx similarity index 100% rename from src/video/components/actions/list-entries/PlaybackSpeedSelectionAction.tsx rename to src/_oldvideo/components/actions/list-entries/PlaybackSpeedSelectionAction.tsx diff --git a/src/video/components/actions/list-entries/QualityDisplayAction.tsx b/src/_oldvideo/components/actions/list-entries/QualityDisplayAction.tsx similarity index 100% rename from src/video/components/actions/list-entries/QualityDisplayAction.tsx rename to src/_oldvideo/components/actions/list-entries/QualityDisplayAction.tsx diff --git a/src/video/components/actions/list-entries/SourceSelectionAction.tsx b/src/_oldvideo/components/actions/list-entries/SourceSelectionAction.tsx similarity index 100% rename from src/video/components/actions/list-entries/SourceSelectionAction.tsx rename to src/_oldvideo/components/actions/list-entries/SourceSelectionAction.tsx diff --git a/src/video/components/controllers/MetaController.tsx b/src/_oldvideo/components/controllers/MetaController.tsx similarity index 100% rename from src/video/components/controllers/MetaController.tsx rename to src/_oldvideo/components/controllers/MetaController.tsx diff --git a/src/video/components/controllers/ProgressListenerController.tsx b/src/_oldvideo/components/controllers/ProgressListenerController.tsx similarity index 100% rename from src/video/components/controllers/ProgressListenerController.tsx rename to src/_oldvideo/components/controllers/ProgressListenerController.tsx diff --git a/src/video/components/controllers/SeriesController.tsx b/src/_oldvideo/components/controllers/SeriesController.tsx similarity index 100% rename from src/video/components/controllers/SeriesController.tsx rename to src/_oldvideo/components/controllers/SeriesController.tsx diff --git a/src/video/components/controllers/SourceController.tsx b/src/_oldvideo/components/controllers/SourceController.tsx similarity index 100% rename from src/video/components/controllers/SourceController.tsx rename to src/_oldvideo/components/controllers/SourceController.tsx diff --git a/src/video/components/hooks/useCurrentSeriesEpisodeInfo.ts b/src/_oldvideo/components/hooks/useCurrentSeriesEpisodeInfo.ts similarity index 100% rename from src/video/components/hooks/useCurrentSeriesEpisodeInfo.ts rename to src/_oldvideo/components/hooks/useCurrentSeriesEpisodeInfo.ts diff --git a/src/video/components/hooks/useInitialized.ts b/src/_oldvideo/components/hooks/useInitialized.ts similarity index 100% rename from src/video/components/hooks/useInitialized.ts rename to src/_oldvideo/components/hooks/useInitialized.ts diff --git a/src/video/components/hooks/useSyncPopouts.ts b/src/_oldvideo/components/hooks/useSyncPopouts.ts similarity index 100% rename from src/video/components/hooks/useSyncPopouts.ts rename to src/_oldvideo/components/hooks/useSyncPopouts.ts diff --git a/src/video/components/hooks/volumeStore.ts b/src/_oldvideo/components/hooks/volumeStore.ts similarity index 100% rename from src/video/components/hooks/volumeStore.ts rename to src/_oldvideo/components/hooks/volumeStore.ts diff --git a/src/video/components/internal/CastingInternal.tsx b/src/_oldvideo/components/internal/CastingInternal.tsx similarity index 100% rename from src/video/components/internal/CastingInternal.tsx rename to src/_oldvideo/components/internal/CastingInternal.tsx diff --git a/src/video/components/internal/ThumbnailGeneratorInternal.tsx b/src/_oldvideo/components/internal/ThumbnailGeneratorInternal.tsx similarity index 100% rename from src/video/components/internal/ThumbnailGeneratorInternal.tsx rename to src/_oldvideo/components/internal/ThumbnailGeneratorInternal.tsx diff --git a/src/video/components/internal/VideoElementInternal.tsx b/src/_oldvideo/components/internal/VideoElementInternal.tsx similarity index 100% rename from src/video/components/internal/VideoElementInternal.tsx rename to src/_oldvideo/components/internal/VideoElementInternal.tsx diff --git a/src/video/components/internal/WrapperRegisterInternal.tsx b/src/_oldvideo/components/internal/WrapperRegisterInternal.tsx similarity index 100% rename from src/video/components/internal/WrapperRegisterInternal.tsx rename to src/_oldvideo/components/internal/WrapperRegisterInternal.tsx diff --git a/src/video/components/parts/VideoErrorBoundary.tsx b/src/_oldvideo/components/parts/VideoErrorBoundary.tsx similarity index 100% rename from src/video/components/parts/VideoErrorBoundary.tsx rename to src/_oldvideo/components/parts/VideoErrorBoundary.tsx diff --git a/src/video/components/parts/VideoPlayerError.tsx b/src/_oldvideo/components/parts/VideoPlayerError.tsx similarity index 100% rename from src/video/components/parts/VideoPlayerError.tsx rename to src/_oldvideo/components/parts/VideoPlayerError.tsx diff --git a/src/video/components/parts/VideoPlayerHeader.tsx b/src/_oldvideo/components/parts/VideoPlayerHeader.tsx similarity index 100% rename from src/video/components/parts/VideoPlayerHeader.tsx rename to src/_oldvideo/components/parts/VideoPlayerHeader.tsx diff --git a/src/video/components/parts/VideoPlayerIconButton.tsx b/src/_oldvideo/components/parts/VideoPlayerIconButton.tsx similarity index 100% rename from src/video/components/parts/VideoPlayerIconButton.tsx rename to src/_oldvideo/components/parts/VideoPlayerIconButton.tsx diff --git a/src/video/components/parts/VideoPopout.tsx b/src/_oldvideo/components/parts/VideoPopout.tsx similarity index 100% rename from src/video/components/parts/VideoPopout.tsx rename to src/_oldvideo/components/parts/VideoPopout.tsx diff --git a/src/video/components/popouts/CaptionSelectionPopout.tsx b/src/_oldvideo/components/popouts/CaptionSelectionPopout.tsx similarity index 100% rename from src/video/components/popouts/CaptionSelectionPopout.tsx rename to src/_oldvideo/components/popouts/CaptionSelectionPopout.tsx diff --git a/src/video/components/popouts/CaptionSettingsPopout.tsx b/src/_oldvideo/components/popouts/CaptionSettingsPopout.tsx similarity index 100% rename from src/video/components/popouts/CaptionSettingsPopout.tsx rename to src/_oldvideo/components/popouts/CaptionSettingsPopout.tsx diff --git a/src/video/components/popouts/EpisodeSelectionPopout.tsx b/src/_oldvideo/components/popouts/EpisodeSelectionPopout.tsx similarity index 100% rename from src/video/components/popouts/EpisodeSelectionPopout.tsx rename to src/_oldvideo/components/popouts/EpisodeSelectionPopout.tsx diff --git a/src/video/components/popouts/PlaybackSpeedPopout.tsx b/src/_oldvideo/components/popouts/PlaybackSpeedPopout.tsx similarity index 100% rename from src/video/components/popouts/PlaybackSpeedPopout.tsx rename to src/_oldvideo/components/popouts/PlaybackSpeedPopout.tsx diff --git a/src/video/components/popouts/PopoutAnchor.tsx b/src/_oldvideo/components/popouts/PopoutAnchor.tsx similarity index 100% rename from src/video/components/popouts/PopoutAnchor.tsx rename to src/_oldvideo/components/popouts/PopoutAnchor.tsx diff --git a/src/video/components/popouts/PopoutProviderAction.tsx b/src/_oldvideo/components/popouts/PopoutProviderAction.tsx similarity index 100% rename from src/video/components/popouts/PopoutProviderAction.tsx rename to src/_oldvideo/components/popouts/PopoutProviderAction.tsx diff --git a/src/video/components/popouts/PopoutUtils.tsx b/src/_oldvideo/components/popouts/PopoutUtils.tsx similarity index 100% rename from src/video/components/popouts/PopoutUtils.tsx rename to src/_oldvideo/components/popouts/PopoutUtils.tsx diff --git a/src/video/components/popouts/SettingsPopout.tsx b/src/_oldvideo/components/popouts/SettingsPopout.tsx similarity index 100% rename from src/video/components/popouts/SettingsPopout.tsx rename to src/_oldvideo/components/popouts/SettingsPopout.tsx diff --git a/src/video/components/popouts/SourceSelectionPopout.tsx b/src/_oldvideo/components/popouts/SourceSelectionPopout.tsx similarity index 100% rename from src/video/components/popouts/SourceSelectionPopout.tsx rename to src/_oldvideo/components/popouts/SourceSelectionPopout.tsx diff --git a/src/video/state/cache.ts b/src/_oldvideo/state/cache.ts similarity index 100% rename from src/video/state/cache.ts rename to src/_oldvideo/state/cache.ts diff --git a/src/video/state/events.ts b/src/_oldvideo/state/events.ts similarity index 100% rename from src/video/state/events.ts rename to src/_oldvideo/state/events.ts diff --git a/src/video/state/hooks.tsx b/src/_oldvideo/state/hooks.tsx similarity index 100% rename from src/video/state/hooks.tsx rename to src/_oldvideo/state/hooks.tsx diff --git a/src/video/state/init.ts b/src/_oldvideo/state/init.ts similarity index 100% rename from src/video/state/init.ts rename to src/_oldvideo/state/init.ts diff --git a/src/video/state/logic/controls.ts b/src/_oldvideo/state/logic/controls.ts similarity index 100% rename from src/video/state/logic/controls.ts rename to src/_oldvideo/state/logic/controls.ts diff --git a/src/video/state/logic/error.ts b/src/_oldvideo/state/logic/error.ts similarity index 100% rename from src/video/state/logic/error.ts rename to src/_oldvideo/state/logic/error.ts diff --git a/src/video/state/logic/interface.ts b/src/_oldvideo/state/logic/interface.ts similarity index 100% rename from src/video/state/logic/interface.ts rename to src/_oldvideo/state/logic/interface.ts diff --git a/src/video/state/logic/mediaplaying.ts b/src/_oldvideo/state/logic/mediaplaying.ts similarity index 100% rename from src/video/state/logic/mediaplaying.ts rename to src/_oldvideo/state/logic/mediaplaying.ts diff --git a/src/video/state/logic/meta.ts b/src/_oldvideo/state/logic/meta.ts similarity index 100% rename from src/video/state/logic/meta.ts rename to src/_oldvideo/state/logic/meta.ts diff --git a/src/video/state/logic/misc.ts b/src/_oldvideo/state/logic/misc.ts similarity index 100% rename from src/video/state/logic/misc.ts rename to src/_oldvideo/state/logic/misc.ts diff --git a/src/video/state/logic/progress.ts b/src/_oldvideo/state/logic/progress.ts similarity index 100% rename from src/video/state/logic/progress.ts rename to src/_oldvideo/state/logic/progress.ts diff --git a/src/video/state/logic/source.ts b/src/_oldvideo/state/logic/source.ts similarity index 100% rename from src/video/state/logic/source.ts rename to src/_oldvideo/state/logic/source.ts diff --git a/src/video/state/providers/castingStateProvider.ts b/src/_oldvideo/state/providers/castingStateProvider.ts similarity index 100% rename from src/video/state/providers/castingStateProvider.ts rename to src/_oldvideo/state/providers/castingStateProvider.ts diff --git a/src/video/state/providers/helpers.ts b/src/_oldvideo/state/providers/helpers.ts similarity index 100% rename from src/video/state/providers/helpers.ts rename to src/_oldvideo/state/providers/helpers.ts diff --git a/src/video/state/providers/providerTypes.ts b/src/_oldvideo/state/providers/providerTypes.ts similarity index 100% rename from src/video/state/providers/providerTypes.ts rename to src/_oldvideo/state/providers/providerTypes.ts diff --git a/src/video/state/providers/utils.ts b/src/_oldvideo/state/providers/utils.ts similarity index 100% rename from src/video/state/providers/utils.ts rename to src/_oldvideo/state/providers/utils.ts diff --git a/src/video/state/providers/videoStateProvider.ts b/src/_oldvideo/state/providers/videoStateProvider.ts similarity index 100% rename from src/video/state/providers/videoStateProvider.ts rename to src/_oldvideo/state/providers/videoStateProvider.ts diff --git a/src/video/state/types.ts b/src/_oldvideo/state/types.ts similarity index 100% rename from src/video/state/types.ts rename to src/_oldvideo/state/types.ts From 8c44bb6ec6056f73dc53e382a345e0692f2ff733 Mon Sep 17 00:00:00 2001 From: Felix Boehme Date: Sat, 2 Sep 2023 16:15:20 +0200 Subject: [PATCH 08/10] revert --- src/{_oldvideo => video}/components/VideoPlayer.tsx | 0 src/{_oldvideo => video}/components/VideoPlayerBase.tsx | 0 src/{_oldvideo => video}/components/actions/AirplayAction.tsx | 0 src/{_oldvideo => video}/components/actions/BackdropAction.tsx | 0 .../components/actions/CaptionRendererAction.tsx | 0 src/{_oldvideo => video}/components/actions/CastingTextAction.tsx | 0 src/{_oldvideo => video}/components/actions/ChromecastAction.tsx | 0 src/{_oldvideo => video}/components/actions/DividerAction.tsx | 0 src/{_oldvideo => video}/components/actions/FullscreenAction.tsx | 0 src/{_oldvideo => video}/components/actions/HeaderAction.tsx | 0 .../components/actions/KeyboardShortcutsAction.tsx | 0 src/{_oldvideo => video}/components/actions/LoadingAction.tsx | 0 src/{_oldvideo => video}/components/actions/MetaAction.tsx | 0 src/{_oldvideo => video}/components/actions/MiddlePauseAction.tsx | 0 .../components/actions/MobileCenterAction.tsx | 0 src/{_oldvideo => video}/components/actions/PageTitleAction.tsx | 0 src/{_oldvideo => video}/components/actions/PauseAction.tsx | 0 .../components/actions/PictureInPictureAction.tsx | 0 src/{_oldvideo => video}/components/actions/ProgressAction.tsx | 0 .../components/actions/SeriesSelectionAction.tsx | 0 src/{_oldvideo => video}/components/actions/SettingsAction.tsx | 0 src/{_oldvideo => video}/components/actions/ShowTitleAction.tsx | 0 src/{_oldvideo => video}/components/actions/SkipTimeAction.tsx | 0 src/{_oldvideo => video}/components/actions/ThumbnailAction.tsx | 0 src/{_oldvideo => video}/components/actions/TimeAction.tsx | 0 src/{_oldvideo => video}/components/actions/VolumeAction.tsx | 0 .../components/actions/VolumeAdjustedAction.tsx | 0 .../components/actions/list-entries/CaptionsSelectionAction.tsx | 0 .../components/actions/list-entries/DownloadAction.tsx | 0 .../actions/list-entries/PlaybackSpeedSelectionAction.tsx | 0 .../components/actions/list-entries/QualityDisplayAction.tsx | 0 .../components/actions/list-entries/SourceSelectionAction.tsx | 0 .../components/controllers/MetaController.tsx | 0 .../components/controllers/ProgressListenerController.tsx | 0 .../components/controllers/SeriesController.tsx | 0 .../components/controllers/SourceController.tsx | 0 .../components/hooks/useCurrentSeriesEpisodeInfo.ts | 0 src/{_oldvideo => video}/components/hooks/useInitialized.ts | 0 src/{_oldvideo => video}/components/hooks/useSyncPopouts.ts | 0 src/{_oldvideo => video}/components/hooks/volumeStore.ts | 0 src/{_oldvideo => video}/components/internal/CastingInternal.tsx | 0 .../components/internal/ThumbnailGeneratorInternal.tsx | 0 .../components/internal/VideoElementInternal.tsx | 0 .../components/internal/WrapperRegisterInternal.tsx | 0 src/{_oldvideo => video}/components/parts/VideoErrorBoundary.tsx | 0 src/{_oldvideo => video}/components/parts/VideoPlayerError.tsx | 0 src/{_oldvideo => video}/components/parts/VideoPlayerHeader.tsx | 0 .../components/parts/VideoPlayerIconButton.tsx | 0 src/{_oldvideo => video}/components/parts/VideoPopout.tsx | 0 .../components/popouts/CaptionSelectionPopout.tsx | 0 .../components/popouts/CaptionSettingsPopout.tsx | 0 .../components/popouts/EpisodeSelectionPopout.tsx | 0 .../components/popouts/PlaybackSpeedPopout.tsx | 0 src/{_oldvideo => video}/components/popouts/PopoutAnchor.tsx | 0 .../components/popouts/PopoutProviderAction.tsx | 0 src/{_oldvideo => video}/components/popouts/PopoutUtils.tsx | 0 src/{_oldvideo => video}/components/popouts/SettingsPopout.tsx | 0 .../components/popouts/SourceSelectionPopout.tsx | 0 src/{_oldvideo => video}/state/cache.ts | 0 src/{_oldvideo => video}/state/events.ts | 0 src/{_oldvideo => video}/state/hooks.tsx | 0 src/{_oldvideo => video}/state/init.ts | 0 src/{_oldvideo => video}/state/logic/controls.ts | 0 src/{_oldvideo => video}/state/logic/error.ts | 0 src/{_oldvideo => video}/state/logic/interface.ts | 0 src/{_oldvideo => video}/state/logic/mediaplaying.ts | 0 src/{_oldvideo => video}/state/logic/meta.ts | 0 src/{_oldvideo => video}/state/logic/misc.ts | 0 src/{_oldvideo => video}/state/logic/progress.ts | 0 src/{_oldvideo => video}/state/logic/source.ts | 0 src/{_oldvideo => video}/state/providers/castingStateProvider.ts | 0 src/{_oldvideo => video}/state/providers/helpers.ts | 0 src/{_oldvideo => video}/state/providers/providerTypes.ts | 0 src/{_oldvideo => video}/state/providers/utils.ts | 0 src/{_oldvideo => video}/state/providers/videoStateProvider.ts | 0 src/{_oldvideo => video}/state/types.ts | 0 76 files changed, 0 insertions(+), 0 deletions(-) rename src/{_oldvideo => video}/components/VideoPlayer.tsx (100%) rename src/{_oldvideo => video}/components/VideoPlayerBase.tsx (100%) rename src/{_oldvideo => video}/components/actions/AirplayAction.tsx (100%) rename src/{_oldvideo => video}/components/actions/BackdropAction.tsx (100%) rename src/{_oldvideo => video}/components/actions/CaptionRendererAction.tsx (100%) rename src/{_oldvideo => video}/components/actions/CastingTextAction.tsx (100%) rename src/{_oldvideo => video}/components/actions/ChromecastAction.tsx (100%) rename src/{_oldvideo => video}/components/actions/DividerAction.tsx (100%) rename src/{_oldvideo => video}/components/actions/FullscreenAction.tsx (100%) rename src/{_oldvideo => video}/components/actions/HeaderAction.tsx (100%) rename src/{_oldvideo => video}/components/actions/KeyboardShortcutsAction.tsx (100%) rename src/{_oldvideo => video}/components/actions/LoadingAction.tsx (100%) rename src/{_oldvideo => video}/components/actions/MetaAction.tsx (100%) rename src/{_oldvideo => video}/components/actions/MiddlePauseAction.tsx (100%) rename src/{_oldvideo => video}/components/actions/MobileCenterAction.tsx (100%) rename src/{_oldvideo => video}/components/actions/PageTitleAction.tsx (100%) rename src/{_oldvideo => video}/components/actions/PauseAction.tsx (100%) rename src/{_oldvideo => video}/components/actions/PictureInPictureAction.tsx (100%) rename src/{_oldvideo => video}/components/actions/ProgressAction.tsx (100%) rename src/{_oldvideo => video}/components/actions/SeriesSelectionAction.tsx (100%) rename src/{_oldvideo => video}/components/actions/SettingsAction.tsx (100%) rename src/{_oldvideo => video}/components/actions/ShowTitleAction.tsx (100%) rename src/{_oldvideo => video}/components/actions/SkipTimeAction.tsx (100%) rename src/{_oldvideo => video}/components/actions/ThumbnailAction.tsx (100%) rename src/{_oldvideo => video}/components/actions/TimeAction.tsx (100%) rename src/{_oldvideo => video}/components/actions/VolumeAction.tsx (100%) rename src/{_oldvideo => video}/components/actions/VolumeAdjustedAction.tsx (100%) rename src/{_oldvideo => video}/components/actions/list-entries/CaptionsSelectionAction.tsx (100%) rename src/{_oldvideo => video}/components/actions/list-entries/DownloadAction.tsx (100%) rename src/{_oldvideo => video}/components/actions/list-entries/PlaybackSpeedSelectionAction.tsx (100%) rename src/{_oldvideo => video}/components/actions/list-entries/QualityDisplayAction.tsx (100%) rename src/{_oldvideo => video}/components/actions/list-entries/SourceSelectionAction.tsx (100%) rename src/{_oldvideo => video}/components/controllers/MetaController.tsx (100%) rename src/{_oldvideo => video}/components/controllers/ProgressListenerController.tsx (100%) rename src/{_oldvideo => video}/components/controllers/SeriesController.tsx (100%) rename src/{_oldvideo => video}/components/controllers/SourceController.tsx (100%) rename src/{_oldvideo => video}/components/hooks/useCurrentSeriesEpisodeInfo.ts (100%) rename src/{_oldvideo => video}/components/hooks/useInitialized.ts (100%) rename src/{_oldvideo => video}/components/hooks/useSyncPopouts.ts (100%) rename src/{_oldvideo => video}/components/hooks/volumeStore.ts (100%) rename src/{_oldvideo => video}/components/internal/CastingInternal.tsx (100%) rename src/{_oldvideo => video}/components/internal/ThumbnailGeneratorInternal.tsx (100%) rename src/{_oldvideo => video}/components/internal/VideoElementInternal.tsx (100%) rename src/{_oldvideo => video}/components/internal/WrapperRegisterInternal.tsx (100%) rename src/{_oldvideo => video}/components/parts/VideoErrorBoundary.tsx (100%) rename src/{_oldvideo => video}/components/parts/VideoPlayerError.tsx (100%) rename src/{_oldvideo => video}/components/parts/VideoPlayerHeader.tsx (100%) rename src/{_oldvideo => video}/components/parts/VideoPlayerIconButton.tsx (100%) rename src/{_oldvideo => video}/components/parts/VideoPopout.tsx (100%) rename src/{_oldvideo => video}/components/popouts/CaptionSelectionPopout.tsx (100%) rename src/{_oldvideo => video}/components/popouts/CaptionSettingsPopout.tsx (100%) rename src/{_oldvideo => video}/components/popouts/EpisodeSelectionPopout.tsx (100%) rename src/{_oldvideo => video}/components/popouts/PlaybackSpeedPopout.tsx (100%) rename src/{_oldvideo => video}/components/popouts/PopoutAnchor.tsx (100%) rename src/{_oldvideo => video}/components/popouts/PopoutProviderAction.tsx (100%) rename src/{_oldvideo => video}/components/popouts/PopoutUtils.tsx (100%) rename src/{_oldvideo => video}/components/popouts/SettingsPopout.tsx (100%) rename src/{_oldvideo => video}/components/popouts/SourceSelectionPopout.tsx (100%) rename src/{_oldvideo => video}/state/cache.ts (100%) rename src/{_oldvideo => video}/state/events.ts (100%) rename src/{_oldvideo => video}/state/hooks.tsx (100%) rename src/{_oldvideo => video}/state/init.ts (100%) rename src/{_oldvideo => video}/state/logic/controls.ts (100%) rename src/{_oldvideo => video}/state/logic/error.ts (100%) rename src/{_oldvideo => video}/state/logic/interface.ts (100%) rename src/{_oldvideo => video}/state/logic/mediaplaying.ts (100%) rename src/{_oldvideo => video}/state/logic/meta.ts (100%) rename src/{_oldvideo => video}/state/logic/misc.ts (100%) rename src/{_oldvideo => video}/state/logic/progress.ts (100%) rename src/{_oldvideo => video}/state/logic/source.ts (100%) rename src/{_oldvideo => video}/state/providers/castingStateProvider.ts (100%) rename src/{_oldvideo => video}/state/providers/helpers.ts (100%) rename src/{_oldvideo => video}/state/providers/providerTypes.ts (100%) rename src/{_oldvideo => video}/state/providers/utils.ts (100%) rename src/{_oldvideo => video}/state/providers/videoStateProvider.ts (100%) rename src/{_oldvideo => video}/state/types.ts (100%) diff --git a/src/_oldvideo/components/VideoPlayer.tsx b/src/video/components/VideoPlayer.tsx similarity index 100% rename from src/_oldvideo/components/VideoPlayer.tsx rename to src/video/components/VideoPlayer.tsx diff --git a/src/_oldvideo/components/VideoPlayerBase.tsx b/src/video/components/VideoPlayerBase.tsx similarity index 100% rename from src/_oldvideo/components/VideoPlayerBase.tsx rename to src/video/components/VideoPlayerBase.tsx diff --git a/src/_oldvideo/components/actions/AirplayAction.tsx b/src/video/components/actions/AirplayAction.tsx similarity index 100% rename from src/_oldvideo/components/actions/AirplayAction.tsx rename to src/video/components/actions/AirplayAction.tsx diff --git a/src/_oldvideo/components/actions/BackdropAction.tsx b/src/video/components/actions/BackdropAction.tsx similarity index 100% rename from src/_oldvideo/components/actions/BackdropAction.tsx rename to src/video/components/actions/BackdropAction.tsx diff --git a/src/_oldvideo/components/actions/CaptionRendererAction.tsx b/src/video/components/actions/CaptionRendererAction.tsx similarity index 100% rename from src/_oldvideo/components/actions/CaptionRendererAction.tsx rename to src/video/components/actions/CaptionRendererAction.tsx diff --git a/src/_oldvideo/components/actions/CastingTextAction.tsx b/src/video/components/actions/CastingTextAction.tsx similarity index 100% rename from src/_oldvideo/components/actions/CastingTextAction.tsx rename to src/video/components/actions/CastingTextAction.tsx diff --git a/src/_oldvideo/components/actions/ChromecastAction.tsx b/src/video/components/actions/ChromecastAction.tsx similarity index 100% rename from src/_oldvideo/components/actions/ChromecastAction.tsx rename to src/video/components/actions/ChromecastAction.tsx diff --git a/src/_oldvideo/components/actions/DividerAction.tsx b/src/video/components/actions/DividerAction.tsx similarity index 100% rename from src/_oldvideo/components/actions/DividerAction.tsx rename to src/video/components/actions/DividerAction.tsx diff --git a/src/_oldvideo/components/actions/FullscreenAction.tsx b/src/video/components/actions/FullscreenAction.tsx similarity index 100% rename from src/_oldvideo/components/actions/FullscreenAction.tsx rename to src/video/components/actions/FullscreenAction.tsx diff --git a/src/_oldvideo/components/actions/HeaderAction.tsx b/src/video/components/actions/HeaderAction.tsx similarity index 100% rename from src/_oldvideo/components/actions/HeaderAction.tsx rename to src/video/components/actions/HeaderAction.tsx diff --git a/src/_oldvideo/components/actions/KeyboardShortcutsAction.tsx b/src/video/components/actions/KeyboardShortcutsAction.tsx similarity index 100% rename from src/_oldvideo/components/actions/KeyboardShortcutsAction.tsx rename to src/video/components/actions/KeyboardShortcutsAction.tsx diff --git a/src/_oldvideo/components/actions/LoadingAction.tsx b/src/video/components/actions/LoadingAction.tsx similarity index 100% rename from src/_oldvideo/components/actions/LoadingAction.tsx rename to src/video/components/actions/LoadingAction.tsx diff --git a/src/_oldvideo/components/actions/MetaAction.tsx b/src/video/components/actions/MetaAction.tsx similarity index 100% rename from src/_oldvideo/components/actions/MetaAction.tsx rename to src/video/components/actions/MetaAction.tsx diff --git a/src/_oldvideo/components/actions/MiddlePauseAction.tsx b/src/video/components/actions/MiddlePauseAction.tsx similarity index 100% rename from src/_oldvideo/components/actions/MiddlePauseAction.tsx rename to src/video/components/actions/MiddlePauseAction.tsx diff --git a/src/_oldvideo/components/actions/MobileCenterAction.tsx b/src/video/components/actions/MobileCenterAction.tsx similarity index 100% rename from src/_oldvideo/components/actions/MobileCenterAction.tsx rename to src/video/components/actions/MobileCenterAction.tsx diff --git a/src/_oldvideo/components/actions/PageTitleAction.tsx b/src/video/components/actions/PageTitleAction.tsx similarity index 100% rename from src/_oldvideo/components/actions/PageTitleAction.tsx rename to src/video/components/actions/PageTitleAction.tsx diff --git a/src/_oldvideo/components/actions/PauseAction.tsx b/src/video/components/actions/PauseAction.tsx similarity index 100% rename from src/_oldvideo/components/actions/PauseAction.tsx rename to src/video/components/actions/PauseAction.tsx diff --git a/src/_oldvideo/components/actions/PictureInPictureAction.tsx b/src/video/components/actions/PictureInPictureAction.tsx similarity index 100% rename from src/_oldvideo/components/actions/PictureInPictureAction.tsx rename to src/video/components/actions/PictureInPictureAction.tsx diff --git a/src/_oldvideo/components/actions/ProgressAction.tsx b/src/video/components/actions/ProgressAction.tsx similarity index 100% rename from src/_oldvideo/components/actions/ProgressAction.tsx rename to src/video/components/actions/ProgressAction.tsx diff --git a/src/_oldvideo/components/actions/SeriesSelectionAction.tsx b/src/video/components/actions/SeriesSelectionAction.tsx similarity index 100% rename from src/_oldvideo/components/actions/SeriesSelectionAction.tsx rename to src/video/components/actions/SeriesSelectionAction.tsx diff --git a/src/_oldvideo/components/actions/SettingsAction.tsx b/src/video/components/actions/SettingsAction.tsx similarity index 100% rename from src/_oldvideo/components/actions/SettingsAction.tsx rename to src/video/components/actions/SettingsAction.tsx diff --git a/src/_oldvideo/components/actions/ShowTitleAction.tsx b/src/video/components/actions/ShowTitleAction.tsx similarity index 100% rename from src/_oldvideo/components/actions/ShowTitleAction.tsx rename to src/video/components/actions/ShowTitleAction.tsx diff --git a/src/_oldvideo/components/actions/SkipTimeAction.tsx b/src/video/components/actions/SkipTimeAction.tsx similarity index 100% rename from src/_oldvideo/components/actions/SkipTimeAction.tsx rename to src/video/components/actions/SkipTimeAction.tsx diff --git a/src/_oldvideo/components/actions/ThumbnailAction.tsx b/src/video/components/actions/ThumbnailAction.tsx similarity index 100% rename from src/_oldvideo/components/actions/ThumbnailAction.tsx rename to src/video/components/actions/ThumbnailAction.tsx diff --git a/src/_oldvideo/components/actions/TimeAction.tsx b/src/video/components/actions/TimeAction.tsx similarity index 100% rename from src/_oldvideo/components/actions/TimeAction.tsx rename to src/video/components/actions/TimeAction.tsx diff --git a/src/_oldvideo/components/actions/VolumeAction.tsx b/src/video/components/actions/VolumeAction.tsx similarity index 100% rename from src/_oldvideo/components/actions/VolumeAction.tsx rename to src/video/components/actions/VolumeAction.tsx diff --git a/src/_oldvideo/components/actions/VolumeAdjustedAction.tsx b/src/video/components/actions/VolumeAdjustedAction.tsx similarity index 100% rename from src/_oldvideo/components/actions/VolumeAdjustedAction.tsx rename to src/video/components/actions/VolumeAdjustedAction.tsx diff --git a/src/_oldvideo/components/actions/list-entries/CaptionsSelectionAction.tsx b/src/video/components/actions/list-entries/CaptionsSelectionAction.tsx similarity index 100% rename from src/_oldvideo/components/actions/list-entries/CaptionsSelectionAction.tsx rename to src/video/components/actions/list-entries/CaptionsSelectionAction.tsx diff --git a/src/_oldvideo/components/actions/list-entries/DownloadAction.tsx b/src/video/components/actions/list-entries/DownloadAction.tsx similarity index 100% rename from src/_oldvideo/components/actions/list-entries/DownloadAction.tsx rename to src/video/components/actions/list-entries/DownloadAction.tsx diff --git a/src/_oldvideo/components/actions/list-entries/PlaybackSpeedSelectionAction.tsx b/src/video/components/actions/list-entries/PlaybackSpeedSelectionAction.tsx similarity index 100% rename from src/_oldvideo/components/actions/list-entries/PlaybackSpeedSelectionAction.tsx rename to src/video/components/actions/list-entries/PlaybackSpeedSelectionAction.tsx diff --git a/src/_oldvideo/components/actions/list-entries/QualityDisplayAction.tsx b/src/video/components/actions/list-entries/QualityDisplayAction.tsx similarity index 100% rename from src/_oldvideo/components/actions/list-entries/QualityDisplayAction.tsx rename to src/video/components/actions/list-entries/QualityDisplayAction.tsx diff --git a/src/_oldvideo/components/actions/list-entries/SourceSelectionAction.tsx b/src/video/components/actions/list-entries/SourceSelectionAction.tsx similarity index 100% rename from src/_oldvideo/components/actions/list-entries/SourceSelectionAction.tsx rename to src/video/components/actions/list-entries/SourceSelectionAction.tsx diff --git a/src/_oldvideo/components/controllers/MetaController.tsx b/src/video/components/controllers/MetaController.tsx similarity index 100% rename from src/_oldvideo/components/controllers/MetaController.tsx rename to src/video/components/controllers/MetaController.tsx diff --git a/src/_oldvideo/components/controllers/ProgressListenerController.tsx b/src/video/components/controllers/ProgressListenerController.tsx similarity index 100% rename from src/_oldvideo/components/controllers/ProgressListenerController.tsx rename to src/video/components/controllers/ProgressListenerController.tsx diff --git a/src/_oldvideo/components/controllers/SeriesController.tsx b/src/video/components/controllers/SeriesController.tsx similarity index 100% rename from src/_oldvideo/components/controllers/SeriesController.tsx rename to src/video/components/controllers/SeriesController.tsx diff --git a/src/_oldvideo/components/controllers/SourceController.tsx b/src/video/components/controllers/SourceController.tsx similarity index 100% rename from src/_oldvideo/components/controllers/SourceController.tsx rename to src/video/components/controllers/SourceController.tsx diff --git a/src/_oldvideo/components/hooks/useCurrentSeriesEpisodeInfo.ts b/src/video/components/hooks/useCurrentSeriesEpisodeInfo.ts similarity index 100% rename from src/_oldvideo/components/hooks/useCurrentSeriesEpisodeInfo.ts rename to src/video/components/hooks/useCurrentSeriesEpisodeInfo.ts diff --git a/src/_oldvideo/components/hooks/useInitialized.ts b/src/video/components/hooks/useInitialized.ts similarity index 100% rename from src/_oldvideo/components/hooks/useInitialized.ts rename to src/video/components/hooks/useInitialized.ts diff --git a/src/_oldvideo/components/hooks/useSyncPopouts.ts b/src/video/components/hooks/useSyncPopouts.ts similarity index 100% rename from src/_oldvideo/components/hooks/useSyncPopouts.ts rename to src/video/components/hooks/useSyncPopouts.ts diff --git a/src/_oldvideo/components/hooks/volumeStore.ts b/src/video/components/hooks/volumeStore.ts similarity index 100% rename from src/_oldvideo/components/hooks/volumeStore.ts rename to src/video/components/hooks/volumeStore.ts diff --git a/src/_oldvideo/components/internal/CastingInternal.tsx b/src/video/components/internal/CastingInternal.tsx similarity index 100% rename from src/_oldvideo/components/internal/CastingInternal.tsx rename to src/video/components/internal/CastingInternal.tsx diff --git a/src/_oldvideo/components/internal/ThumbnailGeneratorInternal.tsx b/src/video/components/internal/ThumbnailGeneratorInternal.tsx similarity index 100% rename from src/_oldvideo/components/internal/ThumbnailGeneratorInternal.tsx rename to src/video/components/internal/ThumbnailGeneratorInternal.tsx diff --git a/src/_oldvideo/components/internal/VideoElementInternal.tsx b/src/video/components/internal/VideoElementInternal.tsx similarity index 100% rename from src/_oldvideo/components/internal/VideoElementInternal.tsx rename to src/video/components/internal/VideoElementInternal.tsx diff --git a/src/_oldvideo/components/internal/WrapperRegisterInternal.tsx b/src/video/components/internal/WrapperRegisterInternal.tsx similarity index 100% rename from src/_oldvideo/components/internal/WrapperRegisterInternal.tsx rename to src/video/components/internal/WrapperRegisterInternal.tsx diff --git a/src/_oldvideo/components/parts/VideoErrorBoundary.tsx b/src/video/components/parts/VideoErrorBoundary.tsx similarity index 100% rename from src/_oldvideo/components/parts/VideoErrorBoundary.tsx rename to src/video/components/parts/VideoErrorBoundary.tsx diff --git a/src/_oldvideo/components/parts/VideoPlayerError.tsx b/src/video/components/parts/VideoPlayerError.tsx similarity index 100% rename from src/_oldvideo/components/parts/VideoPlayerError.tsx rename to src/video/components/parts/VideoPlayerError.tsx diff --git a/src/_oldvideo/components/parts/VideoPlayerHeader.tsx b/src/video/components/parts/VideoPlayerHeader.tsx similarity index 100% rename from src/_oldvideo/components/parts/VideoPlayerHeader.tsx rename to src/video/components/parts/VideoPlayerHeader.tsx diff --git a/src/_oldvideo/components/parts/VideoPlayerIconButton.tsx b/src/video/components/parts/VideoPlayerIconButton.tsx similarity index 100% rename from src/_oldvideo/components/parts/VideoPlayerIconButton.tsx rename to src/video/components/parts/VideoPlayerIconButton.tsx diff --git a/src/_oldvideo/components/parts/VideoPopout.tsx b/src/video/components/parts/VideoPopout.tsx similarity index 100% rename from src/_oldvideo/components/parts/VideoPopout.tsx rename to src/video/components/parts/VideoPopout.tsx diff --git a/src/_oldvideo/components/popouts/CaptionSelectionPopout.tsx b/src/video/components/popouts/CaptionSelectionPopout.tsx similarity index 100% rename from src/_oldvideo/components/popouts/CaptionSelectionPopout.tsx rename to src/video/components/popouts/CaptionSelectionPopout.tsx diff --git a/src/_oldvideo/components/popouts/CaptionSettingsPopout.tsx b/src/video/components/popouts/CaptionSettingsPopout.tsx similarity index 100% rename from src/_oldvideo/components/popouts/CaptionSettingsPopout.tsx rename to src/video/components/popouts/CaptionSettingsPopout.tsx diff --git a/src/_oldvideo/components/popouts/EpisodeSelectionPopout.tsx b/src/video/components/popouts/EpisodeSelectionPopout.tsx similarity index 100% rename from src/_oldvideo/components/popouts/EpisodeSelectionPopout.tsx rename to src/video/components/popouts/EpisodeSelectionPopout.tsx diff --git a/src/_oldvideo/components/popouts/PlaybackSpeedPopout.tsx b/src/video/components/popouts/PlaybackSpeedPopout.tsx similarity index 100% rename from src/_oldvideo/components/popouts/PlaybackSpeedPopout.tsx rename to src/video/components/popouts/PlaybackSpeedPopout.tsx diff --git a/src/_oldvideo/components/popouts/PopoutAnchor.tsx b/src/video/components/popouts/PopoutAnchor.tsx similarity index 100% rename from src/_oldvideo/components/popouts/PopoutAnchor.tsx rename to src/video/components/popouts/PopoutAnchor.tsx diff --git a/src/_oldvideo/components/popouts/PopoutProviderAction.tsx b/src/video/components/popouts/PopoutProviderAction.tsx similarity index 100% rename from src/_oldvideo/components/popouts/PopoutProviderAction.tsx rename to src/video/components/popouts/PopoutProviderAction.tsx diff --git a/src/_oldvideo/components/popouts/PopoutUtils.tsx b/src/video/components/popouts/PopoutUtils.tsx similarity index 100% rename from src/_oldvideo/components/popouts/PopoutUtils.tsx rename to src/video/components/popouts/PopoutUtils.tsx diff --git a/src/_oldvideo/components/popouts/SettingsPopout.tsx b/src/video/components/popouts/SettingsPopout.tsx similarity index 100% rename from src/_oldvideo/components/popouts/SettingsPopout.tsx rename to src/video/components/popouts/SettingsPopout.tsx diff --git a/src/_oldvideo/components/popouts/SourceSelectionPopout.tsx b/src/video/components/popouts/SourceSelectionPopout.tsx similarity index 100% rename from src/_oldvideo/components/popouts/SourceSelectionPopout.tsx rename to src/video/components/popouts/SourceSelectionPopout.tsx diff --git a/src/_oldvideo/state/cache.ts b/src/video/state/cache.ts similarity index 100% rename from src/_oldvideo/state/cache.ts rename to src/video/state/cache.ts diff --git a/src/_oldvideo/state/events.ts b/src/video/state/events.ts similarity index 100% rename from src/_oldvideo/state/events.ts rename to src/video/state/events.ts diff --git a/src/_oldvideo/state/hooks.tsx b/src/video/state/hooks.tsx similarity index 100% rename from src/_oldvideo/state/hooks.tsx rename to src/video/state/hooks.tsx diff --git a/src/_oldvideo/state/init.ts b/src/video/state/init.ts similarity index 100% rename from src/_oldvideo/state/init.ts rename to src/video/state/init.ts diff --git a/src/_oldvideo/state/logic/controls.ts b/src/video/state/logic/controls.ts similarity index 100% rename from src/_oldvideo/state/logic/controls.ts rename to src/video/state/logic/controls.ts diff --git a/src/_oldvideo/state/logic/error.ts b/src/video/state/logic/error.ts similarity index 100% rename from src/_oldvideo/state/logic/error.ts rename to src/video/state/logic/error.ts diff --git a/src/_oldvideo/state/logic/interface.ts b/src/video/state/logic/interface.ts similarity index 100% rename from src/_oldvideo/state/logic/interface.ts rename to src/video/state/logic/interface.ts diff --git a/src/_oldvideo/state/logic/mediaplaying.ts b/src/video/state/logic/mediaplaying.ts similarity index 100% rename from src/_oldvideo/state/logic/mediaplaying.ts rename to src/video/state/logic/mediaplaying.ts diff --git a/src/_oldvideo/state/logic/meta.ts b/src/video/state/logic/meta.ts similarity index 100% rename from src/_oldvideo/state/logic/meta.ts rename to src/video/state/logic/meta.ts diff --git a/src/_oldvideo/state/logic/misc.ts b/src/video/state/logic/misc.ts similarity index 100% rename from src/_oldvideo/state/logic/misc.ts rename to src/video/state/logic/misc.ts diff --git a/src/_oldvideo/state/logic/progress.ts b/src/video/state/logic/progress.ts similarity index 100% rename from src/_oldvideo/state/logic/progress.ts rename to src/video/state/logic/progress.ts diff --git a/src/_oldvideo/state/logic/source.ts b/src/video/state/logic/source.ts similarity index 100% rename from src/_oldvideo/state/logic/source.ts rename to src/video/state/logic/source.ts diff --git a/src/_oldvideo/state/providers/castingStateProvider.ts b/src/video/state/providers/castingStateProvider.ts similarity index 100% rename from src/_oldvideo/state/providers/castingStateProvider.ts rename to src/video/state/providers/castingStateProvider.ts diff --git a/src/_oldvideo/state/providers/helpers.ts b/src/video/state/providers/helpers.ts similarity index 100% rename from src/_oldvideo/state/providers/helpers.ts rename to src/video/state/providers/helpers.ts diff --git a/src/_oldvideo/state/providers/providerTypes.ts b/src/video/state/providers/providerTypes.ts similarity index 100% rename from src/_oldvideo/state/providers/providerTypes.ts rename to src/video/state/providers/providerTypes.ts diff --git a/src/_oldvideo/state/providers/utils.ts b/src/video/state/providers/utils.ts similarity index 100% rename from src/_oldvideo/state/providers/utils.ts rename to src/video/state/providers/utils.ts diff --git a/src/_oldvideo/state/providers/videoStateProvider.ts b/src/video/state/providers/videoStateProvider.ts similarity index 100% rename from src/_oldvideo/state/providers/videoStateProvider.ts rename to src/video/state/providers/videoStateProvider.ts diff --git a/src/_oldvideo/state/types.ts b/src/video/state/types.ts similarity index 100% rename from src/_oldvideo/state/types.ts rename to src/video/state/types.ts From 5e4e2abe7e6c8a60fa6ecb035f0fdd50ffa2f3a5 Mon Sep 17 00:00:00 2001 From: Felix Boehme Date: Sat, 2 Sep 2023 16:30:37 +0200 Subject: [PATCH 09/10] resolve merge issue --- src/_oldvideo/components/actions/CaptionRendererAction.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/_oldvideo/components/actions/CaptionRendererAction.tsx b/src/_oldvideo/components/actions/CaptionRendererAction.tsx index a5a77a02..7a631a8f 100644 --- a/src/_oldvideo/components/actions/CaptionRendererAction.tsx +++ b/src/_oldvideo/components/actions/CaptionRendererAction.tsx @@ -5,7 +5,7 @@ import { ContentCaption } from "subsrt-ts/dist/types/handler"; import { parseSubtitles, sanitize } from "@/backend/helpers/captions"; import { Transition } from "@/components/Transition"; import { useSettings } from "@/state/settings"; -import { getPlayerState } from "@/video/state/cache"; +import { getPlayerState } from "@/_oldvideo/state/cache"; import { useVideoPlayerDescriptor } from "../../state/hooks"; import { useProgress } from "../../state/logic/progress"; From f05e2d6dc0687580ede7f8a16726e778d84f0954 Mon Sep 17 00:00:00 2001 From: Felix Boehme Date: Sat, 2 Sep 2023 16:35:50 +0200 Subject: [PATCH 10/10] resolve build issue --- src/_oldvideo/components/actions/CaptionRendererAction.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/_oldvideo/components/actions/CaptionRendererAction.tsx b/src/_oldvideo/components/actions/CaptionRendererAction.tsx index 7a631a8f..fd3cc4e9 100644 --- a/src/_oldvideo/components/actions/CaptionRendererAction.tsx +++ b/src/_oldvideo/components/actions/CaptionRendererAction.tsx @@ -2,10 +2,10 @@ import { useCallback, useEffect, useRef } from "react"; import { useAsync } from "react-use"; import { ContentCaption } from "subsrt-ts/dist/types/handler"; +import { getPlayerState } from "@/_oldvideo/state/cache"; import { parseSubtitles, sanitize } from "@/backend/helpers/captions"; import { Transition } from "@/components/Transition"; import { useSettings } from "@/state/settings"; -import { getPlayerState } from "@/_oldvideo/state/cache"; import { useVideoPlayerDescriptor } from "../../state/hooks"; import { useProgress } from "../../state/logic/progress";