mirror/sonixd
1
0
Fork 0
mirror of https://github.com/jeffvli/sonixd.git synced 2026-04-30 11:12:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix when play/pause after scrobble threshold (#30)

Browse Source
This commit is contained in:
jeffvli
2021-10-13 01:36:07 -07:00
committed by Jeff
parent 53398551ca
commit ca9fa2b9ed
1 changed files with 40 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/components/player/Player.tsx
View File

@@ -467,24 +467,48 @@ const Player = ({ currentEntryList, children }: any, ref: any) => {
);
}, [dispatch, playQueue, scrobbled]);
const handleOnPlay = (playerNumber: 1 | 2) => {
setScrobbled(false);
if (playQueue.scrobble) {
if (playerNumber === 1) {
if (playQueue[currentEntryList][playQueue.player1.index]?.id) {
scrobble({
id: playQueue[currentEntryList][playQueue.player1.index]?.id,
submission: false,
});
const handleOnPlay = useCallback(
(playerNumber: 1 | 2) => {
// Don't run this if resuming a song, so we'll use a 30 second check
if (playQueue.scrobble) {
let fadeAtTime;
let duration;
if (playQueue.currentPlayer === 1) {
duration = player1Ref.current.audioEl.current?.duration;
fadeAtTime = duration - playQueue.fadeDuration;
} else {
duration = player2Ref.current.audioEl.current?.duration;
fadeAtTime = duration - playQueue.fadeDuration;
}
// Set the reset scrobble condition based on fade or gapless
if (
playQueue.fadeDuration > 0
? !(player.currentSeek >= 240 || player.currentSeek >= fadeAtTime - 15) &&
player.currentSeek <= fadeAtTime
: !(player.currentSeek >= 240 || player.currentSeek >= duration * 0.9)
) {
setScrobbled(false);
if (playQueue.scrobble) {
if (playerNumber === 1) {
if (playQueue[currentEntryList][playQueue.player1.index]?.id) {
scrobble({
id: playQueue[currentEntryList][playQueue.player1.index]?.id,
submission: false,
});
}
} else if (playQueue[currentEntryList][playQueue.player2.index]?.id) {
scrobble({
id: playQueue[currentEntryList][playQueue.player2.index]?.id,
submission: false,
});
}
}
}
} else if (playQueue[currentEntryList][playQueue.player2.index]?.id) {
scrobble({
id: playQueue[currentEntryList][playQueue.player2.index]?.id,
submission: false,
});
}
}
};
},
[currentEntryList, playQueue, player.currentSeek]
);
return (
<>