Prevent players who have ownership of the player from locking it

- Make sure only the 'privileged' users can lock the video player (aka at the moment the current master and the instance creator). I wasn't sure if I wanted to allow people to take exclusive control over the video player without being master or instance owner, but ended up deciding that it could be too confusing and annoying for others.

Author: MerlinVR

Assets/USharpVideo/Scripts/USharpVideoPlayer.cs

@@ -448,9 +448,12 @@ private void Update()
             UpdateRenderTexture(); // Needed because AVPro can swap textures whenever
         }
 
+        /// <summary>
+        /// Uncomment this to prevent people from taking ownership of the video player when they shouldn't be able to
+        /// </summary>
         //public override bool OnOwnershipRequest(VRCPlayerApi requestingPlayer, VRCPlayerApi requestedOwner)
         //{
-        //    return !_isMasterOnly || requestedOwner.isMaster || requestedOwner.isInstanceOwner;
+        //    return !_isMasterOnly || IsPrivlegedUser(requestedOwner);
         //}
 
         bool _lastMasterLocked = false;
@@ -903,17 +906,30 @@ public void _SendFinalSync()
         }
 
         /// <summary>
-        /// Determines if the player can control this video player. This means the player is either the master, the instance creator, or the video player is unlocked.
+        /// Determines if the local player can control this video player. This means the player is either the master, the instance creator, or the video player is unlocked.
         /// </summary>
         /// <returns></returns>
         [PublicAPI]
         public bool CanControlVideoPlayer()
         {
+            return !_isMasterOnly || IsPrivilegedUser(Networking.LocalPlayer);
+        }
+
+        /// <summary>
+        /// If the given player is allowed to take important actions on this video player such as changing the video or locking the video player.
+        /// This is what you would extend if you want to add an access control list or something similar.
+        /// </summary>
+        /// <param name="player"></param>
+        /// <returns></returns>
+        [PublicAPI]
+        public bool IsPrivilegedUser(VRCPlayerApi player)
+        {
 #if UNITY_EDITOR
-            return Networking.IsMaster || !_isMasterOnly;
-#else
-            return Networking.IsMaster || !_isMasterOnly || (allowInstanceCreatorControl && Networking.LocalPlayer.isInstanceOwner);
+            if (player == null)
+                return true;
 #endif
+
+            return player.isMaster || (allowInstanceCreatorControl && player.isInstanceOwner);
         }
 
         /// <summary>

Assets/USharpVideo/Scripts/VideoControlHandler.cs

@@ -370,8 +370,11 @@ public void OnPlayButtonPress()
 
         public void OnLockButtonPress()
         {
-            targetVideoPlayer.TakeOwnership();
-            targetVideoPlayer.SetLocked(!targetVideoPlayer.IsLocked());
+            if (targetVideoPlayer.IsPrivilegedUser(Networking.LocalPlayer))
+            {
+                targetVideoPlayer.TakeOwnership();
+                targetVideoPlayer.SetLocked(!targetVideoPlayer.IsLocked());
+            }
         }
 
         public void OnReloadButtonPressed()