From 99cb0a6b36ef0c33a0c46d74f5d00f73d0aace14 Mon Sep 17 00:00:00 2001 From: Eric Dauenhauer Date: Sat, 21 Jan 2023 14:34:47 -0600 Subject: [PATCH] Add countdown indicator to beata counter --- src/Metronome/controls/BeatCounter.tsx | 43 ++++++++++++++++++++------ src/Metronome/index.tsx | 4 ++- src/index.css | 16 ++++++++++ 3 files changed, 53 insertions(+), 10 deletions(-) diff --git a/src/Metronome/controls/BeatCounter.tsx b/src/Metronome/controls/BeatCounter.tsx index 3f9f068..d61caaf 100644 --- a/src/Metronome/controls/BeatCounter.tsx +++ b/src/Metronome/controls/BeatCounter.tsx @@ -4,7 +4,9 @@ import { ControlPanelItem } from './ControlPanelItem' type BeatCounterProps = { clock: Worker - beatsPerMeasure: number + beatsPerLoop: number + loopLengthSeconds: number + playing: boolean } export function BeatCounter(props: BeatCounterProps) { const [currentTick, setCurrentTick] = useState(0) @@ -24,17 +26,40 @@ export function BeatCounter(props: BeatCounterProps) { return () => { props.clock.removeEventListener('message', clockMessageHandler) } - }, [props.clock, props.beatsPerMeasure]) + }, [props.clock]) return ( - - {/* `+ 1` to convert "computer numbers" to "musician numbers" */} - {(currentTick % props.beatsPerMeasure) + 1} - - - . {Math.floor(currentTick / props.beatsPerMeasure) + 1} - + + + + {props.beatsPerLoop - currentTick} + + ) } diff --git a/src/Metronome/index.tsx b/src/Metronome/index.tsx index 344910c..0ea7eac 100644 --- a/src/Metronome/index.tsx +++ b/src/Metronome/index.tsx @@ -188,7 +188,9 @@ export const Metronome: React.FC = ({ clock }) => {