File tree Expand file tree Collapse file tree 5 files changed +13
-10
lines changed
Expand file tree Collapse file tree 5 files changed +13
-10
lines changed Original file line number Diff line number Diff line change @@ -54,12 +54,12 @@ export function RundownHeader({
5454
5555 const expectedStart = PlaylistTiming . getExpectedStart ( playlist . timing )
5656 const expectedEnd = PlaylistTiming . getExpectedEnd ( playlist . timing )
57-
57+
5858 // const expectedDuration = PlaylistTiming.getExpectedDuration(playlist.timing)
5959 // @todo : this _should_ use PlaylistTiming.getExpectedDuration as show above,
6060 // but I don't dare changing its behaviour to return for PlaylistTimingType.None within the scope of this task
6161 // same issue in RundownHeaderDuration.tsx
62- const expectedDuration = playlist . timing . expectedDuration
62+ const expectedDuration = playlist . timing . expectedDuration
6363
6464 const hasSimple = ! ! ( expectedStart || expectedDuration || expectedEnd )
6565
Original file line number Diff line number Diff line change @@ -18,7 +18,7 @@ export function RundownHeaderDurations({
1818 // @todo : this _should_ use PlaylistTiming.getExpectedDuration as show above,
1919 // but I don't dare changing its behaviour to return for PlaylistTimingType.None within the scope of this task
2020 // same issue in RundownHeader.tsx
21- const expectedDuration = playlist . timing . expectedDuration
21+ const expectedDuration = playlist . timing . expectedDuration
2222
2323 // Use remainingPlaylistDuration which includes current part's remaining time
2424 const estDuration = timingDurations . remainingPlaylistDuration
Original file line number Diff line number Diff line change @@ -14,13 +14,15 @@ export function RundownHeaderExpectedEnd({
1414 const { t } = useTranslation ( )
1515 const timingDurations = useTiming ( )
1616
17- const expectedStart = PlaylistTiming . getExpectedStart ( playlist . timing )
17+ const expectedStart = PlaylistTiming . getExpectedStart ( playlist . timing )
1818 const expectedEnd = PlaylistTiming . getExpectedEnd ( playlist . timing )
1919 const now = timingDurations . currentTime ?? Date . now ( )
2020
2121 // Use remainingPlaylistDuration which includes current part's remaining time
2222 const estEnd =
23- timingDurations . remainingPlaylistDuration !== undefined ? Math . max ( now , expectedStart ?? now ) + timingDurations . remainingPlaylistDuration : null
23+ timingDurations . remainingPlaylistDuration !== undefined
24+ ? Math . max ( now , expectedStart ?? now ) + timingDurations . remainingPlaylistDuration
25+ : null
2426
2527 if ( expectedEnd === undefined && estEnd === null ) return null
2628
Original file line number Diff line number Diff line change @@ -16,7 +16,6 @@ export function RundownHeaderPlannedStart({
1616 const timingDurations = useTiming ( )
1717 const expectedStart = PlaylistTiming . getExpectedStart ( playlist . timing )
1818
19-
2019 const now = timingDurations . currentTime ?? Date . now ( )
2120 const startsIn = now - ( expectedStart ?? 0 )
2221
@@ -25,9 +24,7 @@ export function RundownHeaderPlannedStart({
2524 { ! simplified && expectedStart !== undefined && (
2625 < Countdown label = { t ( 'Plan. Start' ) } time = { expectedStart } className = "rundown-header__show-timers-countdown" />
2726 ) }
28- { playlist . startedPlayback !== undefined && (
29- < Countdown label = { t ( 'Started' ) } time = { playlist . startedPlayback } />
30- ) }
27+ { playlist . startedPlayback !== undefined && < Countdown label = { t ( 'Started' ) } time = { playlist . startedPlayback } /> }
3128 { playlist . startedPlayback === undefined && expectedStart !== undefined && (
3229 < Countdown label = { t ( 'Start In' ) } >
3330 { startsIn >= 0 && '+' }
Original file line number Diff line number Diff line change @@ -18,7 +18,11 @@ export function RundownHeaderTimingDisplay({ playlist }: IRundownHeaderTimingDis
1818 if ( overUnderClock === undefined ) return null
1919
2020 // Hide diff in untimed mode before first timing take
21- if ( PlaylistTiming . isPlaylistTimingNone ( playlist . timing ) && playlist . timing . expectedDuration === undefined && ! playlist . startedPlayback ) {
21+ if (
22+ PlaylistTiming . isPlaylistTimingNone ( playlist . timing ) &&
23+ playlist . timing . expectedDuration === undefined &&
24+ ! playlist . startedPlayback
25+ ) {
2226 return null
2327 }
2428
You can’t perform that action at this time.
0 commit comments