From fd7032800972d6112a1a6dc1e2b7e00d98da6839 Mon Sep 17 00:00:00 2001 From: Uriziel Date: Sat, 29 Sep 2012 00:53:28 +0200 Subject: [PATCH] Refactoring --- syncplay/server.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/syncplay/server.py b/syncplay/server.py index a1f42af..8efe6e2 100644 --- a/syncplay/server.py +++ b/syncplay/server.py @@ -308,9 +308,8 @@ class SyncFactory(Factory): self.pause_change_by = watcher else: pause_changed = False - position, _ = self.find_position(watcher.room) - self.send_state_to(watcher, position, curtime) # To jest kurwa bez sensu - self.broadcast_room(watcher, lambda receiver: self.send_state_to(receiver, position, curtime) if pause_changed or (curtime-receiver.last_update_sent) > self.update_time_limit else False) + self.send_state_to(watcher) # To jest kurwa bez sensu + self.broadcast_room(watcher, lambda receiver: self.send_state_to(receiver, position) if pause_changed or (curtime-receiver.last_update_sent) > self.update_time_limit else False) def seek(self, watcher_proto, counter, ctime, position): watcher = self.watchers.get(watcher_proto) @@ -328,13 +327,12 @@ class SyncFactory(Factory): receiver.max_position = position receiver.watcher_proto.sender.send_seek(curtime-receiver.time_offset, position, watcher.name) - def send_state_to(self, watcher, position=None, curtime=None): + def send_state_to(self, watcher, position=None): minWatcher = None if position is None: position, minWatcher = self.find_position(watcher.room) minWatcher = minWatcher.name if minWatcher else None - if curtime is None: - curtime = time.time() + curtime = time.time() ctime = curtime - watcher.time_offset if self.pause_change_by: watcher.watcher_proto.sender.send_state(watcher.counter, ctime, self.paused[watcher.room], position, self.pause_change_by.name)