From 9769570a25c42d9cebf82d09c84cd0825bcd28c8 Mon Sep 17 00:00:00 2001 From: Uriziel Date: Tue, 22 Apr 2014 00:25:27 +0200 Subject: [PATCH] Fixed some bugs with new server code --- syncplay/server.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/syncplay/server.py b/syncplay/server.py index 971c89c..45ab500 100644 --- a/syncplay/server.py +++ b/syncplay/server.py @@ -92,6 +92,7 @@ class SyncFactory(Factory): room = watcher.getRoom() paused, position = room.isPaused(), watcher.getPosition() setBy = watcher + room.setPosition(watcher.getPosition(), setBy) l = lambda w: w.sendState(position, paused, doSeek, setBy, True) self._roomManager.broadcastRoom(watcher, l) @@ -193,6 +194,11 @@ class Room(object): self._playState = paused self._setBy = setBy + def setPosition(self, position, setBy=None): + for watcher in self._watchers.itervalues(): + watcher.setPosition(position) + self._setBy = setBy + def isPlaying(self): return self._playState == self.STATE_PLAYING @@ -252,6 +258,10 @@ class Watcher(object): def getFile(self): return self._file + def setPosition(self, position): + self._position = position + self._lastUpdatedOn = time.time() + def getPosition(self): if self._position is None: return None