From 0a94070967397c6017c2f0bdb4abf925d5da7a07 Mon Sep 17 00:00:00 2001
From: Et0h <boldly@gmail.com>
Date: Fri, 27 Mar 2015 15:35:34 +0000
Subject: [PATCH] Use best guess for position if VLC takes too long to respond

---
 syncplay/players/vlc.py | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/syncplay/players/vlc.py b/syncplay/players/vlc.py
index 3b5560e..ace2a47 100644
--- a/syncplay/players/vlc.py
+++ b/syncplay/players/vlc.py
@@ -9,6 +9,7 @@ import random
 import socket
 import asynchat, asyncore
 import urllib
+import time
 from syncplay.messages import getMessage
 
 class VlcPlayer(BasePlayer):
@@ -33,6 +34,7 @@ class VlcPlayer(BasePlayer):
         self._filename = None
         self._filepath = None
         self._filechanged = False
+        self._lastVLCPositionUpdate = None
         try: # Hack to fix locale issue without importing locale library
             self.radixChar = "{:n}".format(1.5)[1:2]
             if self.radixChar == "" or self.radixChar == "1" or self.radixChar == "5":
@@ -87,12 +89,20 @@ class VlcPlayer(BasePlayer):
         self._pausedAsk.clear()
         self._listener.sendLine(".")
         if self._filename and not self._filechanged:
-            self._positionAsk.wait()
-            self._pausedAsk.wait()
-            self._client.updatePlayerStatus(self._paused, self._position)
+            self._positionAsk.wait(constants.PLAYER_ASK_DELAY)
+            self._client.updatePlayerStatus(self._paused, self.getCalculatedPosition())
         else:
             self._client.updatePlayerStatus(self._client.getGlobalPaused(), self._client.getGlobalPosition())
 
+    def getCalculatedPosition(self):
+        if self._lastVLCPositionUpdate is None:
+            return 0
+        diff = time.time() - self._lastVLCPositionUpdate
+        if diff > constants.PLAYER_ASK_DELAY and not self._paused:
+            return self._position + diff
+        else:
+            return self._position
+
     def displayMessage(self, message, duration=constants.OSD_DURATION * 1000, secondaryOSD=False):
         duration /= 1000
         if secondaryOSD == False:
@@ -169,6 +179,7 @@ class VlcPlayer(BasePlayer):
             self._pausedAsk.set()
         elif name == "position":
             self._position = float(value.replace(",", ".")) if (value != "no-input" and self._filechanged == False) else self._client.getGlobalPosition()
+            self._lastVLCPositionUpdate = time.time()
             self._positionAsk.set()
         elif name == "filename":
             self._filechanged = True