Browse Source

fix block playout progression (#2277)

pull/2278/head
Jason Dove 3 days ago committed by GitHub
parent
commit
0c22eefad2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 10
      ErsatzTV.Core/Scheduling/BlockScheduling/BlockPlayoutBuilder.cs
  2. 2
      ErsatzTV.Core/Scheduling/BlockScheduling/BlockPlayoutPreviewBuilder.cs

10
ErsatzTV.Core/Scheduling/BlockScheduling/BlockPlayoutBuilder.cs

@ -147,6 +147,7 @@ public class BlockPlayoutBuilder( @@ -147,6 +147,7 @@ public class BlockPlayoutBuilder(
IMediaCollectionEnumerator enumerator = GetEnumerator(
playout,
referenceData,
result,
blockItem,
currentTime,
historyKey,
@ -244,6 +245,7 @@ public class BlockPlayoutBuilder( @@ -244,6 +245,7 @@ public class BlockPlayoutBuilder(
protected virtual IMediaCollectionEnumerator GetEnumerator(
Playout playout,
PlayoutReferenceData referenceData,
PlayoutBuildResult result,
BlockItem blockItem,
DateTimeOffset currentTime,
string historyKey,
@ -258,14 +260,14 @@ public class BlockPlayoutBuilder( @@ -258,14 +260,14 @@ public class BlockPlayoutBuilder(
PlaybackOrder.Chronological => BlockPlayoutEnumerator.Chronological(
collectionItems,
currentTime,
referenceData.PlayoutHistory,
referenceData.PlayoutHistory.Append(result.AddedHistory).ToList(),
blockItem,
historyKey,
Logger),
PlaybackOrder.SeasonEpisode => BlockPlayoutEnumerator.SeasonEpisode(
collectionItems,
currentTime,
referenceData.PlayoutHistory,
referenceData.PlayoutHistory.Append(result.AddedHistory).ToList(),
blockItem,
historyKey,
Logger),
@ -273,14 +275,14 @@ public class BlockPlayoutBuilder( @@ -273,14 +275,14 @@ public class BlockPlayoutBuilder(
collectionItems,
currentTime,
playout.Seed,
referenceData.PlayoutHistory,
referenceData.PlayoutHistory.Append(result.AddedHistory).ToList(),
blockItem,
historyKey),
PlaybackOrder.RandomRotation => BlockPlayoutEnumerator.RandomRotation(
collectionItems,
currentTime,
playout.Seed,
referenceData.PlayoutHistory,
referenceData.PlayoutHistory.Append(result.AddedHistory).ToList(),
blockItem,
historyKey),
_ => new RandomizedMediaCollectionEnumerator(

2
ErsatzTV.Core/Scheduling/BlockScheduling/BlockPlayoutPreviewBuilder.cs

@ -46,6 +46,7 @@ public class BlockPlayoutPreviewBuilder( @@ -46,6 +46,7 @@ public class BlockPlayoutPreviewBuilder(
protected override IMediaCollectionEnumerator GetEnumerator(
Playout playout,
PlayoutReferenceData referenceData,
PlayoutBuildResult result,
BlockItem blockItem,
DateTimeOffset currentTime,
string historyKey,
@ -54,6 +55,7 @@ public class BlockPlayoutPreviewBuilder( @@ -54,6 +55,7 @@ public class BlockPlayoutPreviewBuilder(
IMediaCollectionEnumerator enumerator = base.GetEnumerator(
playout,
referenceData,
result,
blockItem,
currentTime,
historyKey,

Loading…
Cancel
Save