ash/WebStudio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #202 from UniversityRadioYork/mstratford/tracklist-patch

Browse source
This commit is contained in:
Marks Polakovs 2021-01-31 20:54:50 +00:00 committed by GitHub
commit 2790e0a20c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/mixer/state.ts
View file

@ -382,6 +382,13 @@ export const load = (
}
}
// If somehow we've managed to re-load the channel without ending tracklisting.
// This could happen if they paused it at the end, or if Wavesurfer forgot somehow.
const tracklistItemID = getState().mixer.players[player].tracklistItemID;
if (tracklistItemID !== -1) {
dispatch(BroadcastState.tracklistEnd(tracklistItemID));
}
// Can't really load a ghost, it'll break setting cues etc. Do nothing.
if (item.type === "ghost") {
return;

11
src/showplanner/Player.tsx
View file

@ -16,6 +16,7 @@ import * as ShowPlanState from "../showplanner/state";
import { HHMMTosec, secToHHMM, timestampToHHMM } from "../lib/utils";
import ProModeButtons from "./ProModeButtons";
import { VUMeter } from "../optionsMenu/helpers/VUMeter";
import * as BroadcastState from "../broadcast/state";
import * as api from "../api";
import { AppThunk } from "../store";
import {
@ -24,6 +25,7 @@ import {
PLAYER_COUNT,
PLAYER_ID_PREVIEW,
} from "../mixer/audio";
import { useBeforeunload } from "react-beforeunload";
export const USE_REAL_GAIN_VALUE = false;
@ -269,6 +271,15 @@ export function Player({
omit(b, "timeCurrent", "timeRemaining")
)
);
useBeforeunload((event) => {
console.log("Checking player " + id + " for un-ended tracklists.");
const tracklistItemID = playerState.tracklistItemID;
if (tracklistItemID !== -1) {
dispatch(BroadcastState.tracklistEnd(tracklistItemID));
}
});
const settings = useSelector((state: RootState) => state.settings);
const customOutput = settings.channelOutputIds[id] !== INTERNAL_OUTPUT_ID;
const dispatch = useDispatch();