Merge branch 'fix/sync-t-timer-ntp' into bbc-main-autonext

Author: PeterC89

packages/webui/src/client/ui/ClockView/TTimerDisplay.tsx

@@ -4,6 +4,7 @@ import { calculateTTimerDiff, calculateTTimerOverUnder } from '../../lib/tTimerU
 import { useTiming } from '../RundownView/RundownTiming/withTiming.js'
 import { OverUnderChip } from '../../lib/Components/OverUnderChip.js'
 import { Countdown } from '../RundownView/RundownHeader/Countdown.js'
+import { getCurrentTime } from '../../lib/systemTime.js'
 
 interface TTimerDisplayProps {
 	timer: RundownTTimer
@@ -14,21 +15,11 @@ export function TTimerDisplay({ timer }: Readonly<TTimerDisplayProps>): JSX.Elem
 
 	if (!timer.mode) return null
 
-	const now = Date.now()
+	const now = getCurrentTime()
 
 	const diff = calculateTTimerDiff(timer, now)
 	const overUnder = calculateTTimerOverUnder(timer, now)
-	const timeStr = RundownUtils.formatDiffToTimecode(
-		Math.abs(diff),
-		false,
-		true,
-		true,
-		false,
-		true,
-		undefined,
-		true,
-		true
-	)
+	const timeStr = RundownUtils.formatDiffToTimecode(Math.abs(diff), false, true, true, false, true)
 	const timerSign = diff >= 0 ? '' : '-'
 
 	return (

packages/webui/src/client/ui/RundownView/RundownHeader/RundownHeaderDurations.tsx

@@ -4,6 +4,7 @@ import { Countdown } from './Countdown'
 import { useTiming } from '../RundownTiming/withTiming'
 import { RundownUtils } from '../../../lib/rundown.js'
 import { PlaylistTiming } from '@sofie-automation/corelib/dist/playout/rundownTiming'
+import { getCurrentTime } from '../../../lib/systemTime'
 
 export function RundownHeaderDurations({
 	playlist,
@@ -21,7 +22,7 @@ export function RundownHeaderDurations({
 
 	const estDuration = PlaylistTiming.getRemainingDuration(
 		playlist.timing,
-		timingDurations.currentTime ?? Date.now(),
+		timingDurations.currentTime ?? getCurrentTime(),
 		timingDurations.remainingPlaylistDuration,
 		startedPlayback
 	)

packages/webui/src/client/ui/RundownView/RundownHeader/RundownHeaderExpectedEnd.tsx

@@ -3,6 +3,7 @@ import { PlaylistTiming } from '@sofie-automation/corelib/dist/playout/rundownTi
 import { useTranslation } from 'react-i18next'
 import { Countdown } from './Countdown'
 import { useTiming } from '../RundownTiming/withTiming'
+import { getCurrentTime } from '../../../lib/systemTime'
 
 export function RundownHeaderExpectedEnd({
 	playlist,
@@ -14,7 +15,7 @@ export function RundownHeaderExpectedEnd({
 	const { t } = useTranslation()
 	const timingDurations = useTiming()
 
-	const now = timingDurations.currentTime ?? Date.now()
+	const now = timingDurations.currentTime ?? getCurrentTime()
 	const expectedEnd = PlaylistTiming.getExpectedEnd(playlist.timing)
 	const startedPlayback = playlist.activationId ? playlist.startedPlayback : undefined
 	const estEnd = PlaylistTiming.getEstimatedEnd(

packages/webui/src/client/ui/RundownView/RundownHeader/RundownHeaderPlannedStart.tsx

@@ -4,6 +4,7 @@ import { useTranslation } from 'react-i18next'
 import { Countdown } from './Countdown'
 import { useTiming } from '../RundownTiming/withTiming'
 import { RundownUtils } from '../../../lib/rundown.js'
+import { getCurrentTime } from '../../../lib/systemTime'
 
 export function RundownHeaderPlannedStart({
 	playlist,
@@ -16,7 +17,7 @@ export function RundownHeaderPlannedStart({
 	const timingDurations = useTiming()
 	const expectedStart = PlaylistTiming.getExpectedStart(playlist.timing)
 
-	const now = timingDurations.currentTime ?? Date.now()
+	const now = timingDurations.currentTime ?? getCurrentTime()
 	const startsIn = now - (expectedStart ?? 0)
 	const startedPlayback = playlist.activationId ? playlist.startedPlayback : undefined