Merge branch 'master' into connection-manager-global

2020-09-01 10:16:21 +02:00
parent 73c7dfa0dd 924e8df815
commit 3cbe0f7264
139 changed files with 1032 additions and 3566 deletions
@@ -740,7 +740,7 @@ class SyncPlayManager {

        const playAtTime = this.lastCommand.When;

-        const currentPositionTicks = playbackManager.currentTime();
+        const currentPositionTicks = playbackManager.currentTime() * 10000;
        // Estimate PositionTicks on server
        const serverPositionTicks = this.lastCommand.PositionTicks + ((currentTime - playAtTime) + this.timeOffsetWithServer) * 10000;
        // Measure delay that needs to be recovered