Skip to content

Commit c4250a1

Browse files
committed
Hide progress bar on stream player & don't stop on lock
- Don't stop video when enabling the owner lock - Also try to prevent the slider from getting dragged around when the video has changed while dragging
1 parent 1854cc8 commit c4250a1

File tree

2 files changed

+18
-1
lines changed

2 files changed

+18
-1
lines changed

Assets/USharpVideo/Scenes/VideoPlayerExampleScene.unity

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6549,6 +6549,19 @@ MonoBehaviour:
65496549
serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgUAAAAAAAAAAi8CAAAAAUoAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBTAGkAbgBnAGwAZQAsACAAbQBzAGMAbwByAGwAaQBiAF0AXQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAgAAAAYCAAAAAAAAACcBBAAAAHQAeQBwAGUAARcAAABTAHkAcwB0AGUAbQAuAFMAdAByAGkAbgBnACwAIABtAHMAYwBvAHIAbABpAGIAJwEKAAAAUwB5AG0AYgBvAGwATgBhAG0AZQABCgAAAGoAdQBtAHAASABlAGkAZwBoAHQAJwEEAAAAdAB5AHAAZQABFwAAAFMAeQBzAHQAZQBtAC4AUwBpAG4AZwBsAGUALAAgAG0AcwBjAG8AcgBsAGkAYgAfAQUAAABWAGEAbAB1AGUAAACwQAcFAjACAAAAAwAAAAYCAAAAAAAAACcBBAAAAHQAeQBwAGUAARcAAABTAHkAcwB0AGUAbQAuAFMAdAByAGkAbgBnACwAIABtAHMAYwBvAHIAbABpAGIAJwEKAAAAUwB5AG0AYgBvAGwATgBhAG0AZQABCAAAAHIAdQBuAFMAcABlAGUAZAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAGkAbgBnAGwAZQAsACAAbQBzAGMAbwByAGwAaQBiAB8BBQAAAFYAYQBsAHUAZQAAAJBABwUCMAIAAAAEAAAABgIAAAAAAAAAJwEEAAAAdAB5AHAAZQABFwAAAFMAeQBzAHQAZQBtAC4AUwB0AHIAaQBuAGcALAAgAG0AcwBjAG8AcgBsAGkAYgAnAQoAAABTAHkAbQBiAG8AbABOAGEAbQBlAAEJAAAAdwBhAGwAawBTAHAAZQBlAGQAJwEEAAAAdAB5AHAAZQABFwAAAFMAeQBzAHQAZQBtAC4AUwBpAG4AZwBsAGUALAAgAG0AcwBjAG8AcgBsAGkAYgAfAQUAAABWAGEAbAB1AGUAAAAgQAcFAjACAAAABQAAAAYCAAAAAAAAACcBBAAAAHQAeQBwAGUAARcAAABTAHkAcwB0AGUAbQAuAFMAdAByAGkAbgBnACwAIABtAHMAYwBvAHIAbABpAGIAJwEKAAAAUwB5AG0AYgBvAGwATgBhAG0AZQABBwAAAGcAcgBhAHYAaQB0AHkAJwEEAAAAdAB5AHAAZQABFwAAAFMAeQBzAHQAZQBtAC4AUwBpAG4AZwBsAGUALAAgAG0AcwBjAG8AcgBsAGkAYgAfAQUAAABWAGEAbAB1AGUAAACAPwcFAi8DAAAAAUsAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBCAG8AbwBsAGUAYQBuACwAIABtAHMAYwBvAHIAbABpAGIAXQBdACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAGAAAABgIAAAAAAAAAJwEEAAAAdAB5AHAAZQABFwAAAFMAeQBzAHQAZQBtAC4AUwB0AHIAaQBuAGcALAAgAG0AcwBjAG8AcgBsAGkAYgAnAQoAAABTAHkAbQBiAG8AbABOAGEAbQBlAAETAAAAdQBzAGUATABlAGcAYQBjAHkATABvAGMAbwBtAG8AdABpAG8AbgAnAQQAAAB0AHkAcABlAAEYAAAAUwB5AHMAdABlAG0ALgBCAG8AbwBsAGUAYQBuACwAIABtAHMAYwBvAHIAbABpAGIAKwEFAAAAVgBhAGwAdQBlAAEHBQcFBwU=
65506550
publicVariablesUnityEngineObjects: []
65516551
publicVariablesSerializationDataFormat: 0
6552+
--- !u!114 &521553870
6553+
MonoBehaviour:
6554+
m_ObjectHideFlags: 0
6555+
m_CorrespondingSourceObject: {fileID: 0}
6556+
m_PrefabInstance: {fileID: 0}
6557+
m_PrefabAsset: {fileID: 0}
6558+
m_GameObject: {fileID: 521553865}
6559+
m_Enabled: 1
6560+
m_EditorHideFlags: 0
6561+
m_Script: {fileID: 229740497, guid: 4ecd63eff847044b68db9453ce219299, type: 3}
6562+
m_Name:
6563+
m_EditorClassIdentifier:
6564+
contentType: 1
65526565
--- !u!1 &534669902
65536566
GameObject:
65546567
m_ObjectHideFlags: 0

Assets/USharpVideo/Scripts/USharpVideoPlayer.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,7 @@ void StopVideo()
315315
_currentPlayer.Stop();
316316
_syncedURL = VRCUrl.Empty;
317317
_locallyPaused = _ownerPaused = false;
318+
_draggingSlider = false;
318319
}
319320

320321
public override void OnVideoReady()
@@ -360,6 +361,7 @@ public override void OnVideoStart()
360361
}
361362

362363
_statusStr = "";
364+
_draggingSlider = false;
363365

364366
lastVideoField.text = currentVideoField.text;
365367
currentVideoField.text = _syncedURL.Get();
@@ -467,6 +469,7 @@ void ChangePlayerMode()
467469
syncModeController.SetVideoVisual();
468470
pauseIcon.SetActive(true);
469471
stopIcon.SetActive(false);
472+
videoProgressSlider.gameObject.SetActive(true);
470473
break;
471474
case PLAYER_MODE_STREAM:
472475
_currentPlayer = avProVideoPlayer;
@@ -475,6 +478,7 @@ void ChangePlayerMode()
475478
syncModeController.SetStreamVisual();
476479
pauseIcon.SetActive(false);
477480
stopIcon.SetActive(true);
481+
videoProgressSlider.gameObject.SetActive(false);
478482
break;
479483
}
480484

@@ -621,7 +625,7 @@ private void Update()
621625
{
622626
if (isOwner && _needsOwnerTransition)
623627
{
624-
StopVideo();
628+
//StopVideo();
625629
_needsOwnerTransition = false;
626630
_masterOnly = _masterOnlyLocal;
627631
}

0 commit comments

Comments
 (0)