mirror of
https://github.com/movie-web/movie-web.git
synced 2024-11-10 23:15:06 +01:00
add audio track selector
This commit is contained in:
parent
2a0e46a97d
commit
c08dea89d1
@ -14,6 +14,7 @@ import { Menu } from "@/components/player/internals/ContextMenu";
|
|||||||
import { useOverlayRouter } from "@/hooks/useOverlayRouter";
|
import { useOverlayRouter } from "@/hooks/useOverlayRouter";
|
||||||
import { usePlayerStore } from "@/stores/player/store";
|
import { usePlayerStore } from "@/stores/player/store";
|
||||||
|
|
||||||
|
import { AudioView } from "./settings/AudioView";
|
||||||
import { CaptionSettingsView } from "./settings/CaptionSettingsView";
|
import { CaptionSettingsView } from "./settings/CaptionSettingsView";
|
||||||
import { CaptionsView } from "./settings/CaptionsView";
|
import { CaptionsView } from "./settings/CaptionsView";
|
||||||
import { DownloadRoutes } from "./settings/Downloads";
|
import { DownloadRoutes } from "./settings/Downloads";
|
||||||
@ -46,6 +47,11 @@ function SettingsOverlay({ id }: { id: string }) {
|
|||||||
<QualityView id={id} />
|
<QualityView id={id} />
|
||||||
</Menu.Card>
|
</Menu.Card>
|
||||||
</OverlayPage>
|
</OverlayPage>
|
||||||
|
<OverlayPage id={id} path="/audio" width={343} height={431}>
|
||||||
|
<Menu.Card>
|
||||||
|
<AudioView id={id} />
|
||||||
|
</Menu.Card>
|
||||||
|
</OverlayPage>
|
||||||
<OverlayPage id={id} path="/captions" width={343} height={431}>
|
<OverlayPage id={id} path="/captions" width={343} height={431}>
|
||||||
<Menu.CardWithScrollable>
|
<Menu.CardWithScrollable>
|
||||||
<CaptionsView id={id} />
|
<CaptionsView id={id} />
|
||||||
|
42
src/components/player/atoms/settings/AudioView.tsx
Normal file
42
src/components/player/atoms/settings/AudioView.tsx
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
import { t } from "i18next";
|
||||||
|
import { useCallback } from "react";
|
||||||
|
|
||||||
|
import { Menu } from "@/components/player/internals/ContextMenu";
|
||||||
|
import { useOverlayRouter } from "@/hooks/useOverlayRouter";
|
||||||
|
import { AudioTrack } from "@/stores/player/slices/source";
|
||||||
|
import { usePlayerStore } from "@/stores/player/store";
|
||||||
|
|
||||||
|
import { SelectableLink } from "../../internals/ContextMenu/Links";
|
||||||
|
|
||||||
|
export function AudioView({ id }: { id: string }) {
|
||||||
|
const router = useOverlayRouter(id);
|
||||||
|
const audioTracks = usePlayerStore((s) => s.audioTracks);
|
||||||
|
const currentAudioTrack = usePlayerStore((s) => s.currentAudioTrack);
|
||||||
|
const changeAudioTrack = usePlayerStore((s) => s.display?.changeAudioTrack);
|
||||||
|
|
||||||
|
const change = useCallback(
|
||||||
|
(track: AudioTrack) => {
|
||||||
|
changeAudioTrack?.(track);
|
||||||
|
router.close();
|
||||||
|
},
|
||||||
|
[router, changeAudioTrack],
|
||||||
|
);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<Menu.BackLink onClick={() => router.navigate("/")}>Audio</Menu.BackLink>
|
||||||
|
<Menu.Section className="flex flex-col pb-4">
|
||||||
|
{audioTracks.map((v) => (
|
||||||
|
<SelectableLink
|
||||||
|
key={v.id}
|
||||||
|
selected={v.id === currentAudioTrack?.id}
|
||||||
|
onClick={audioTracks.includes(v) ? () => change(v) : undefined}
|
||||||
|
disabled={!audioTracks.includes(v)}
|
||||||
|
>
|
||||||
|
{v.label} ({v.language})
|
||||||
|
</SelectableLink>
|
||||||
|
))}
|
||||||
|
</Menu.Section>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
@ -16,6 +16,7 @@ export function SettingsMenu({ id }: { id: string }) {
|
|||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
const router = useOverlayRouter(id);
|
const router = useOverlayRouter(id);
|
||||||
const currentQuality = usePlayerStore((s) => s.currentQuality);
|
const currentQuality = usePlayerStore((s) => s.currentQuality);
|
||||||
|
const currentAudioTrack = usePlayerStore((s) => s.currentAudioTrack);
|
||||||
const selectedCaptionLanguage = usePlayerStore(
|
const selectedCaptionLanguage = usePlayerStore(
|
||||||
(s) => s.caption.selected?.language,
|
(s) => s.caption.selected?.language,
|
||||||
);
|
);
|
||||||
@ -51,6 +52,13 @@ export function SettingsMenu({ id }: { id: string }) {
|
|||||||
>
|
>
|
||||||
{t("player.menus.settings.qualityItem")}
|
{t("player.menus.settings.qualityItem")}
|
||||||
</Menu.ChevronLink>
|
</Menu.ChevronLink>
|
||||||
|
<Menu.ChevronLink
|
||||||
|
onClick={() => router.navigate("/audio")}
|
||||||
|
rightText={currentAudioTrack ? currentAudioTrack.label : ""}
|
||||||
|
>
|
||||||
|
{/* {t("player.menus.settings.qualityItem")} */}
|
||||||
|
Audio
|
||||||
|
</Menu.ChevronLink>
|
||||||
<Menu.ChevronLink
|
<Menu.ChevronLink
|
||||||
onClick={() => router.navigate("/source")}
|
onClick={() => router.navigate("/source")}
|
||||||
rightText={sourceName}
|
rightText={sourceName}
|
||||||
|
@ -81,6 +81,24 @@ export function makeVideoElementDisplayInterface(): DisplayInterface {
|
|||||||
emit("qualities", convertedLevels);
|
emit("qualities", convertedLevels);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function reportAudioTracks() {
|
||||||
|
if (!hls) return;
|
||||||
|
const currentTrack = hls.audioTracks[hls.audioTrack];
|
||||||
|
emit("changedaudiotrack", {
|
||||||
|
id: currentTrack.id.toString(),
|
||||||
|
label: currentTrack.name,
|
||||||
|
language: currentTrack.lang ?? "unknown",
|
||||||
|
});
|
||||||
|
emit(
|
||||||
|
"audiotracks",
|
||||||
|
hls.audioTracks.map((v) => ({
|
||||||
|
id: v.id.toString(),
|
||||||
|
label: v.name,
|
||||||
|
language: v.lang ?? "unknown",
|
||||||
|
})),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
function setupQualityForHls() {
|
function setupQualityForHls() {
|
||||||
if (videoElement && canPlayHlsNatively(videoElement)) {
|
if (videoElement && canPlayHlsNatively(videoElement)) {
|
||||||
return; // nothing to change
|
return; // nothing to change
|
||||||
@ -155,6 +173,7 @@ export function makeVideoElementDisplayInterface(): DisplayInterface {
|
|||||||
if (!hls) return;
|
if (!hls) return;
|
||||||
reportLevels();
|
reportLevels();
|
||||||
setupQualityForHls();
|
setupQualityForHls();
|
||||||
|
reportAudioTracks();
|
||||||
|
|
||||||
if (isExtensionActiveCached()) {
|
if (isExtensionActiveCached()) {
|
||||||
hls.on(Hls.Events.LEVEL_LOADED, async (_, data) => {
|
hls.on(Hls.Events.LEVEL_LOADED, async (_, data) => {
|
||||||
@ -464,5 +483,18 @@ export function makeVideoElementDisplayInterface(): DisplayInterface {
|
|||||||
hls?.setSubtitleOption({ lang });
|
hls?.setSubtitleOption({ lang });
|
||||||
return promise;
|
return promise;
|
||||||
},
|
},
|
||||||
|
changeAudioTrack(track) {
|
||||||
|
if (!hls) return;
|
||||||
|
const audioTrack = hls?.audioTracks.find(
|
||||||
|
(t) => t.id.toString() === track.id,
|
||||||
|
);
|
||||||
|
if (!audioTrack) return;
|
||||||
|
hls.audioTrack = hls.audioTracks.indexOf(audioTrack);
|
||||||
|
emit("changedaudiotrack", {
|
||||||
|
id: audioTrack.id.toString(),
|
||||||
|
label: audioTrack.name,
|
||||||
|
language: audioTrack.lang ?? "unknown",
|
||||||
|
});
|
||||||
|
},
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -283,5 +283,8 @@ export function makeChromecastDisplayInterface(
|
|||||||
async setSubtitlePreference() {
|
async setSubtitlePreference() {
|
||||||
return Promise.resolve();
|
return Promise.resolve();
|
||||||
},
|
},
|
||||||
|
changeAudioTrack() {
|
||||||
|
// cant change audio tracks
|
||||||
|
},
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
import { MediaPlaylist } from "hls.js";
|
import { MediaPlaylist } from "hls.js";
|
||||||
|
|
||||||
import { MWMediaType } from "@/backend/metadata/types/mw";
|
import { MWMediaType } from "@/backend/metadata/types/mw";
|
||||||
import { CaptionListItem } from "@/stores/player/slices/source";
|
import { AudioTrack, CaptionListItem } from "@/stores/player/slices/source";
|
||||||
import { LoadableSource, SourceQuality } from "@/stores/player/utils/qualities";
|
import { LoadableSource, SourceQuality } from "@/stores/player/utils/qualities";
|
||||||
import { Listener } from "@/utils/events";
|
import { Listener } from "@/utils/events";
|
||||||
|
|
||||||
@ -25,6 +25,8 @@ export type DisplayInterfaceEvents = {
|
|||||||
loading: boolean;
|
loading: boolean;
|
||||||
qualities: SourceQuality[];
|
qualities: SourceQuality[];
|
||||||
changedquality: SourceQuality | null;
|
changedquality: SourceQuality | null;
|
||||||
|
audiotracks: AudioTrack[];
|
||||||
|
changedaudiotrack: AudioTrack | null;
|
||||||
needstrack: boolean;
|
needstrack: boolean;
|
||||||
canairplay: boolean;
|
canairplay: boolean;
|
||||||
playbackrate: number;
|
playbackrate: number;
|
||||||
@ -60,6 +62,7 @@ export interface DisplayInterface extends Listener<DisplayInterfaceEvents> {
|
|||||||
automaticQuality: boolean,
|
automaticQuality: boolean,
|
||||||
preferredQuality: SourceQuality | null,
|
preferredQuality: SourceQuality | null,
|
||||||
): void;
|
): void;
|
||||||
|
changeAudioTrack(audioTrack: AudioTrack): void;
|
||||||
processVideoElement(video: HTMLVideoElement): void;
|
processVideoElement(video: HTMLVideoElement): void;
|
||||||
processContainerElement(container: HTMLElement): void;
|
processContainerElement(container: HTMLElement): void;
|
||||||
toggleFullscreen(): void;
|
toggleFullscreen(): void;
|
||||||
|
@ -75,6 +75,16 @@ export const createDisplaySlice: MakeSlice<DisplaySlice> = (set, get) => ({
|
|||||||
s.currentQuality = quality;
|
s.currentQuality = quality;
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
newDisplay.on("audiotracks", (audioTracks) => {
|
||||||
|
set((s) => {
|
||||||
|
s.audioTracks = audioTracks;
|
||||||
|
});
|
||||||
|
});
|
||||||
|
newDisplay.on("changedaudiotrack", (audioTrack) => {
|
||||||
|
set((s) => {
|
||||||
|
s.currentAudioTrack = audioTrack;
|
||||||
|
});
|
||||||
|
});
|
||||||
newDisplay.on("needstrack", (needsTrack) => {
|
newDisplay.on("needstrack", (needsTrack) => {
|
||||||
set((s) => {
|
set((s) => {
|
||||||
s.caption.asTrack = needsTrack;
|
s.caption.asTrack = needsTrack;
|
||||||
|
@ -56,12 +56,20 @@ export interface CaptionListItem {
|
|||||||
hls?: boolean;
|
hls?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface AudioTrack {
|
||||||
|
id: string;
|
||||||
|
label: string;
|
||||||
|
language: string;
|
||||||
|
}
|
||||||
|
|
||||||
export interface SourceSlice {
|
export interface SourceSlice {
|
||||||
status: PlayerStatus;
|
status: PlayerStatus;
|
||||||
source: SourceSliceSource | null;
|
source: SourceSliceSource | null;
|
||||||
sourceId: string | null;
|
sourceId: string | null;
|
||||||
qualities: SourceQuality[];
|
qualities: SourceQuality[];
|
||||||
|
audioTracks: AudioTrack[];
|
||||||
currentQuality: SourceQuality | null;
|
currentQuality: SourceQuality | null;
|
||||||
|
currentAudioTrack: AudioTrack | null;
|
||||||
captionList: CaptionListItem[];
|
captionList: CaptionListItem[];
|
||||||
caption: {
|
caption: {
|
||||||
selected: Caption | null;
|
selected: Caption | null;
|
||||||
@ -109,8 +117,10 @@ export const createSourceSlice: MakeSlice<SourceSlice> = (set, get) => ({
|
|||||||
source: null,
|
source: null,
|
||||||
sourceId: null,
|
sourceId: null,
|
||||||
qualities: [],
|
qualities: [],
|
||||||
|
audioTracks: [],
|
||||||
captionList: [],
|
captionList: [],
|
||||||
currentQuality: null,
|
currentQuality: null,
|
||||||
|
currentAudioTrack: null,
|
||||||
status: playerStatus.IDLE,
|
status: playerStatus.IDLE,
|
||||||
meta: null,
|
meta: null,
|
||||||
caption: {
|
caption: {
|
||||||
|
Loading…
Reference in New Issue
Block a user