Inform about filename in other way
This commit is contained in:
parent
42693afe08
commit
2b472fa802
@ -140,9 +140,8 @@ class Manager(object):
|
||||
return position
|
||||
|
||||
|
||||
def init_player(self, player, filename=None):
|
||||
def init_player(self, player):
|
||||
self.player = player
|
||||
self.player_filename = filename
|
||||
if self.last_global_update:
|
||||
self.player.set_position(self.get_global_position())
|
||||
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)
|
||||
self.player.set_paused(True)
|
||||
|
||||
def update_filename(self, filename):
|
||||
self.player_filename = filename
|
||||
|
||||
def update_global_state(self, counter, paused, position, name):
|
||||
curtime = time.time()
|
||||
self.global_paused = paused
|
||||
|
||||
@ -71,6 +71,7 @@ class MPCHCPlayer(object):
|
||||
self.host = 'localhost:13579'
|
||||
|
||||
self.pinged = False
|
||||
self.tmp_filename = None
|
||||
|
||||
self.agent = Agent(reactor)
|
||||
|
||||
@ -109,7 +110,9 @@ class MPCHCPlayer(object):
|
||||
self.manager.update_player_status(paused, position)
|
||||
else:
|
||||
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):
|
||||
request = self.agent.request(
|
||||
|
||||
@ -77,7 +77,8 @@ class MplayerProtocol(LineProcessProtocol):
|
||||
self.send_get_property('filename')
|
||||
|
||||
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):
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user