Separate TimeRanges are it is a sealed interface and we don't really …

pillarbox-core-business/src/main/java/ch/srgssr/pillarbox/core/business/source/SRGAssetLoader.kt

@@ -167,9 +167,9 @@ class SRGAssetLoader(
                     mediaComposition = result,
                 )
             }.build(),
-            timeRanges = ChapterAdapter.getChapters(result) +
-                TimeIntervalAdapter.getCredits(result.mainChapter.timeIntervalList) +
-                SegmentAdapter.getBlockedTimeRanges(chapter.listSegment),
+            blockedTimeRanges = SegmentAdapter.getBlockedTimeRanges(chapter.listSegment),
+            chapters = ChapterAdapter.getChapters(result),
+            credits = TimeIntervalAdapter.getCredits(result.mainChapter.timeIntervalList),
         )
     }
 

pillarbox-core-business/src/test/java/ch/srgssr/pillarbox/core/business/SRGAssetLoaderTest.kt

@@ -149,7 +149,7 @@ class SRGAssetLoaderTest {
             SRGMediaItemBuilder(DummyMediaCompositionProvider.URN_SEGMENT_BLOCK_REASON).build()
         )
         val expectedBlockTimeRanges = listOf(SegmentAdapter.getBlockedTimeRange(DummyMediaCompositionProvider.BLOCKED_SEGMENT))
-        assertEquals(expectedBlockTimeRanges, asset.timeRanges)
+        assertEquals(expectedBlockTimeRanges, asset.blockedTimeRanges)
     }
 
     @Test
@@ -160,7 +160,7 @@ class SRGAssetLoaderTest {
         val expectedCredits = TimeIntervalAdapter.getCredits(
             listOf(DummyMediaCompositionProvider.TIME_INTERVAL_1, DummyMediaCompositionProvider.TIME_INTERVAL_2)
         )
-        assertEquals(expectedCredits, asset.timeRanges)
+        assertEquals(expectedCredits, asset.credits)
     }
 
     internal class DummyMediaCompositionProvider : MediaCompositionService {

pillarbox-player/src/main/java/ch/srgssr/pillarbox/player/asset/Asset.kt

@@ -6,7 +6,9 @@ package ch.srgssr.pillarbox.player.asset
 
 import androidx.media3.common.MediaMetadata
 import androidx.media3.exoplayer.source.MediaSource
-import ch.srgssr.pillarbox.player.asset.timeRange.TimeRange
+import ch.srgssr.pillarbox.player.asset.timeRange.BlockedTimeRange
+import ch.srgssr.pillarbox.player.asset.timeRange.Chapter
+import ch.srgssr.pillarbox.player.asset.timeRange.Credit
 import ch.srgssr.pillarbox.player.tracker.MediaItemTrackerData
 
 /**
@@ -15,11 +17,15 @@ import ch.srgssr.pillarbox.player.tracker.MediaItemTrackerData
  * @property mediaSource The [MediaSource] used by the player to play something.
  * @property trackersData The [MediaItemTrackerData] to set to the [PillarboxData].
  * @property mediaMetadata The [MediaMetadata] to set to the player media item.
- * @property timeRanges The [TimeRange] list to set to the [PillarboxData].
+ * @property blockedTimeRanges The [BlockedTimeRange] list.
+ * @property chapters The [Chapter] list.
+ * @property credits The [Credit] list.
  */
 data class Asset(
     val mediaSource: MediaSource,
     val trackersData: MediaItemTrackerData = MediaItemTrackerData.EMPTY,
     val mediaMetadata: MediaMetadata = MediaMetadata.EMPTY,
-    val timeRanges: List<TimeRange> = emptyList(),
+    val blockedTimeRanges: List<BlockedTimeRange> = emptyList(),
+    val chapters: List<Chapter> = emptyList(),
+    val credits: List<Credit> = emptyList(),
 )

pillarbox-player/src/main/java/ch/srgssr/pillarbox/player/source/PillarboxMediaSource.kt

@@ -15,9 +15,6 @@ import androidx.media3.exoplayer.source.TimelineWithUpdatedMediaItem
 import androidx.media3.exoplayer.upstream.Allocator
 import ch.srgssr.pillarbox.player.asset.AssetLoader
 import ch.srgssr.pillarbox.player.asset.PillarboxData
-import ch.srgssr.pillarbox.player.asset.timeRange.BlockedTimeRange
-import ch.srgssr.pillarbox.player.asset.timeRange.Chapter
-import ch.srgssr.pillarbox.player.asset.timeRange.Credit
 import ch.srgssr.pillarbox.player.utils.DebugLogger
 import kotlinx.coroutines.runBlocking
 
@@ -53,9 +50,9 @@ class PillarboxMediaSource internal constructor(
                     .setTag(
                         PillarboxData(
                             trackersData = asset.trackersData,
-                            blockedTimeRanges = asset.timeRanges.filterIsInstance<BlockedTimeRange>(),
-                            chapters = asset.timeRanges.filterIsInstance<Chapter>(),
-                            credits = asset.timeRanges.filterIsInstance<Credit>(),
+                            blockedTimeRanges = asset.blockedTimeRanges,
+                            chapters = asset.chapters,
+                            credits = asset.credits,
                         )
                     )
                     .build()

pillarbox-player/src/test/java/ch/srgssr/pillarbox/player/tracker/BlockedTimeRangeTrackerTest.kt

@@ -105,7 +105,7 @@ private class BlockedAssetLoader(context: Context) : AssetLoader(DefaultMediaSou
 
     override suspend fun loadAsset(mediaItem: MediaItem): Asset {
         val itemBuilder = mediaItem.buildUpon()
-        val timeRanges = when (mediaItem.mediaId) {
+        val listBlockedTimeRanges = when (mediaItem.mediaId) {
             MEDIA_ONE_SEGMENT.mediaId -> {
                 listOf(SEGMENT)
             }
@@ -121,7 +121,7 @@ private class BlockedAssetLoader(context: Context) : AssetLoader(DefaultMediaSou
         return Asset(
             mediaSource = mediaSourceFactory.createMediaSource(itemBuilder.build()),
             mediaMetadata = mediaItem.mediaMetadata,
-            timeRanges = timeRanges,
+            blockedTimeRanges = listBlockedTimeRanges,
         )
     }
 

pillarbox-player/src/test/java/ch/srgssr/pillarbox/player/tracker/ChapterTrackerTest.kt

@@ -110,7 +110,7 @@ private class ChapterAssetLoader(context: Context) : AssetLoader(DefaultMediaSou
         return Asset(
             mediaSource = mediaSourceFactory.createMediaSource(itemBuilder.build()),
             mediaMetadata = mediaItem.mediaMetadata,
-            timeRanges = listOf(CHAPTER_1, CHAPTER_2)
+            chapters = listOf(CHAPTER_1, CHAPTER_2)
         )
     }