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

Fix joining to sessions which have longer playing time. It works but still needs some polishing.

Browse Source
This commit is contained in:
Tomasz Fluxid Kowalczyk 2012-02-01 00:23:54 +01:00
parent 0ba0581063
commit cf488bd995
1 changed files with 48 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
syncplay/client.py
View File

@ -122,8 +122,28 @@ class Manager(object):
reactor.callLater(0.1, reactor.stop) reactor.callLater(0.1, reactor.stop)
def get_player_position(self):
if not self.last_player_update:
return None
position = self.player_position
if not self.player_paused:
position += time.time() - self.last_player_update
return position
def get_global_position(self):
if not self.last_global_update:
return None
position = self.global_position
if not self.global_paused:
position += time.time() - self.last_global_update
return position
def init_player(self, player): def init_player(self, player):
self.player = player self.player = player
if self.last_global_update:
self.player.send_set_position(self.get_global_position())
self.player.send_set_paused(self.global_paused)
self.schedule_ask_player() self.schedule_ask_player()
def init_protocol(self, protocol): def init_protocol(self, protocol):
@ -146,6 +166,7 @@ class Manager(object):
self.player.send_get_paused() self.player.send_get_paused()
self.schedule_ask_player() self.schedule_ask_player()
def schedule_send_status(self, when=1): def schedule_send_status(self, when=1):
if self.send_delayed and self.send_delayed.active(): if self.send_delayed and self.send_delayed.active():
self.send_delayed.reset(when) self.send_delayed.reset(when)
@ -162,24 +183,24 @@ class Manager(object):
def update_player_position(self, value): def update_player_position(self, value):
curtime = time.time()
self.player_position = value self.player_position = value
self.last_player_update = curtime self.last_player_update = time.time()
diff = self.global_position + (curtime - self.last_global_update) - value
#if self if not self.global_paused:
if not self.global_paused and 0.6 <= abs(diff) <= 4: diff = self.get_global_position() - value
#print 'server is %0.2fs ahead of client' % diff if 0.6 <= abs(diff) <= 4:
if diff > 0: #print 'server is %0.2fs ahead of client' % diff
speed = 1.5 if diff > 0:
else: speed = 1.5
speed = 0.75 else:
#print 'fixing at speed %0.2f' % speed speed = 0.75
if not self.player_speed_fix: #print 'fixing at speed %0.2f' % speed
self.player.send_set_speed(speed) if not self.player_speed_fix:
self.player_speed_fix = True self.player.send_set_speed(speed)
elif self.player_speed_fix: self.player_speed_fix = True
self.player.send_set_speed(1) elif self.player_speed_fix:
self.player_speed_fix = False self.player.send_set_speed(1)
self.player_speed_fix = False
if not self.player_paused and self.player_paused_at is not None and value >= self.player_paused_at: if not self.player_paused and self.player_paused_at is not None and value >= self.player_paused_at:
self.player.send_set_paused(True) self.player.send_set_paused(True)
@ -198,25 +219,26 @@ class Manager(object):
curtime = time.time() curtime = time.time()
self.global_paused = paused self.global_paused = paused
self.global_position = position self.global_position = position
updated_before = bool(self.last_global_update)
self.last_global_update = curtime self.last_global_update = curtime
if self.player and not (self.counter and counter < self.counter):
changed = False if not self.player:
diff = self.player_position - position return
if not updated_before:
self.player.send_set_position(position)
self.player.send_set_paused(paused)
elif not (self.counter and counter < self.counter):
diff = self.get_player_position() - position
if self.last_player_update is not None: if self.last_player_update is not None:
diff += curtime - self.last_player_update diff += curtime - self.last_player_update
if abs(diff) > 4: if abs(diff) > 4:
self.player.send_set_position(position) self.player.send_set_position(position)
changed = True
if self.player_paused and not paused: if self.player_paused and not paused:
self.player_paused_at = None self.player_paused_at = None
self.player.send_set_paused(False) self.player.send_set_paused(False)
changed = True
elif paused and not self.player_paused: elif paused and not self.player_paused:
self.player_paused_at = position self.player_paused_at = position
if diff < 0: if diff < 0:
self.player.send_set_paused(True) self.player.send_set_paused(True)
changed = True
if changed:
self.schedule_ask_player()