resolve merge conflicts

Browse Source

...

This commit is contained in:

Felix Boehme 2023-09-02 16:12:57 +02:00

parent 04f67df289

commit e5e35c05e0

No known key found for this signature in database

GPG Key ID: 7EB0603E4E9642EA

76 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0

src/video/components/VideoPlayer.tsx → src/_oldvideo/components/VideoPlayer.tsx

0

src/video/components/VideoPlayerBase.tsx → src/_oldvideo/components/VideoPlayerBase.tsx

0

src/video/components/actions/AirplayAction.tsx → src/_oldvideo/components/actions/AirplayAction.tsx

0

src/video/components/actions/BackdropAction.tsx → src/_oldvideo/components/actions/BackdropAction.tsx

0

src/video/components/actions/CaptionRendererAction.tsx → src/_oldvideo/components/actions/CaptionRendererAction.tsx

0

src/video/components/actions/CastingTextAction.tsx → src/_oldvideo/components/actions/CastingTextAction.tsx

0

src/video/components/actions/ChromecastAction.tsx → src/_oldvideo/components/actions/ChromecastAction.tsx

0

src/video/components/actions/DividerAction.tsx → src/_oldvideo/components/actions/DividerAction.tsx

0

src/video/components/actions/FullscreenAction.tsx → src/_oldvideo/components/actions/FullscreenAction.tsx

0

src/video/components/actions/HeaderAction.tsx → src/_oldvideo/components/actions/HeaderAction.tsx

0

src/video/components/actions/KeyboardShortcutsAction.tsx → src/_oldvideo/components/actions/KeyboardShortcutsAction.tsx

0

src/video/components/actions/LoadingAction.tsx → src/_oldvideo/components/actions/LoadingAction.tsx

0

src/video/components/actions/MetaAction.tsx → src/_oldvideo/components/actions/MetaAction.tsx

0

src/video/components/actions/MiddlePauseAction.tsx → src/_oldvideo/components/actions/MiddlePauseAction.tsx

0

src/video/components/actions/MobileCenterAction.tsx → src/_oldvideo/components/actions/MobileCenterAction.tsx

0

src/video/components/actions/PageTitleAction.tsx → src/_oldvideo/components/actions/PageTitleAction.tsx

0

src/video/components/actions/PauseAction.tsx → src/_oldvideo/components/actions/PauseAction.tsx

0

src/video/components/actions/PictureInPictureAction.tsx → src/_oldvideo/components/actions/PictureInPictureAction.tsx

0

src/video/components/actions/ProgressAction.tsx → src/_oldvideo/components/actions/ProgressAction.tsx

0

src/video/components/actions/SeriesSelectionAction.tsx → src/_oldvideo/components/actions/SeriesSelectionAction.tsx

0

src/video/components/actions/SettingsAction.tsx → src/_oldvideo/components/actions/SettingsAction.tsx

0

src/video/components/actions/ShowTitleAction.tsx → src/_oldvideo/components/actions/ShowTitleAction.tsx

0

src/video/components/actions/SkipTimeAction.tsx → src/_oldvideo/components/actions/SkipTimeAction.tsx

0

src/video/components/actions/ThumbnailAction.tsx → src/_oldvideo/components/actions/ThumbnailAction.tsx

0

src/video/components/actions/TimeAction.tsx → src/_oldvideo/components/actions/TimeAction.tsx

0

src/video/components/actions/VolumeAction.tsx → src/_oldvideo/components/actions/VolumeAction.tsx

0

src/video/components/actions/VolumeAdjustedAction.tsx → src/_oldvideo/components/actions/VolumeAdjustedAction.tsx

0

src/video/components/actions/list-entries/CaptionsSelectionAction.tsx → src/_oldvideo/components/actions/list-entries/CaptionsSelectionAction.tsx

0

src/video/components/actions/list-entries/DownloadAction.tsx → src/_oldvideo/components/actions/list-entries/DownloadAction.tsx

0

src/video/components/actions/list-entries/PlaybackSpeedSelectionAction.tsx → src/_oldvideo/components/actions/list-entries/PlaybackSpeedSelectionAction.tsx

0

src/video/components/actions/list-entries/QualityDisplayAction.tsx → src/_oldvideo/components/actions/list-entries/QualityDisplayAction.tsx

0

src/video/components/actions/list-entries/SourceSelectionAction.tsx → src/_oldvideo/components/actions/list-entries/SourceSelectionAction.tsx

0

src/video/components/controllers/MetaController.tsx → src/_oldvideo/components/controllers/MetaController.tsx

0

src/video/components/controllers/ProgressListenerController.tsx → src/_oldvideo/components/controllers/ProgressListenerController.tsx

0

src/video/components/controllers/SeriesController.tsx → src/_oldvideo/components/controllers/SeriesController.tsx

0

src/video/components/controllers/SourceController.tsx → src/_oldvideo/components/controllers/SourceController.tsx

0

src/video/components/hooks/useCurrentSeriesEpisodeInfo.ts → src/_oldvideo/components/hooks/useCurrentSeriesEpisodeInfo.ts

0

src/video/components/hooks/useInitialized.ts → src/_oldvideo/components/hooks/useInitialized.ts

0

src/video/components/hooks/useSyncPopouts.ts → src/_oldvideo/components/hooks/useSyncPopouts.ts

0

src/video/components/hooks/volumeStore.ts → src/_oldvideo/components/hooks/volumeStore.ts

0

src/video/components/internal/CastingInternal.tsx → src/_oldvideo/components/internal/CastingInternal.tsx

0

src/video/components/internal/ThumbnailGeneratorInternal.tsx → src/_oldvideo/components/internal/ThumbnailGeneratorInternal.tsx

0

src/video/components/internal/VideoElementInternal.tsx → src/_oldvideo/components/internal/VideoElementInternal.tsx

0

src/video/components/internal/WrapperRegisterInternal.tsx → src/_oldvideo/components/internal/WrapperRegisterInternal.tsx

0

src/video/components/parts/VideoErrorBoundary.tsx → src/_oldvideo/components/parts/VideoErrorBoundary.tsx

0

src/video/components/parts/VideoPlayerError.tsx → src/_oldvideo/components/parts/VideoPlayerError.tsx

0

src/video/components/parts/VideoPlayerHeader.tsx → src/_oldvideo/components/parts/VideoPlayerHeader.tsx

0

src/video/components/parts/VideoPlayerIconButton.tsx → src/_oldvideo/components/parts/VideoPlayerIconButton.tsx

0

src/video/components/parts/VideoPopout.tsx → src/_oldvideo/components/parts/VideoPopout.tsx

0

src/video/components/popouts/CaptionSelectionPopout.tsx → src/_oldvideo/components/popouts/CaptionSelectionPopout.tsx

0

src/video/components/popouts/CaptionSettingsPopout.tsx → src/_oldvideo/components/popouts/CaptionSettingsPopout.tsx

0

src/video/components/popouts/EpisodeSelectionPopout.tsx → src/_oldvideo/components/popouts/EpisodeSelectionPopout.tsx

0

src/video/components/popouts/PlaybackSpeedPopout.tsx → src/_oldvideo/components/popouts/PlaybackSpeedPopout.tsx

0

src/video/components/popouts/PopoutAnchor.tsx → src/_oldvideo/components/popouts/PopoutAnchor.tsx

0

src/video/components/popouts/PopoutProviderAction.tsx → src/_oldvideo/components/popouts/PopoutProviderAction.tsx

0

src/video/components/popouts/PopoutUtils.tsx → src/_oldvideo/components/popouts/PopoutUtils.tsx

0

src/video/components/popouts/SettingsPopout.tsx → src/_oldvideo/components/popouts/SettingsPopout.tsx

0

src/video/components/popouts/SourceSelectionPopout.tsx → src/_oldvideo/components/popouts/SourceSelectionPopout.tsx

0

src/video/state/cache.ts → src/_oldvideo/state/cache.ts

0

src/video/state/events.ts → src/_oldvideo/state/events.ts

0

src/video/state/hooks.tsx → src/_oldvideo/state/hooks.tsx

0

src/video/state/init.ts → src/_oldvideo/state/init.ts

0

src/video/state/logic/controls.ts → src/_oldvideo/state/logic/controls.ts

0

src/video/state/logic/error.ts → src/_oldvideo/state/logic/error.ts

0

src/video/state/logic/interface.ts → src/_oldvideo/state/logic/interface.ts

0

src/video/state/logic/mediaplaying.ts → src/_oldvideo/state/logic/mediaplaying.ts

0

src/video/state/logic/meta.ts → src/_oldvideo/state/logic/meta.ts

0

src/video/state/logic/misc.ts → src/_oldvideo/state/logic/misc.ts

0

src/video/state/logic/progress.ts → src/_oldvideo/state/logic/progress.ts

0

src/video/state/logic/source.ts → src/_oldvideo/state/logic/source.ts

0

src/video/state/providers/castingStateProvider.ts → src/_oldvideo/state/providers/castingStateProvider.ts

0

src/video/state/providers/helpers.ts → src/_oldvideo/state/providers/helpers.ts

0

src/video/state/providers/providerTypes.ts → src/_oldvideo/state/providers/providerTypes.ts

0

src/video/state/providers/utils.ts → src/_oldvideo/state/providers/utils.ts

0

src/video/state/providers/videoStateProvider.ts → src/_oldvideo/state/providers/videoStateProvider.ts

0

src/video/state/types.ts → src/_oldvideo/state/types.ts