Releases/v3.5.1 (#374)

* fix: rename all methods * Really rename
muxinc · Jun 27, 2024 · bd8fc62 · bd8fc62
1 parent e4cb4e9
commit bd8fc62
Show file tree

Hide file tree

Showing 27 changed files with 94 additions and 97 deletions.
diff --git a/...er/src/exo-analytics-2_19-now/java/com/mux/stats/sdk/muxstats/AnalyticsListenerMetrics.kt b/...er/src/exo-analytics-2_19-now/java/com/mux/stats/sdk/muxstats/AnalyticsListenerMetrics.kt
@@ -19,14 +19,14 @@ private class AnalyticsListenerBinding216ToNow : MuxPlayerAdapter.PlayerBinding<
     MuxLogger.d(logTag(), "created");
   }
 
-  override fun bindPlayer(player: ExoPlayer, collector: MuxStateCollector) {
+  override fun bindPlayer(player: ExoPlayer, collector:  MuxStateCollectorBase) {
     listener = exoAnalyticsListener(player, collector).also {
       player.addAnalyticsListener(it)
       player.watchContentPosition(collector)
     }
   }
 
-  override fun unbindPlayer(player: ExoPlayer, collector: MuxStateCollector) {
+  override fun unbindPlayer(player: ExoPlayer, collector:  MuxStateCollectorBase) {
     listener?.let { player.removeAnalyticsListener(it) }
     collector.positionWatcher?.stop("unbound")
   }

diff --git a/...Adapter/src/exo-analytics-2_19-now/java/com/mux/stats/sdk/muxstats/SessionDataBindings.kt b/...Adapter/src/exo-analytics-2_19-now/java/com/mux/stats/sdk/muxstats/SessionDataBindings.kt
@@ -15,13 +15,13 @@ private class SessionDataPlayerBinding : MuxPlayerAdapter.PlayerBinding<ExoPlaye
 
   private var listener: AnalyticsListener? by weak(null)
 
-  override fun bindPlayer(player: ExoPlayer, collector: MuxStateCollector) {
+  override fun bindPlayer(player: ExoPlayer, collector:  MuxStateCollectorBase) {
     if (isHlsExtensionAvailable()) {
       listener = SessionDataListener(player, collector).also { player.addAnalyticsListener(it) }
     }
   }
 
-  override fun unbindPlayer(player: ExoPlayer, collector: MuxStateCollector) {
+  override fun unbindPlayer(player: ExoPlayer, collector:  MuxStateCollectorBase) {
     listener?.let { player.removeAnalyticsListener(it) }
   }
 
@@ -30,7 +30,7 @@ private class SessionDataPlayerBinding : MuxPlayerAdapter.PlayerBinding<ExoPlaye
    * This class should only be instantiated if ExoPlayer's HLS extension is available at runtime
    * @see [.isHlsExtensionAvailable]
    */
-  private class SessionDataListener(player: ExoPlayer, val collector: MuxStateCollector) :
+  private class SessionDataListener(player: ExoPlayer, val collector:  MuxStateCollectorBase) :
     AnalyticsListener {
 
     private val player by weak(player)
@@ -94,5 +94,5 @@ private class SessionDataPlayerBinding : MuxPlayerAdapter.PlayerBinding<ExoPlaye
  * @see [.isHlsExtensionAvailable]
  */
 @Suppress("unused") // using the receiver to avoid polluting customers' namespace
-fun MuxStateCollector.createExoSessionDataBinding(): MuxPlayerAdapter.PlayerBinding<ExoPlayer> =
+fun  MuxStateCollectorBase.createExoSessionDataBinding(): MuxPlayerAdapter.PlayerBinding<ExoPlayer> =
   SessionDataPlayerBinding()
diff --git a/...er/src/exo-analytics-just2_16/java/com/mux/stats/sdk/muxstats/AnalyticsListenerMetrics.kt b/...er/src/exo-analytics-just2_16/java/com/mux/stats/sdk/muxstats/AnalyticsListenerMetrics.kt
@@ -19,14 +19,14 @@ private class AnalyticsListenerBinding216ToNow : MuxPlayerAdapter.PlayerBinding<
     MuxLogger.d(logTag(), "created");
   }
 
-  override fun bindPlayer(player: ExoPlayer, collector: MuxStateCollector) {
+  override fun bindPlayer(player: ExoPlayer, collector:  MuxStateCollectorBase) {
     listener = exoAnalyticsListener(player, collector).also {
       player.addAnalyticsListener(it)
       player.watchContentPosition(collector)
     }
   }
 
-  override fun unbindPlayer(player: ExoPlayer, collector: MuxStateCollector) {
+  override fun unbindPlayer(player: ExoPlayer, collector:  MuxStateCollectorBase) {
     listener?.let { player.removeAnalyticsListener(it) }
     collector.positionWatcher?.stop("unbound")
   }

diff --git a/...Adapter/src/exo-analytics-just2_16/java/com/mux/stats/sdk/muxstats/SessionDataBindings.kt b/...Adapter/src/exo-analytics-just2_16/java/com/mux/stats/sdk/muxstats/SessionDataBindings.kt
@@ -15,13 +15,13 @@ private class SessionDataPlayerBinding : MuxPlayerAdapter.PlayerBinding<ExoPlaye
 
   private var listener: AnalyticsListener? by weak(null)
 
-  override fun bindPlayer(player: ExoPlayer, collector: MuxStateCollector) {
+  override fun bindPlayer(player: ExoPlayer, collector:  MuxStateCollectorBase) {
     if (isHlsExtensionAvailable()) {
       listener = SessionDataListener(player, collector).also { player.addAnalyticsListener(it) }
     }
   }
 
-  override fun unbindPlayer(player: ExoPlayer, collector: MuxStateCollector) {
+  override fun unbindPlayer(player: ExoPlayer, collector:  MuxStateCollectorBase) {
     listener?.let { player.removeAnalyticsListener(it) }
   }
 
@@ -30,7 +30,7 @@ private class SessionDataPlayerBinding : MuxPlayerAdapter.PlayerBinding<ExoPlaye
    * This class should only be instantiated if ExoPlayer's HLS extension is available at runtime
    * @see [.isHlsExtensionAvailable]
    */
-  private class SessionDataListener(player: ExoPlayer, val collector: MuxStateCollector) :
+  private class SessionDataListener(player: ExoPlayer, val collector:  MuxStateCollectorBase) :
     AnalyticsListener {
 
     private val player by weak(player)
@@ -94,5 +94,5 @@ private class SessionDataPlayerBinding : MuxPlayerAdapter.PlayerBinding<ExoPlaye
  * @see [.isHlsExtensionAvailable]
  */
 @Suppress("unused") // using the receiver to avoid polluting customers' namespace
-fun MuxStateCollector.createExoSessionDataBinding(): MuxPlayerAdapter.PlayerBinding<ExoPlayer> =
+fun  MuxStateCollectorBase.createExoSessionDataBinding(): MuxPlayerAdapter.PlayerBinding<ExoPlayer> =
   SessionDataPlayerBinding()
diff --git a/...ytics-listener-2_11-2_13/java/com/mux/stats/sdk/muxstats/internal/ExoAnalyticsListener.kt b/...ytics-listener-2_11-2_13/java/com/mux/stats/sdk/muxstats/internal/ExoAnalyticsListener.kt
@@ -11,14 +11,14 @@ import com.google.android.exoplayer2.source.LoadEventInfo
 import com.google.android.exoplayer2.source.MediaLoadData
 import com.google.android.exoplayer2.source.TrackGroupArray
 import com.google.android.exoplayer2.trackselection.TrackSelectionArray
-import com.mux.stats.sdk.muxstats.MuxStateCollector
+import com.mux.stats.sdk.muxstats.MuxStateCollectorBase
 import java.io.IOException
 
 /**
  * There's only one required AnalyticsListener implementation (as of Exo 2.17) so it's here in the
  * common code.
  */
-private class ExoAnalyticsListener(player: ExoPlayer, val collector: MuxStateCollector) :
+private class ExoAnalyticsListener(player: ExoPlayer, val collector:  MuxStateCollectorBase) :
   AnalyticsListener {
 
   private val player: ExoPlayer? by weak(player)
@@ -203,6 +203,6 @@ private class ExoAnalyticsListener(player: ExoPlayer, val collector: MuxStateCol
 }
 
 @JvmSynthetic
-internal fun <P : ExoPlayer> exoAnalyticsListener(player: P, collector: MuxStateCollector)
+internal fun <P : ExoPlayer> exoAnalyticsListener(player: P, collector:  MuxStateCollectorBase)
         : AnalyticsListener = ExoAnalyticsListener(player, collector)
 
diff --git a/...ytics-listener-2_13-2_16/java/com/mux/stats/sdk/muxstats/internal/ExoAnalyticsListener.kt b/...ytics-listener-2_13-2_16/java/com/mux/stats/sdk/muxstats/internal/ExoAnalyticsListener.kt
@@ -10,7 +10,7 @@ import com.google.android.exoplayer2.source.LoadEventInfo
 import com.google.android.exoplayer2.source.MediaLoadData
 import com.google.android.exoplayer2.source.TrackGroupArray
 import com.google.android.exoplayer2.trackselection.TrackSelectionArray
-import com.mux.stats.sdk.muxstats.MuxStateCollector
+import com.mux.stats.sdk.muxstats.MuxStateCollectorBase
 import com.mux.stats.sdk.muxstats.exoplayeradapter.internal.BandwidthMetricDispatcher
 import com.mux.stats.sdk.muxstats.exoplayeradapter.internal.MuxMediaHasVideoTrack
 import com.mux.stats.sdk.muxstats.exoplayeradapter.internal.handleExoPlaybackState
@@ -22,7 +22,7 @@ import java.io.IOException
  * There's only one required AnalyticsListener implementation (as of Exo 2.17) so it's here in the
  * common code.
  */
-private class ExoAnalyticsListener(player: ExoPlayer, val collector: MuxStateCollector) :
+private class ExoAnalyticsListener(player: ExoPlayer, val collector:  MuxStateCollectorBase) :
   AnalyticsListener {
 
   private val player: ExoPlayer? by weak(player)
@@ -205,6 +205,6 @@ private class ExoAnalyticsListener(player: ExoPlayer, val collector: MuxStateCol
 }
 
 @JvmSynthetic
-internal fun <P : ExoPlayer> exoAnalyticsListener(player: P, collector: MuxStateCollector)
+internal fun <P : ExoPlayer> exoAnalyticsListener(player: P, collector:  MuxStateCollectorBase)
         : AnalyticsListener = ExoAnalyticsListener(player, collector)
 
diff --git a/...lytics-listener-2_18-now/java/com/mux/stats/sdk/muxstats/internal/ExoAnalyticsListener.kt b/...lytics-listener-2_18-now/java/com/mux/stats/sdk/muxstats/internal/ExoAnalyticsListener.kt
@@ -7,7 +7,7 @@ import com.google.android.exoplayer2.source.LoadEventInfo
 import com.google.android.exoplayer2.source.MediaLoadData
 import com.google.android.exoplayer2.source.TrackGroupArray
 import com.google.android.exoplayer2.video.VideoSize
-import com.mux.stats.sdk.muxstats.MuxStateCollector
+import com.mux.stats.sdk.muxstats.MuxStateCollectorBase
 import com.mux.stats.sdk.muxstats.exoplayeradapter.MuxPlayerState
 import com.mux.stats.sdk.muxstats.exoplayeradapter.internal.BandwidthMetricDispatcher
 import com.mux.stats.sdk.muxstats.exoplayeradapter.internal.MuxMediaHasVideoTrack
@@ -20,7 +20,7 @@ import java.io.IOException
  * There's only one required AnalyticsListener implementation (as of Exo 2.17) so it's here in the
  * common code.
  */
-private class ExoAnalyticsListener(player: ExoPlayer, val collector: MuxStateCollector) :
+private class ExoAnalyticsListener(player: ExoPlayer, val collector:  MuxStateCollectorBase) :
   AnalyticsListener {
 
   private val player: ExoPlayer? by weak(player)
@@ -196,6 +196,6 @@ private class ExoAnalyticsListener(player: ExoPlayer, val collector: MuxStateCol
 }
 
 @JvmSynthetic
-internal fun <P : ExoPlayer> exoAnalyticsListener(player: P, collector: MuxStateCollector)
+internal fun <P : ExoPlayer> exoAnalyticsListener(player: P, collector:  MuxStateCollectorBase)
         : AnalyticsListener = ExoAnalyticsListener(player, collector)
 
diff --git a/...ytics-listener-just-2_17/java/com/mux/stats/sdk/muxstats/internal/ExoAnalyticsListener.kt b/...ytics-listener-just-2_17/java/com/mux/stats/sdk/muxstats/internal/ExoAnalyticsListener.kt
@@ -10,7 +10,7 @@ import com.google.android.exoplayer2.source.LoadEventInfo
 import com.google.android.exoplayer2.source.MediaLoadData
 import com.google.android.exoplayer2.source.TrackGroupArray
 import com.google.android.exoplayer2.trackselection.TrackSelectionArray
-import com.mux.stats.sdk.muxstats.MuxStateCollector
+import com.mux.stats.sdk.muxstats.MuxStateCollectorBase
 import com.mux.stats.sdk.muxstats.exoplayeradapter.internal.BandwidthMetricDispatcher
 import com.mux.stats.sdk.muxstats.exoplayeradapter.internal.MuxMediaHasVideoTrack
 import com.mux.stats.sdk.muxstats.exoplayeradapter.internal.handleExoPlaybackState
@@ -22,7 +22,7 @@ import java.io.IOException
  * There's only one required AnalyticsListener implementation (as of Exo 2.17) so it's here in the
  * common code.
  */
-private class ExoAnalyticsListener(player: ExoPlayer, val collector: MuxStateCollector) :
+private class ExoAnalyticsListener(player: ExoPlayer, val collector:  MuxStateCollectorBase) :
   AnalyticsListener {
 
   private val player: ExoPlayer? by weak(player)
@@ -201,6 +201,6 @@ private class ExoAnalyticsListener(player: ExoPlayer, val collector: MuxStateCol
 }
 
 @JvmSynthetic
-internal fun <P : ExoPlayer> exoAnalyticsListener(player: P, collector: MuxStateCollector)
+internal fun <P : ExoPlayer> exoAnalyticsListener(player: P, collector:  MuxStateCollectorBase)
         : AnalyticsListener = ExoAnalyticsListener(player, collector)
 
diff --git a/...ytics-listener-upto-2_11/java/com/mux/stats/sdk/muxstats/internal/ExoAnalyticsListener.kt b/...ytics-listener-upto-2_11/java/com/mux/stats/sdk/muxstats/internal/ExoAnalyticsListener.kt
@@ -9,14 +9,14 @@ import com.google.android.exoplayer2.source.MediaSourceEventListener.MediaLoadDa
 import com.google.android.exoplayer2.source.TrackGroupArray
 import com.google.android.exoplayer2.trackselection.TrackSelectionArray
 import com.mux.stats.sdk.core.util.MuxLogger
-import com.mux.stats.sdk.muxstats.MuxStateCollector
+import com.mux.stats.sdk.muxstats.MuxStateCollectorBase
 import java.io.IOException
 
 /**
  * There's only one required AnalyticsListener implementation (as of Exo 2.17) so it's here in the
  * common code.
  */
-private class ExoAnalyticsListener(player: ExoPlayer, val collector: MuxStateCollector) :
+private class ExoAnalyticsListener(player: ExoPlayer, val collector:  MuxStateCollectorBase) :
   AnalyticsListener {
 
   private val player: ExoPlayer? by weak(player)
@@ -154,6 +154,6 @@ private class ExoAnalyticsListener(player: ExoPlayer, val collector: MuxStateCol
 }
 
 @JvmSynthetic
-internal fun <P : ExoPlayer> exoAnalyticsListener(player: P, collector: MuxStateCollector)
+internal fun <P : ExoPlayer> exoAnalyticsListener(player: P, collector:  MuxStateCollectorBase)
         : AnalyticsListener = ExoAnalyticsListener(player, collector)
 
diff --git a/...r/src/exo-analytics-upto-2_16/java/com/mux/stats/sdk/muxstats/AnalyticsListenerMetrics.kt b/...r/src/exo-analytics-upto-2_16/java/com/mux/stats/sdk/muxstats/AnalyticsListenerMetrics.kt
@@ -17,14 +17,14 @@ private class AnalyticsListenerBindingUpTo16 : MuxPlayerAdapter.PlayerBinding<Si
     MuxLogger.d(logTag(), "created");
   }
 
-  override fun bindPlayer(player: SimpleExoPlayer, collector: MuxStateCollector) {
+  override fun bindPlayer(player: SimpleExoPlayer, collector:  MuxStateCollectorBase) {
     listener = exoAnalyticsListener(player, collector).also {
       player.addAnalyticsListener(it)
       player.watchContentPosition(collector)
     }
   }
 
-  override fun unbindPlayer(player: SimpleExoPlayer, collector: MuxStateCollector) {
+  override fun unbindPlayer(player: SimpleExoPlayer, collector:  MuxStateCollectorBase) {
     listener?.let { player.removeAnalyticsListener(it) }
     collector.positionWatcher?.stop("unbound")
     listener = null

diff --git a/...dapter/src/exo-analytics-upto-2_16/java/com/mux/stats/sdk/muxstats/SessionDataBindings.kt b/...dapter/src/exo-analytics-upto-2_16/java/com/mux/stats/sdk/muxstats/SessionDataBindings.kt
@@ -20,13 +20,13 @@ private class SessionDataPlayerBinding : MuxPlayerAdapter.PlayerBinding<ExoPlaye
 
   private var listener: AnalyticsListener? by weak(null)
 
-  override fun bindPlayer(player: ExoPlayer, collector: MuxStateCollector) {
+  override fun bindPlayer(player: ExoPlayer, collector:  MuxStateCollectorBase) {
     if (isHlsExtensionAvailable() && player is SimpleExoPlayer) {
       listener = SessionDataListener(player, collector).also { player.addAnalyticsListener(it) }
     }
   }
 
-  override fun unbindPlayer(player: ExoPlayer, collector: MuxStateCollector) {
+  override fun unbindPlayer(player: ExoPlayer, collector:  MuxStateCollectorBase) {
     if (player is SimpleExoPlayer) {
       listener?.let { player.removeAnalyticsListener(it) }
     }
@@ -37,7 +37,7 @@ private class SessionDataPlayerBinding : MuxPlayerAdapter.PlayerBinding<ExoPlaye
    * This class should only be instantiated if ExoPlayer's HLS extension is available at runtime
    * @see [.isHlsExtensionAvailable]
    */
-  private class SessionDataListener(player: ExoPlayer, val collector: MuxStateCollector) :
+  private class SessionDataListener(player: ExoPlayer, val collector:  MuxStateCollectorBase) :
     AnalyticsListener {
 
     private val player by weak(player)
@@ -102,5 +102,5 @@ private class SessionDataPlayerBinding : MuxPlayerAdapter.PlayerBinding<ExoPlaye
  */
 @Suppress("unused") // using the receiver to avoid polluting customers' namespace
 @JvmSynthetic
-fun MuxStateCollector.createExoSessionDataBinding(): MuxPlayerAdapter.PlayerBinding<ExoPlayer> =
+fun  MuxStateCollectorBase.createExoSessionDataBinding(): MuxPlayerAdapter.PlayerBinding<ExoPlayer> =
   SessionDataPlayerBinding()
diff --git a/...x/stats/sdk/muxstats/MuxStateCollector.kt → .../sdk/muxstats/MuxStateCollectorExoImpl.kt b/...x/stats/sdk/muxstats/MuxStateCollector.kt → .../sdk/muxstats/MuxStateCollectorExoImpl.kt
@@ -2,13 +2,12 @@ package com.mux.stats.sdk.muxstats
 
 import com.google.android.exoplayer2.source.hls.HlsManifest
 import com.mux.stats.sdk.core.events.IEventDispatcher
-import com.mux.stats.sdk.muxstats.exoplayeradapter.MuxStateCollectorBase
 
-open class MuxStateCollector(
+open class MuxStateCollectorExoImpl(
     private val _muxStats: () -> MuxStats,
     private val _dispatcher: IEventDispatcher,
     private val _trackFirstFrameRendered: Boolean = true,
-): MuxStateCollectorBase(_muxStats, _dispatcher, _trackFirstFrameRendered) {
+):  MuxStateCollectorBase(_muxStats, _dispatcher, _trackFirstFrameRendered) {
     override fun isLivePlayback(): Boolean {
         return currentTimelineWindow.isLive
     }

diff --git a/...Adapter/src/exo-error-2_15-now/java/com/mux/stats/sdk/muxstats/ExoErrorMetrics215ToNow.kt b/...Adapter/src/exo-error-2_15-now/java/com/mux/stats/sdk/muxstats/ExoErrorMetrics215ToNow.kt
@@ -21,20 +21,20 @@ private class ExoErrorMetricsByListener215ToNow : MuxPlayerAdapter.PlayerBinding
     MuxLogger.d(logTag(), "created");
   }
 
-  override fun bindPlayer(player: ExoPlayer, collector: MuxStateCollector) {
+  override fun bindPlayer(player: ExoPlayer, collector:  MuxStateCollectorBase) {
     playerListener = newListener(collector).also { player.addListener(it) }
   }
 
-  override fun unbindPlayer(player: ExoPlayer, collector: MuxStateCollector) {
+  override fun unbindPlayer(player: ExoPlayer, collector:  MuxStateCollectorBase) {
     collector.positionWatcher?.stop("player unbound")
     collector.positionWatcher = null
     playerListener?.let { player.removeListener(it) }
   }
 
-  private fun newListener(collector: MuxStateCollector) = ErrorPlayerListenerUpTo214(collector)
+  private fun newListener(collector:  MuxStateCollectorBase) = ErrorPlayerListenerUpTo214(collector)
 } // class ErrorPlayerBuListenerUpTo214
 
-private class ErrorPlayerListenerUpTo214(val collector: MuxStateCollector) : Player.Listener {
+private class ErrorPlayerListenerUpTo214(val collector:  MuxStateCollectorBase) : Player.Listener {
   override fun onPlayerError(error: PlaybackException) {
     if (error is ExoPlaybackException) {
       collector.handleExoPlaybackException(error.errorCode, error)

diff --git a/...Adapter/src/exo-error-just-2_14/java/com/mux/stats/sdk/muxstats/ExoErrorMetricsUpTo214.kt b/...Adapter/src/exo-error-just-2_14/java/com/mux/stats/sdk/muxstats/ExoErrorMetricsUpTo214.kt
@@ -23,20 +23,20 @@ private class ExoErrorMetricsByListenerJust214 : MuxPlayerAdapter.PlayerBinding<
     MuxLogger.d(logTag(), "created");
   }
 
-  override fun bindPlayer(player: ExoPlayer, collector: MuxStateCollector) {
+  override fun bindPlayer(player: ExoPlayer, collector:  MuxStateCollectorBase) {
     playerListener = newListener(collector).also { player.addListener(it) }
   }
 
-  override fun unbindPlayer(player: ExoPlayer, collector: MuxStateCollector) {
+  override fun unbindPlayer(player: ExoPlayer, collector:  MuxStateCollectorBase) {
     collector.positionWatcher?.stop("player unbound")
     collector.positionWatcher = null
     playerListener?.let { player.removeListener(it) }
   }
 
-  private fun newListener(collector: MuxStateCollector) = ErrorPlayerListenerUpTo214(collector)
+  private fun newListener(collector:  MuxStateCollectorBase) = ErrorPlayerListenerUpTo214(collector)
 } // class ErrorPlayerBuListenerUpTo214
 
-private class ErrorPlayerListenerUpTo214(val collector: MuxStateCollector) : Player.Listener {
+private class ErrorPlayerListenerUpTo214(val collector:  MuxStateCollectorBase) : Player.Listener {
   override fun onPlayerError(error: ExoPlaybackException) {
     collector.handleExoPlaybackException(error.type, error)
   }

diff --git a/...rAdapter/src/exo-event-2_14-now/java/com/mux/stats/sdk/muxstats/BasicExoMetrics14toNow.kt b/...rAdapter/src/exo-event-2_14-now/java/com/mux/stats/sdk/muxstats/BasicExoMetrics14toNow.kt
@@ -28,23 +28,23 @@ private class BasicExoMetrics14toNow : MuxPlayerAdapter.PlayerBinding<ExoPlayer>
     MuxLogger.d(logTag(), "created");
   }
 
-  override fun bindPlayer(player: ExoPlayer, collector: MuxStateCollector) {
+  override fun bindPlayer(player: ExoPlayer, collector:  MuxStateCollectorBase) {
     playerListener = newListener(player, collector).also {
       player.addListener(it)
     }
   }
 
-  override fun unbindPlayer(player: ExoPlayer, collector: MuxStateCollector) {
+  override fun unbindPlayer(player: ExoPlayer, collector:  MuxStateCollectorBase) {
     collector.positionWatcher?.stop("player unbound")
     collector.positionWatcher = null
     playerListener?.let { player.removeListener(it) }
   }
 
-  private fun newListener(player: ExoPlayer, collector: MuxStateCollector) =
+  private fun newListener(player: ExoPlayer, collector:  MuxStateCollectorBase) =
     PlayerListener(player, collector)
 } // class BaseExoMetrics
 
-private class PlayerListener(player: ExoPlayer, val collector: MuxStateCollector) :
+private class PlayerListener(player: ExoPlayer, val collector:  MuxStateCollectorBase) :
   Player.Listener {
   val player by weak(player) // player should be weakly reachable in case user doesn't clean up
 

diff --git a/...ter/src/exo-player-2_16-now/java/com/mux/stats/sdk/muxstats/PlayerStateMetrics216ToNow.kt b/...ter/src/exo-player-2_16-now/java/com/mux/stats/sdk/muxstats/PlayerStateMetrics216ToNow.kt
@@ -18,13 +18,13 @@ private class PlayerStateMetrics216ToNow : MuxPlayerAdapter.PlayerBinding<ExoPla
     MuxLogger.d(logTag(), "created");
   }
 
-  override fun bindPlayer(player: ExoPlayer, collector: MuxStateCollector) {
+  override fun bindPlayer(player: ExoPlayer, collector:  MuxStateCollectorBase) {
     playerListener = analyticsListenerMetrics().also {
       it.bindPlayer(player, collector)
     }
   }
 
-  override fun unbindPlayer(player: ExoPlayer, collector: MuxStateCollector) {
+  override fun unbindPlayer(player: ExoPlayer, collector:  MuxStateCollectorBase) {
     playerListener?.unbindPlayer(player, collector)
   }
 }