Fix callback initialization order issue and simplify URL button example

MerlinVR · MerlinVR · commit 6bfab05de23a · 2021-06-12T00:10:41.000-07:00
diff --git a/Assets/USharpVideo/Examples/Scripts/PlayURLButton.cs b/Assets/USharpVideo/Examples/Scripts/PlayURLButton.cs
@@ -29,11 +29,7 @@ void Start()
 
         public void OnButtonPress()
         {
-            if (targetVideoPlayer.CanControlVideoPlayer())
-            {
-                targetVideoPlayer.TakeOwnership();
-                targetVideoPlayer.PlayVideo(url);
-            }
+            targetVideoPlayer.PlayVideo(url);
         }
 
         public void OnUSharpVideoLockChange()
diff --git a/Assets/USharpVideo/Scripts/USharpVideoPlayer.cs b/Assets/USharpVideo/Scripts/USharpVideoPlayer.cs
@@ -164,7 +164,8 @@ void Start()
             if (_registeredControlHandlers == null)
                 _registeredControlHandlers = new VideoControlHandler[0];
 
-            _registeredCallbackReceivers = new UdonSharpBehaviour[0];
+            if (_registeredCallbackReceivers == null)
+                _registeredCallbackReceivers = new UdonSharpBehaviour[0];
 
             if (Networking.IsOwner(gameObject))
             {

Original file line number	Diff line number	Diff line change
`@@ -29,11 +29,7 @@ void Start()`
`29`	`29`
`30`	`30`	`public void OnButtonPress()`
`31`	`31`	`{`
`32`		`- if (targetVideoPlayer.CanControlVideoPlayer())`
`33`		`- {`
`34`		`- targetVideoPlayer.TakeOwnership();`
`35`		`- targetVideoPlayer.PlayVideo(url);`
`36`		`- }`
	`32`	`+ targetVideoPlayer.PlayVideo(url);`
`37`	`33`	`}`
`38`	`34`
`39`	`35`	`public void OnUSharpVideoLockChange()`
Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,8 @@ void Start()`
`164`	`164`	`if (_registeredControlHandlers == null)`
`165`	`165`	`_registeredControlHandlers = new VideoControlHandler[0];`
`166`	`166`
`167`		`- _registeredCallbackReceivers = new UdonSharpBehaviour[0];`
	`167`	`+ if (_registeredCallbackReceivers == null)`
	`168`	`+ _registeredCallbackReceivers = new UdonSharpBehaviour[0];`
`168`	`169`
`169`	`170`	`if (Networking.IsOwner(gameObject))`
`170`	`171`	`{`