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

Ensure close-vlc is sent

Browse Source
This commit is contained in:
Etoh 2014-02-17 21:11:00 +00:00
parent 59167f480b
commit 0db1f920d1
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
syncplay/players/vlc.py
View File

@ -36,8 +36,9 @@ class VlcPlayer(BasePlayer):
self._positionAsk = threading.Event() self._positionAsk = threading.Event()
self._pausedAsk = threading.Event() self._pausedAsk = threading.Event()
self._vlcready = threading.Event() self._vlcready = threading.Event()
self._vlcclosed = threading.Event()
try: try:
self._listener = self.__Listener(self, playerPath, filePath, args, self._vlcready) self._listener = self.__Listener(self, playerPath, filePath, args, self._vlcready, self._vlcclosed)
except ValueError: except ValueError:
self._client.ui.showErrorMessage(getMessage("en", "vlc-failed-connection"), True) self._client.ui.showErrorMessage(getMessage("en", "vlc-failed-connection"), True)
self.reactor.callFromThread(self._client.stop, (True),) self.reactor.callFromThread(self._client.stop, (True),)
@ -194,7 +195,9 @@ class VlcPlayer(BasePlayer):
return path return path
def drop(self): def drop(self):
self._vlcclosed.clear()
self._listener.sendLine('close-vlc') self._listener.sendLine('close-vlc')
self._vlcclosed.wait()
self._durationAsk.set() self._durationAsk.set()
self._filenameAsk.set() self._filenameAsk.set()
self._pathAsk.set() self._pathAsk.set()
@ -204,7 +207,7 @@ class VlcPlayer(BasePlayer):
self.reactor.callFromThread(self._client.stop, (False),) self.reactor.callFromThread(self._client.stop, (False),)
class __Listener(threading.Thread, asynchat.async_chat): class __Listener(threading.Thread, asynchat.async_chat):
def __init__(self, playerController, playerPath, filePath, args, vlcReady): def __init__(self, playerController, playerPath, filePath, args, vlcReady, vlcClosed):
self.__playerController = playerController self.__playerController = playerController
call = [playerPath] call = [playerPath]
if(filePath): if(filePath):
@ -248,6 +251,7 @@ class VlcPlayer(BasePlayer):
call.extend(args) call.extend(args)
self._vlcready = vlcReady self._vlcready = vlcReady
self._vlcclosed = vlcClosed
self.__process = subprocess.Popen(call, stderr=subprocess.PIPE) self.__process = subprocess.Popen(call, stderr=subprocess.PIPE)
for line in iter(self.__process.stderr.readline,''): for line in iter(self.__process.stderr.readline,''):
if "[syncplay]" in line: if "[syncplay]" in line:
@ -296,4 +300,9 @@ class VlcPlayer(BasePlayer):
def sendLine(self, line): def sendLine(self, line):
if(self.connected): if(self.connected):
# print "send: {}".format(line) # print "send: {}".format(line)
self.push(line + "\n") try:
self.push(line + "\n")
except:
pass
if(line == "close-vlc"):
self._vlcclosed.set()