resolve merge conflicts

2024-12-20 14:37:43 +01:00 · 2023-09-02 16:12:57 +02:00 · 2023-09-02 16:12:57 +02:00 · e5e35c05e0
commit e5e35c05e0
parent 04f67df289
76 changed files with 0 additions and 0 deletions
--- a/src/_oldvideo/components/VideoPlayer.tsx
+++ b/src/_oldvideo/components/VideoPlayer.tsx
--- a/src/_oldvideo/components/VideoPlayerBase.tsx
+++ b/src/_oldvideo/components/VideoPlayerBase.tsx
--- a/src/_oldvideo/components/actions/AirplayAction.tsx
+++ b/src/_oldvideo/components/actions/AirplayAction.tsx
--- a/src/_oldvideo/components/actions/BackdropAction.tsx
+++ b/src/_oldvideo/components/actions/BackdropAction.tsx
--- a/src/_oldvideo/components/actions/CaptionRendererAction.tsx
+++ b/src/_oldvideo/components/actions/CaptionRendererAction.tsx
--- a/src/_oldvideo/components/actions/CastingTextAction.tsx
+++ b/src/_oldvideo/components/actions/CastingTextAction.tsx
--- a/src/_oldvideo/components/actions/ChromecastAction.tsx
+++ b/src/_oldvideo/components/actions/ChromecastAction.tsx
--- a/src/_oldvideo/components/actions/DividerAction.tsx
+++ b/src/_oldvideo/components/actions/DividerAction.tsx
--- a/src/_oldvideo/components/actions/FullscreenAction.tsx
+++ b/src/_oldvideo/components/actions/FullscreenAction.tsx
--- a/src/_oldvideo/components/actions/HeaderAction.tsx
+++ b/src/_oldvideo/components/actions/HeaderAction.tsx
--- a/src/_oldvideo/components/actions/KeyboardShortcutsAction.tsx
+++ b/src/_oldvideo/components/actions/KeyboardShortcutsAction.tsx
--- a/src/_oldvideo/components/actions/LoadingAction.tsx
+++ b/src/_oldvideo/components/actions/LoadingAction.tsx
--- a/src/_oldvideo/components/actions/MetaAction.tsx
+++ b/src/_oldvideo/components/actions/MetaAction.tsx
--- a/src/_oldvideo/components/actions/MiddlePauseAction.tsx
+++ b/src/_oldvideo/components/actions/MiddlePauseAction.tsx
--- a/src/_oldvideo/components/actions/MobileCenterAction.tsx
+++ b/src/_oldvideo/components/actions/MobileCenterAction.tsx
--- a/src/_oldvideo/components/actions/PageTitleAction.tsx
+++ b/src/_oldvideo/components/actions/PageTitleAction.tsx
--- a/src/_oldvideo/components/actions/PauseAction.tsx
+++ b/src/_oldvideo/components/actions/PauseAction.tsx
--- a/src/_oldvideo/components/actions/PictureInPictureAction.tsx
+++ b/src/_oldvideo/components/actions/PictureInPictureAction.tsx
--- a/src/_oldvideo/components/actions/ProgressAction.tsx
+++ b/src/_oldvideo/components/actions/ProgressAction.tsx
--- a/src/_oldvideo/components/actions/SeriesSelectionAction.tsx
+++ b/src/_oldvideo/components/actions/SeriesSelectionAction.tsx
--- a/src/_oldvideo/components/actions/SettingsAction.tsx
+++ b/src/_oldvideo/components/actions/SettingsAction.tsx
--- a/src/_oldvideo/components/actions/ShowTitleAction.tsx
+++ b/src/_oldvideo/components/actions/ShowTitleAction.tsx
--- a/src/_oldvideo/components/actions/SkipTimeAction.tsx
+++ b/src/_oldvideo/components/actions/SkipTimeAction.tsx
--- a/src/_oldvideo/components/actions/ThumbnailAction.tsx
+++ b/src/_oldvideo/components/actions/ThumbnailAction.tsx
--- a/src/_oldvideo/components/actions/TimeAction.tsx
+++ b/src/_oldvideo/components/actions/TimeAction.tsx
--- a/src/_oldvideo/components/actions/VolumeAction.tsx
+++ b/src/_oldvideo/components/actions/VolumeAction.tsx
--- a/src/_oldvideo/components/actions/VolumeAdjustedAction.tsx
+++ b/src/_oldvideo/components/actions/VolumeAdjustedAction.tsx
--- a/src/_oldvideo/components/actions/list-entries/CaptionsSelectionAction.tsx
+++ b/src/_oldvideo/components/actions/list-entries/CaptionsSelectionAction.tsx
--- a/src/_oldvideo/components/actions/list-entries/DownloadAction.tsx
+++ b/src/_oldvideo/components/actions/list-entries/DownloadAction.tsx
--- a/src/_oldvideo/components/actions/list-entries/PlaybackSpeedSelectionAction.tsx
+++ b/src/_oldvideo/components/actions/list-entries/PlaybackSpeedSelectionAction.tsx
--- a/src/_oldvideo/components/actions/list-entries/QualityDisplayAction.tsx
+++ b/src/_oldvideo/components/actions/list-entries/QualityDisplayAction.tsx
--- a/src/_oldvideo/components/actions/list-entries/SourceSelectionAction.tsx
+++ b/src/_oldvideo/components/actions/list-entries/SourceSelectionAction.tsx
--- a/src/_oldvideo/components/controllers/MetaController.tsx
+++ b/src/_oldvideo/components/controllers/MetaController.tsx
--- a/src/_oldvideo/components/controllers/ProgressListenerController.tsx
+++ b/src/_oldvideo/components/controllers/ProgressListenerController.tsx
--- a/src/_oldvideo/components/controllers/SeriesController.tsx
+++ b/src/_oldvideo/components/controllers/SeriesController.tsx
--- a/src/_oldvideo/components/controllers/SourceController.tsx
+++ b/src/_oldvideo/components/controllers/SourceController.tsx
--- a/src/_oldvideo/components/hooks/useCurrentSeriesEpisodeInfo.ts
+++ b/src/_oldvideo/components/hooks/useCurrentSeriesEpisodeInfo.ts
--- a/src/_oldvideo/components/hooks/useInitialized.ts
+++ b/src/_oldvideo/components/hooks/useInitialized.ts
--- a/src/_oldvideo/components/hooks/useSyncPopouts.ts
+++ b/src/_oldvideo/components/hooks/useSyncPopouts.ts
--- a/src/_oldvideo/components/hooks/volumeStore.ts
+++ b/src/_oldvideo/components/hooks/volumeStore.ts
--- a/src/_oldvideo/components/internal/CastingInternal.tsx
+++ b/src/_oldvideo/components/internal/CastingInternal.tsx
--- a/src/_oldvideo/components/internal/ThumbnailGeneratorInternal.tsx
+++ b/src/_oldvideo/components/internal/ThumbnailGeneratorInternal.tsx
--- a/src/_oldvideo/components/internal/VideoElementInternal.tsx
+++ b/src/_oldvideo/components/internal/VideoElementInternal.tsx
--- a/src/_oldvideo/components/internal/WrapperRegisterInternal.tsx
+++ b/src/_oldvideo/components/internal/WrapperRegisterInternal.tsx
--- a/src/_oldvideo/components/parts/VideoErrorBoundary.tsx
+++ b/src/_oldvideo/components/parts/VideoErrorBoundary.tsx
--- a/src/_oldvideo/components/parts/VideoPlayerError.tsx
+++ b/src/_oldvideo/components/parts/VideoPlayerError.tsx
--- a/src/_oldvideo/components/parts/VideoPlayerHeader.tsx
+++ b/src/_oldvideo/components/parts/VideoPlayerHeader.tsx
--- a/src/_oldvideo/components/parts/VideoPlayerIconButton.tsx
+++ b/src/_oldvideo/components/parts/VideoPlayerIconButton.tsx
--- a/src/_oldvideo/components/parts/VideoPopout.tsx
+++ b/src/_oldvideo/components/parts/VideoPopout.tsx
--- a/src/_oldvideo/components/popouts/CaptionSelectionPopout.tsx
+++ b/src/_oldvideo/components/popouts/CaptionSelectionPopout.tsx
--- a/src/_oldvideo/components/popouts/CaptionSettingsPopout.tsx
+++ b/src/_oldvideo/components/popouts/CaptionSettingsPopout.tsx
--- a/src/_oldvideo/components/popouts/EpisodeSelectionPopout.tsx
+++ b/src/_oldvideo/components/popouts/EpisodeSelectionPopout.tsx
--- a/src/_oldvideo/components/popouts/PlaybackSpeedPopout.tsx
+++ b/src/_oldvideo/components/popouts/PlaybackSpeedPopout.tsx
--- a/src/_oldvideo/components/popouts/PopoutAnchor.tsx
+++ b/src/_oldvideo/components/popouts/PopoutAnchor.tsx
--- a/src/_oldvideo/components/popouts/PopoutProviderAction.tsx
+++ b/src/_oldvideo/components/popouts/PopoutProviderAction.tsx
--- a/src/_oldvideo/components/popouts/PopoutUtils.tsx
+++ b/src/_oldvideo/components/popouts/PopoutUtils.tsx
--- a/src/_oldvideo/components/popouts/SettingsPopout.tsx
+++ b/src/_oldvideo/components/popouts/SettingsPopout.tsx
--- a/src/_oldvideo/components/popouts/SourceSelectionPopout.tsx
+++ b/src/_oldvideo/components/popouts/SourceSelectionPopout.tsx
--- a/src/_oldvideo/state/cache.ts
+++ b/src/_oldvideo/state/cache.ts
--- a/src/_oldvideo/state/events.ts
+++ b/src/_oldvideo/state/events.ts
--- a/src/_oldvideo/state/hooks.tsx
+++ b/src/_oldvideo/state/hooks.tsx
--- a/src/_oldvideo/state/init.ts
+++ b/src/_oldvideo/state/init.ts
--- a/src/_oldvideo/state/logic/controls.ts
+++ b/src/_oldvideo/state/logic/controls.ts
--- a/src/_oldvideo/state/logic/error.ts
+++ b/src/_oldvideo/state/logic/error.ts
--- a/src/_oldvideo/state/logic/interface.ts
+++ b/src/_oldvideo/state/logic/interface.ts
--- a/src/_oldvideo/state/logic/mediaplaying.ts
+++ b/src/_oldvideo/state/logic/mediaplaying.ts
--- a/src/_oldvideo/state/logic/meta.ts
+++ b/src/_oldvideo/state/logic/meta.ts
--- a/src/_oldvideo/state/logic/misc.ts
+++ b/src/_oldvideo/state/logic/misc.ts
--- a/src/_oldvideo/state/logic/progress.ts
+++ b/src/_oldvideo/state/logic/progress.ts
--- a/src/_oldvideo/state/logic/source.ts
+++ b/src/_oldvideo/state/logic/source.ts
--- a/src/_oldvideo/state/providers/castingStateProvider.ts
+++ b/src/_oldvideo/state/providers/castingStateProvider.ts
--- a/src/_oldvideo/state/providers/helpers.ts
+++ b/src/_oldvideo/state/providers/helpers.ts
--- a/src/_oldvideo/state/providers/providerTypes.ts
+++ b/src/_oldvideo/state/providers/providerTypes.ts
--- a/src/_oldvideo/state/providers/utils.ts
+++ b/src/_oldvideo/state/providers/utils.ts
--- a/src/_oldvideo/state/providers/videoStateProvider.ts
+++ b/src/_oldvideo/state/providers/videoStateProvider.ts
--- a/src/_oldvideo/state/types.ts
+++ b/src/_oldvideo/state/types.ts