Skip to content

fix(audio): prevent overlapping playback on skip #2

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

Open
mntshoana wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(audio): prevent overlapping playback on skip #2

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
14 changes: 13 additions & 1 deletion apps/web/src/lib/hooks/use-audio-player.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ export function useAudioPlayer({
const animationFrameRef = useRef<number | null>(null);
const hasInitializedRef = useRef<boolean>(false);
const chunksRef = useRef<AudioChunk[]>(chunks);
const playbackGenerationRef = useRef<number>(0); // Incremented on each new playback to invalidate stale onended handlers

const [state, setState] = useState<AudioPlayerState>({
isPlaying: false,
Expand Down Expand Up @@ -211,9 +212,13 @@ export function useAudioPlayer({
async (chunkIndex: number, offsetWithinChunk: number = 0) => {
const ctx = ensureAudioContext();

// Increment generation to invalidate any pending onended handlers
const generation = ++playbackGenerationRef.current;

// Stop current playback
if (currentSourceRef.current) {
try {
currentSourceRef.current.onended = null; // Remove handler before stopping to prevent triggering
currentSourceRef.current.stop();
} catch (e) {
// Ignore - might already be stopped
Expand All @@ -222,6 +227,7 @@ export function useAudioPlayer({
}
if (nextSourceRef.current) {
try {
nextSourceRef.current.onended = null;
nextSourceRef.current.stop();
} catch (e) {}
nextSourceRef.current = null;
Expand Down Expand Up @@ -260,7 +266,8 @@ export function useAudioPlayer({
// Use ref to get latest chunks (not stale closure)
const currentChunks = chunksRef.current;

if (!isPlayingRef.current) {
// Check if this handler is still valid (not from a superseded playback)
if (!isPlayingRef.current || generation !== playbackGenerationRef.current) {
return;
}

Expand Down Expand Up @@ -400,11 +407,13 @@ export function useAudioPlayer({
// Pause
if (currentSourceRef.current) {
try {
currentSourceRef.current.onended = null;
currentSourceRef.current.stop();
} catch (e) {}
currentSourceRef.current = null;
}
isPlayingRef.current = false;
playbackGenerationRef.current++;
setState((prev) => ({ ...prev, isPlaying: false }));
} else {
// Resume from current position
Expand Down Expand Up @@ -557,11 +566,13 @@ export function useAudioPlayer({
// Stop current playback
if (currentSourceRef.current) {
try {
currentSourceRef.current.onended = null;
currentSourceRef.current.stop();
} catch (e) {}
currentSourceRef.current = null;
}
isPlayingRef.current = false;
playbackGenerationRef.current++;
currentChunkIndexRef.current = 0;
chunkStartOffsetRef.current = 0;

Expand Down Expand Up @@ -619,6 +630,7 @@ export function useAudioPlayer({
return () => {
if (currentSourceRef.current) {
try {
currentSourceRef.current.onended = null;
currentSourceRef.current.stop();
} catch (e) {}
currentSourceRef.current = null;
Expand Down