44 */
55package ch.srgssr.pillarbox.cast.receiver
66
7- import android.util.Log
87import androidx.media3.cast.DefaultMediaItemConverter
98import androidx.media3.cast.MediaItemConverter
109import androidx.media3.common.C
@@ -16,6 +15,7 @@ import ch.srgssr.pillarbox.player.PillarboxExoPlayer
1615import ch.srgssr.pillarbox.player.PillarboxPlayer
1716import ch.srgssr.pillarbox.player.analytics.metrics.PlaybackMetrics
1817import ch.srgssr.pillarbox.player.extension.getCurrentMediaItems
18+ import ch.srgssr.pillarbox.player.utils.DebugLogger
1919import com.google.android.gms.cast.MediaInfo
2020import com.google.android.gms.cast.MediaLoadRequestData
2121import com.google.android.gms.cast.MediaMetadata
@@ -180,7 +180,7 @@ class PillarboxCastReceiverPlayer(
180180 }
181181
182182 private fun handleMoveMediaItems (fromIndex : Int , toIndex : Int , newIndex : Int ) {
183- Log .d (TAG , " handleMoveMediaItems fromIndex = $fromIndex toIndex = $toIndex newIndex = $newIndex " )
183+ DebugLogger .debug (TAG , " handleMoveMediaItems fromIndex = $fromIndex toIndex = $toIndex newIndex = $newIndex " )
184184 pillarboxMediaCommand.moveMediaItems(fromIndex, toIndex, newIndex)
185185 debugQueueItems()
186186 }
@@ -202,7 +202,7 @@ class PillarboxCastReceiverPlayer(
202202 }
203203
204204 private fun handleAddMediaItems (index : Int , mediaItems : List <MediaItem >) {
205- Log .d (TAG , " handleAddMediaItems index = $index #items = ${mediaItems.size} " )
205+ DebugLogger .debug (TAG , " handleAddMediaItems index = $index #items = ${mediaItems.size} " )
206206 pillarboxMediaCommand.addMediaItems(mediaItems, index)
207207 debugQueueItems()
208208 }
@@ -216,7 +216,7 @@ class PillarboxCastReceiverPlayer(
216216 }
217217
218218 private fun handleRemoveMediaItems (fromIndex : Int , toIndex : Int ) {
219- Log .d (TAG , " handleRemoveMediaItems fromIndex = $fromIndex toIndex = $toIndex " )
219+ DebugLogger .debug (TAG , " handleRemoveMediaItems fromIndex = $fromIndex toIndex = $toIndex " )
220220 debugQueueItems()
221221 pillarboxMediaCommand.removeMediaItems(fromIndex, toIndex)
222222 debugQueueItems()
@@ -246,8 +246,8 @@ class PillarboxCastReceiverPlayer(
246246 }
247247
248248 private fun debugQueueItems () {
249- Log .d (TAG , " MediaItems: ${player.getCurrentMediaItems().map { it.mediaMetadata.title }} " )
250- Log .d (
249+ DebugLogger .debug (TAG , " MediaItems: ${player.getCurrentMediaItems().map { it.mediaMetadata.title }} " )
250+ DebugLogger .debug (
251251 TAG ,
252252 " QueueItems: ${mediaManager.mediaQueueManager.queueItems?.map { item -> item.media?.metadata?.getString(MediaMetadata .KEY_TITLE ) }} "
253253 )
@@ -264,7 +264,10 @@ class PillarboxCastReceiverPlayer(
264264
265265 private inner class MediaLoadCommands : MediaLoadCommandCallback () {
266266 override fun onLoad (senderId : String? , loadRequest : MediaLoadRequestData ): Task <MediaLoadRequestData ?> {
267- Log .d(TAG , " onLoad from $senderId #items = ${loadRequest.queueData?.items?.size} startIndex = ${loadRequest.queueData?.startIndex} " )
267+ DebugLogger .debug(
268+ TAG ,
269+ " onLoad from $senderId #items = ${loadRequest.queueData?.items?.size} startIndex = ${loadRequest.queueData?.startIndex} "
270+ )
268271 mediaStatusModifier.clear()
269272
270273 var positionMs = if (loadRequest.currentTime < 0 ) C .TIME_UNSET else loadRequest.currentTime
@@ -276,7 +279,7 @@ class PillarboxCastReceiverPlayer(
276279 startIndex = if (queueData.startIndex < 0 ) startIndex else queueData.startIndex
277280 mediaItems = queueData.items?.filter { it.media.isValid() }?.map(mediaItemConverter::toMediaItem)
278281 } ? : loadRequest.mediaInfo?.takeIf { it.isValid() }?.let { mediaInfo ->
279- Log .d (TAG , " load from media info" )
282+ DebugLogger .debug (TAG , " load from media info" )
280283 val mediaQueueItem = MediaQueueItem .Builder (mediaInfo).build()
281284 mediaItems = listOf (mediaItemConverter.toMediaItem(mediaQueueItem))
282285 }
@@ -289,23 +292,23 @@ class PillarboxCastReceiverPlayer(
289292 }
290293
291294 override fun onResumeSession (senderId : String? , requestData : MediaResumeSessionRequestData ): Task <MediaLoadRequestData ?> {
292- Log .d (TAG , " onResumeSession $senderId ${requestData.requestId} " )
295+ DebugLogger .debug (TAG , " onResumeSession $senderId ${requestData.requestId} " )
293296 return super .onResumeSession(senderId, requestData)
294297 }
295298 }
296299
297300 private inner class EventCallback : CastReceiverContext .EventCallback () {
298301
299302 override fun onSenderConnected (senderInfo : SenderInfo ) {
300- Log .d (TAG , " onSenderConnected $senderInfo #sender = ${castReceiverContext.senders.size} " )
303+ DebugLogger .debug (TAG , " onSenderConnected $senderInfo #sender = ${castReceiverContext.senders.size} " )
301304 }
302305
303306 override fun onSenderDisconnected (senderInfo : SenderDisconnectedEventInfo ) {
304- Log .d (TAG , " onSenderDisconnected $senderInfo #sender = ${castReceiverContext.senders.size} " )
307+ DebugLogger .debug (TAG , " onSenderDisconnected $senderInfo #sender = ${castReceiverContext.senders.size} " )
305308 }
306309
307310 override fun onStopApplication () {
308- Log .d (TAG , " onStopApplication #sender = ${castReceiverContext.senders.size} " )
311+ DebugLogger .debug (TAG , " onStopApplication #sender = ${castReceiverContext.senders.size} " )
309312 }
310313 }
311314
0 commit comments