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

Inform about filename in other way

Browse Source
This commit is contained in:
Tomasz Fluxid Kowalczyk 2012-02-04 13:31:19 +01:00
parent 42693afe08
commit 2b472fa802
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
syncplay/client.py
View File

@ -140,9 +140,8 @@ class Manager(object):
return position return position
def init_player(self, player, filename=None): def init_player(self, player):
self.player = player self.player = player
self.player_filename = filename
if self.last_global_update: if self.last_global_update:
self.player.set_position(self.get_global_position()) self.player.set_position(self.get_global_position())
self.player.set_paused(self.global_paused) self.player.set_paused(self.global_paused)
@ -214,6 +213,9 @@ class Manager(object):
#print 'Pausing %0.2fs after pause point' % (position - self.player_paused_at) #print 'Pausing %0.2fs after pause point' % (position - self.player_paused_at)
self.player.set_paused(True) self.player.set_paused(True)
def update_filename(self, filename):
self.player_filename = filename
def update_global_state(self, counter, paused, position, name): def update_global_state(self, counter, paused, position, name):
curtime = time.time() curtime = time.time()
self.global_paused = paused self.global_paused = paused

5
syncplay/players/mpc.py
View File

@ -71,6 +71,7 @@ class MPCHCPlayer(object):
self.host = 'localhost:13579' self.host = 'localhost:13579'
self.pinged = False self.pinged = False
self.tmp_filename = None
self.agent = Agent(reactor) self.agent = Agent(reactor)
@ -109,7 +110,9 @@ class MPCHCPlayer(object):
self.manager.update_player_status(paused, position) self.manager.update_player_status(paused, position)
else: else:
self.pinged = True self.pinged = True
self.manager.init_player(self, filename) self.manager.init_player(self)
if filename != self.tmp_filename:
self.manager.update_filename(filename)
def ask_for_status(self): def ask_for_status(self):
request = self.agent.request( request = self.agent.request(

3
syncplay/players/mplayer.py
View File

@ -77,7 +77,8 @@ class MplayerProtocol(LineProcessProtocol):
self.send_get_property('filename') self.send_get_property('filename')
def mplayer_answer_filename(self, value): def mplayer_answer_filename(self, value):
self.manager.init_player(self, value) self.manager.init_player(self)
self.manager.update_filename(value)
def set_paused(self, value): def set_paused(self, value):