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

Re-work client drop (mplayer.py)

Browse Source
This commit is contained in:
Etoh 2014-02-19 22:50:26 +00:00 committed by Uriziel
parent 56b8ec8990
commit f8f22619ac
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
syncplay/players/mplayer.py
View File

@ -21,9 +21,7 @@ class MplayerPlayer(BasePlayer):
try: try:
self._listener = self.__Listener(self, playerPath, filePath, args) self._listener = self.__Listener(self, playerPath, filePath, args)
except ValueError: except ValueError:
self._client.ui.showMessage(getMessage("en", "mplayer-file-required-notification")) self.reactor.callFromThread(self._client.stop,getMessage("en", "mplayer-file-required-notification")+"\n"+getMessage("en", "mplayer-file-required-notification/example"),)
self._client.ui.showMessage(getMessage("en", "mplayer-file-required-notification/example"))
self.reactor.callFromThread(self._client.stop, (True),)
return return
self._listener.setDaemon(True) self._listener.setDaemon(True)
self._listener.start() self._listener.start()
@ -181,9 +179,8 @@ class MplayerPlayer(BasePlayer):
return path return path
def notMplayer2(self): def notMplayer2(self):
print getMessage("en", "mplayer2-required")
self._listener.sendLine('quit') self._listener.sendLine('quit')
self.reactor.callFromThread(self._client.stop, (True),) self.reactor.callFromThread(self._client.stop, getMessage("en", "mplayer2-required"),)
def _takeLocksDown(self): def _takeLocksDown(self):
self._durationAsk.set() self._durationAsk.set()
@ -195,7 +192,7 @@ class MplayerPlayer(BasePlayer):
def drop(self): def drop(self):
self._listener.sendLine('quit') self._listener.sendLine('quit')
self._takeLocksDown() self._takeLocksDown()
self.reactor.callFromThread(self._client.stop, (False),) self.reactor.callFromThread(self._client.stop,)
class __Listener(threading.Thread): class __Listener(threading.Thread):
def __init__(self, playerController, playerPath, filePath, args): def __init__(self, playerController, playerPath, filePath, args):