Rezzect/syncplay
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Use best guess for position if VLC takes too long to respond

Browse Source
This commit is contained in:
Et0h 2015-03-27 15:35:34 +00:00
parent eab9a90c41
commit 0a94070967
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
syncplay/players/vlc.py
View File

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