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

Oh god what the fuck and the other incredible tales

Browse Source
This commit is contained in:
Uriziel 2012-11-12 23:26:57 +01:00
parent 5e26ab48d1
commit aa7b935de7
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
syncplay/client.py
View File

@ -111,17 +111,17 @@ class SyncplayClient(object):
self._playerPaused = paused self._playerPaused = paused
if(self._lastGlobalUpdate): if(self._lastGlobalUpdate):
self._lastPlayerUpdate = time.time() self._lastPlayerUpdate = time.time()
if(pauseChange or seeked): if(pauseChange or seeked and self._protocol):
self.playerPositionBeforeLastSeek = self.getGlobalPosition() if(seeked):
if(self._protocol): self.playerPositionBeforeLastSeek = self.getGlobalPosition()
self._protocol.sendState(self.getPlayerPosition(), self.getPlayerPaused(), seeked, None, True) self._protocol.sendState(self.getPlayerPosition(), self.getPlayerPaused(), seeked, None, True)
def getLocalState(self): def getLocalState(self):
paused = self.getPlayerPaused() paused = self.getPlayerPaused()
position = self.getPlayerPosition() position = self.getPlayerPosition()
pauseChange, seeked = self._determinePlayerStateChange(paused, position) pauseChange, _ = self._determinePlayerStateChange(paused, position)
if(self._lastGlobalUpdate): if(self._lastGlobalUpdate):
return position, paused, seeked, pauseChange return position, paused, _, pauseChange
else: else:
return None, None, None, None return None, None, None, None
@ -166,10 +166,10 @@ class SyncplayClient(object):
return madeChangeOnPlayer return madeChangeOnPlayer
def _slowDownToCoverTimeDifference(self, diff): def _slowDownToCoverTimeDifference(self, diff):
if(0.5 < diff): if(1.0 < diff and not self._speedChanged):
self._player.setSpeed(0.95) self._player.setSpeed(0.95)
self._speedChanged = True self._speedChanged = True
elif(self._speedChanged and diff < 0.2 ): elif(self._speedChanged and diff < 0.1 ):
self._player.setSpeed(1.00) self._player.setSpeed(1.00)
self._speedChanged = False self._speedChanged = False
madeChangeOnPlayer = True madeChangeOnPlayer = True

2
syncplay/players/mpc.py
View File

@ -75,7 +75,7 @@ class MPCHCAPIPlayer(BasePlayer):
self.__mpcVersion = self._mpcApi.version.split('.') self.__mpcVersion = self._mpcApi.version.split('.')
if(self.__mpcVersion[0:3] == ['1', '6', '4']): if(self.__mpcVersion[0:3] == ['1', '6', '4']):
self.__switchPauseCalls = True self.__switchPauseCalls = True
if(self.__mpcVersion[0:3] >= ['1', '6', '5']): if(False and self.__mpcVersion[0:3] >= ['1', '6', '5']): #disabled!
self.speedSupported = True self.speedSupported = True
if(filePath): if(filePath):
self._mpcApi.openFile(filePath) self._mpcApi.openFile(filePath)

9
syncplay/protocols.py
View File

@ -20,7 +20,7 @@ class JSONCommandProtocol(LineReceiver):
elif command == "Error": elif command == "Error":
self.handleState(message[1]) self.handleState(message[1])
else: else:
self.dropWithError("Unknown Command") #TODO: log, not drop self.dropWithError("Unknown Command\n" + message[1]) #TODO: log, not drop
def printReceived(self, line): #TODO: remove def printReceived(self, line): #TODO: remove
# print ">>i", line # print ">>i", line
@ -38,7 +38,7 @@ class JSONCommandProtocol(LineReceiver):
try: try:
messages = json.loads(line) messages = json.loads(line)
except: except:
self.dropWithError("Not a json encoded string") self.dropWithError("Not a json encoded string\n" + line)
return return
self.handleMessages(messages) self.handleMessages(messages)
@ -68,6 +68,7 @@ class SyncClientProtocol(JSONCommandProtocol):
self._client.destroyProtocol() self._client.destroyProtocol()
def dropWithError(self, error): def dropWithError(self, error):
print error
self._client.ui.showErrorMessage(error) self._client.ui.showErrorMessage(error)
self._client.protocolFactory.stopRetrying() self._client.protocolFactory.stopRetrying()
self.drop() self.drop()
@ -81,9 +82,9 @@ class SyncClientProtocol(JSONCommandProtocol):
def handleHello(self, hello): def handleHello(self, hello):
username, roomName, version = self._extractHelloArguments(hello) username, roomName, version = self._extractHelloArguments(hello)
if(not username or not roomName or not version): if(not username or not roomName or not version):
self.dropWithError("Not enough Hello arguments") self.dropWithError("Not enough Hello arguments\n" + hello)
elif(version.split(".")[0:2] != syncplay.version.split(".")[0:2]): elif(version.split(".")[0:2] != syncplay.version.split(".")[0:2]):
self.dropWithError("Mismatch between versions of client and server") self.dropWithError("Mismatch between versions of client and server\n" + hello)
else: else:
self._client.setUsername(username) self._client.setUsername(username)
self._client.setRoom(roomName) self._client.setRoom(roomName)