Skip to content

armgit / Handy

Public Imported from GitHub
0

A free, open source, and extensible speech-to-text application that works completely offline.

fix: prevent history audio players from playing simultaneously (#1665)

Jonas Flörke4be7911d4de7
diff --git a/src/components/settings/history/HistorySettings.tsx b/src/components/settings/history/HistorySettings.tsx
index 61706936..ac8658b6 100644
--- a/src/components/settings/history/HistorySettings.tsx
+++ b/src/components/settings/history/HistorySettings.tsx
@@ -12,7 +12,7 @@ import {
} from "@/bindings";
import { useOsType } from "@/hooks/useOsType";
import { formatDateTime } from "@/utils/dateFormat";
-import { AudioPlayer } from "../../ui/AudioPlayer";
+import { AudioPlayer, AudioPlayerGroup } from "../../ui/AudioPlayer";
import { Button } from "../../ui/Button";
const IconButton: React.FC<{
@@ -251,19 +251,21 @@ export const HistorySettings: React.FC = () => {
} else {
content = (
<>
- <div className="divide-y divide-mid-gray/20">
- {entries.map((entry) => (
- <HistoryEntryComponent
- key={entry.id}
- entry={entry}
- onToggleSaved={() => toggleSaved(entry.id)}
- onCopyText={() => copyToClipboard(entry.transcription_text)}
- getAudioUrl={getAudioUrl}
- deleteAudio={deleteAudioEntry}
- retryTranscription={retryHistoryEntry}
- />
- ))}
- </div>
+ <AudioPlayerGroup>
+ <div className="divide-y divide-mid-gray/20">
+ {entries.map((entry) => (
+ <HistoryEntryComponent
+ key={entry.id}
+ entry={entry}
+ onToggleSaved={() => toggleSaved(entry.id)}
+ onCopyText={() => copyToClipboard(entry.transcription_text)}
+ getAudioUrl={getAudioUrl}
+ deleteAudio={deleteAudioEntry}
+ retryTranscription={retryHistoryEntry}
+ />
+ ))}
+ </div>
+ </AudioPlayerGroup>
{/* Sentinel for infinite scroll */}
<div ref={sentinelRef} className="h-1" />
</>
diff --git a/src/components/ui/AudioPlayer.tsx b/src/components/ui/AudioPlayer.tsx
index 884452a1..676bca73 100644
--- a/src/components/ui/AudioPlayer.tsx
+++ b/src/components/ui/AudioPlayer.tsx
@@ -1,4 +1,12 @@
-import React, { useState, useRef, useEffect, useCallback } from "react";
+import React, {
+ createContext,
+ useCallback,
+ useContext,
+ useEffect,
+ useMemo,
+ useRef,
+ useState,
+} from "react";
import { Play, Pause } from "lucide-react";
interface AudioPlayerProps {
@@ -10,12 +18,45 @@ interface AudioPlayerProps {
autoPlay?: boolean;
}
+interface AudioPlayerGroupContextValue {
+ requestPlayback: (audio: HTMLAudioElement) => void;
+ releasePlayback: (audio: HTMLAudioElement) => void;
+}
+
+const AudioPlayerGroupContext =
+ createContext<AudioPlayerGroupContextValue | null>(null);
+
+export const AudioPlayerGroup: React.FC<React.PropsWithChildren> = ({
+ children,
+}) => {
+ const activeAudioRef = useRef<HTMLAudioElement | null>(null);
+ const value = useMemo<AudioPlayerGroupContextValue>(
+ () => ({
+ requestPlayback: (audio) => {
+ if (activeAudioRef.current !== audio) activeAudioRef.current?.pause();
+ activeAudioRef.current = audio;
+ },
+ releasePlayback: (audio) => {
+ if (activeAudioRef.current === audio) activeAudioRef.current = null;
+ },
+ }),
+ [],
+ );
+
+ return (
+ <AudioPlayerGroupContext.Provider value={value}>
+ {children}
+ </AudioPlayerGroupContext.Provider>
+ );
+};
+
export const AudioPlayer: React.FC<AudioPlayerProps> = ({
src: initialSrc,
onLoadRequest,
className = "",
autoPlay = false,
}) => {
+ const group = useContext(AudioPlayerGroupContext);
const [isPlaying, setIsPlaying] = useState(false);
const [duration, setDuration] = useState(0);
const [currentTime, setCurrentTime] = useState(0);
@@ -87,12 +128,19 @@ export const AudioPlayer: React.FC<AudioPlayerProps> = ({
};
const handleEnded = () => {
+ group?.releasePlayback(audio);
setIsPlaying(false);
setCurrentTime(audio.duration || 0);
};
- const handlePlay = () => setIsPlaying(true);
- const handlePause = () => setIsPlaying(false);
+ const handlePlay = () => {
+ group?.requestPlayback(audio);
+ setIsPlaying(true);
+ };
+ const handlePause = () => {
+ group?.releasePlayback(audio);
+ setIsPlaying(false);
+ };
audio.addEventListener("loadedmetadata", handleLoadedMetadata);
audio.addEventListener("ended", handleEnded);
@@ -100,12 +148,13 @@ export const AudioPlayer: React.FC<AudioPlayerProps> = ({
audio.addEventListener("pause", handlePause);
return () => {
+ group?.releasePlayback(audio);
audio.removeEventListener("loadedmetadata", handleLoadedMetadata);
audio.removeEventListener("ended", handleEnded);
audio.removeEventListener("play", handlePlay);
audio.removeEventListener("pause", handlePause);
};
- }, []);
+ }, [group]);
// Auto-play when src becomes available (via onLoadRequest or autoPlay prop)
const prevLoadedSrc = useRef<string | null>(null);