Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PR fixes #32

Merged
merged 1 commit into from
Jun 20, 2024
Merged

PR fixes #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion gui/src/pages/admin/karaoke/queue.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { useTranslation } from "react-i18next";
import { useAdminSocket } from "../../../hooks/adminSocket"

import Song from "./song";
import _ from "lodash";

const secondsToDisplay = (seconds: number) => {
if (seconds < 0) {
Expand Down
2 changes: 0 additions & 2 deletions gui/src/pages/booth/karaoke/cdgplayer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,6 @@ class CDGPlayer extends React.Component<CDGPlayerProps> {
this.audio.current.src = '/api/modules/karaoke/song/' + this.props.song.uuid + '/instrumental-mp3';
this.audio.current.load();

// @TODO: load vocals / full and sync them with the first audio, if they're available

// HTML Audio are not perfectly in sync this could lead to issues
// If this happens, need to implement this
// https://stackoverflow.com/questions/54509959/how-do-i-play-audio-files-synchronously-in-javascript
Expand Down
7 changes: 1 addition & 6 deletions gui/src/pages/booth/karaoke/videoplayer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { DetailedHTMLProps, ReactEventHandler, VideoHTMLAttributes, useEffect, useRef, useState } from "react";
import { useEffect, useRef } from "react";
import { KaraokeSong } from "../../../types/appstate";
import { Stack } from "@mui/material";

type Props = {
isPlaying: boolean;
Expand Down Expand Up @@ -78,7 +77,6 @@ export default function VideoPlayer({isPlaying, song, onEnd, onStatus, volumeFul
song.has_vocals &&
<audio
preload='auto'
// onCanPlayThrough={this.updateIsPlaying}
src={'/api/modules/karaoke/song/' + song.uuid + '/vocals-mp3'}
// Fuck typescript
//@ts-ignore
Expand All @@ -89,9 +87,7 @@ export default function VideoPlayer({isPlaying, song, onEnd, onStatus, volumeFul
song.has_full && !song.has_vocals &&
<audio
preload='auto'
// onCanPlayThrough={this.updateIsPlaying}
src={'/api/modules/karaoke/song/' + song.uuid + '/full-mp3'}
controls
// Fuck typescript
//@ts-ignore
ref={fullRef}
Expand All @@ -100,7 +96,6 @@ export default function VideoPlayer({isPlaying, song, onEnd, onStatus, volumeFul
<video
src={'/api/modules/karaoke/song/' + song.uuid + '/instrumental-webm'}
onEnded={onEnd}
// onCanPlayThrough={this.}
controls
// Fuck typescript
//@ts-ignore
Expand Down
Loading