legop3/MultiRoombaRover
1
0
Fork 0
mirror of https://github.com/legop3/MultiRoombaRover.git synced 2026-09-16 01:21:20 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

duck fade

Browse Source
This commit is contained in:
legop3
2026-02-21 18:59:00 -05:00
parent 12a787b7c6
commit d3b35506d9
3 changed files with 49 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/public/assets/index-C7EVVuUj.js → server/public/assets/index-Lnr2QLOe.js
+10 -10
View File
File diff suppressed because one or more lines are too long
server/public/index.html
+1 -1
View File
@@ -11,7 +11,7 @@
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" /> <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
<meta name="apple-mobile-web-app-title" content="Multi Roomba Rover" /> <meta name="apple-mobile-web-app-title" content="Multi Roomba Rover" />
<title>Multi Roomba Rover</title> <title>Multi Roomba Rover</title>
<script type="module" crossorigin src="/assets/index-C7EVVuUj.js"></script> <script type="module" crossorigin src="/assets/index-Lnr2QLOe.js"></script>
<link rel="stylesheet" crossorigin href="/assets/index-Bz1ixYh7.css"> <link rel="stylesheet" crossorigin href="/assets/index-Bz1ixYh7.css">
</head> </head>
<body> <body>
webui/src/components/VideoTile.jsx
+38 -2
View File
@@ -14,6 +14,7 @@ const RESTART_DELAY_MS = 2000;
const UNMUTE_RETRY_MS = 3000; const UNMUTE_RETRY_MS = 3000;
const AUDIO_RETRY_MS = 3000; const AUDIO_RETRY_MS = 3000;
const BRUSH_CURRENT_THRESHOLD_MA = 40; const BRUSH_CURRENT_THRESHOLD_MA = 40;
const DUCK_RELEASE_FADE_MS = 1000;
export default function VideoTile({ export default function VideoTile({
sessionInfo, sessionInfo,
@@ -46,6 +47,8 @@ export default function VideoTile({
const audioRestartTimer = useRef(null); const audioRestartTimer = useRef(null);
const audioPlayInterval = useRef(null); const audioPlayInterval = useRef(null);
const unmuteTimer = useRef(null); const unmuteTimer = useRef(null);
const volumeFadeFrameRef = useRef(null);
const appliedVolumeRef = useRef(null);
const [status, setStatus] = useState('idle'); const [status, setStatus] = useState('idle');
const [detail, setDetail] = useState(null); const [detail, setDetail] = useState(null);
const [audioStatus, setAudioStatus] = useState('idle'); const [audioStatus, setAudioStatus] = useState('idle');
@@ -268,6 +271,10 @@ export default function VideoTile({
clearTimeout(audioRestartTimer.current); clearTimeout(audioRestartTimer.current);
clearTimeout(unmuteTimer.current); clearTimeout(unmuteTimer.current);
clearInterval(audioPlayInterval.current); clearInterval(audioPlayInterval.current);
if (volumeFadeFrameRef.current) {
cancelAnimationFrame(volumeFadeFrameRef.current);
volumeFadeFrameRef.current = null;
}
}, },
[], [],
); );
@@ -337,11 +344,40 @@ export default function VideoTile({
const audioEl = audioRef.current; const audioEl = audioRef.current;
if (!audioEl || !audioSessionInfo?.url) { if (!audioEl || !audioSessionInfo?.url) {
logAudio('route/no-audio-url'); logAudio('route/no-audio-url');
appliedVolumeRef.current = null;
return; return;
} }
audioEl.volume = effectiveRoverGain; const targetVolume = Math.max(0, Math.min(1, effectiveRoverGain));
const currentVolume =
appliedVolumeRef.current == null
? Math.max(0, Math.min(1, audioEl.volume))
: appliedVolumeRef.current;
if (volumeFadeFrameRef.current) {
cancelAnimationFrame(volumeFadeFrameRef.current);
volumeFadeFrameRef.current = null;
}
if (targetVolume > currentVolume) {
const startedAt = performance.now();
const from = currentVolume;
const delta = targetVolume - from;
const tick = (ts) => {
const progress = Math.min(1, (ts - startedAt) / DUCK_RELEASE_FADE_MS);
const next = from + delta * progress;
audioEl.volume = next;
appliedVolumeRef.current = next;
if (progress < 1) {
volumeFadeFrameRef.current = requestAnimationFrame(tick);
} else {
volumeFadeFrameRef.current = null;
}
};
volumeFadeFrameRef.current = requestAnimationFrame(tick);
} else {
audioEl.volume = targetVolume;
appliedVolumeRef.current = targetVolume;
}
logAudio('route/direct', { logAudio('route/direct', {
elementVolume: audioEl.volume, elementVolume: targetVolume,
duckEnabled: mainBrushDuckEnabled, duckEnabled: mainBrushDuckEnabled,
mainBrushActive, mainBrushActive,
duckAmount: mainBrushDuckAmount, duckAmount: mainBrushDuckAmount,