From fe5971880577f42d55bc62213dba02d7347bf10f Mon Sep 17 00:00:00 2001
From: jbibik <jbibik@google.com>
Date: Fri, 25 Apr 2025 07:53:18 -0700
Subject: [PATCH] Refactor PlayerSurface Kotlin syntax to avoid variable
 shadowing

PiperOrigin-RevId: 751414538
---
 .../androidx/media3/ui/compose/PlayerSurface.kt  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/libraries/ui_compose/src/main/java/androidx/media3/ui/compose/PlayerSurface.kt b/libraries/ui_compose/src/main/java/androidx/media3/ui/compose/PlayerSurface.kt
index 77d83d31a2..73f43f40c7 100644
--- a/libraries/ui_compose/src/main/java/androidx/media3/ui/compose/PlayerSurface.kt
+++ b/libraries/ui_compose/src/main/java/androidx/media3/ui/compose/PlayerSurface.kt
@@ -58,16 +58,16 @@ fun PlayerSurface(
         player,
         modifier,
         createView = { SurfaceView(it) },
-        setViewOnPlayer = { player, view -> player.setVideoSurfaceView(view) },
-        clearViewFromPlayer = { player, view -> player.clearVideoSurfaceView(view) },
+        setViewOnPlayer = { setVideoSurfaceView(it) },
+        clearViewFromPlayer = { clearVideoSurfaceView(it) },
       )
     SURFACE_TYPE_TEXTURE_VIEW ->
       PlayerSurfaceInternal(
         player,
         modifier,
         createView = { TextureView(it) },
-        setViewOnPlayer = { player, view -> player.setVideoTextureView(view) },
-        clearViewFromPlayer = { player, view -> player.clearVideoTextureView(view) },
+        setViewOnPlayer = { setVideoTextureView(it) },
+        clearViewFromPlayer = { clearVideoTextureView(it) },
       )
     else -> throw IllegalArgumentException("Unrecognized surface type: $surfaceType")
   }
@@ -78,8 +78,8 @@ private fun <T : View> PlayerSurfaceInternal(
   player: Player,
   modifier: Modifier,
   createView: (Context) -> T,
-  setViewOnPlayer: (Player, T) -> Unit,
-  clearViewFromPlayer: (Player, T) -> Unit,
+  setViewOnPlayer: Player.(T) -> Unit,
+  clearViewFromPlayer: Player.(T) -> Unit,
 ) {
   var view by remember { mutableStateOf<T?>(null) }
   var registeredPlayer by remember { mutableStateOf<Player?>(null) }
@@ -88,11 +88,11 @@ private fun <T : View> PlayerSurfaceInternal(
     LaunchedEffect(view, player) {
       registeredPlayer?.let { previousPlayer ->
         if (previousPlayer.isCommandAvailable(Player.COMMAND_SET_VIDEO_SURFACE))
-          clearViewFromPlayer(previousPlayer, view)
+          previousPlayer.clearViewFromPlayer(view)
         registeredPlayer = null
       }
       if (player.isCommandAvailable(Player.COMMAND_SET_VIDEO_SURFACE)) {
-        setViewOnPlayer(player, view)
+        player.setViewOnPlayer(view)
         registeredPlayer = player
       }
     }