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

Improve vlc.py launch code and error handling

Browse Source
This commit is contained in:
Etoh 2013-06-25 13:19:00 +02:00
parent c47333ed1c
commit 0f5b827e4c
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
syncplay/players/vlc.py
View File

@ -38,14 +38,14 @@ class VlcPlayer(BasePlayer):
try: try:
self._listener = self.__Listener(self, playerPath, filePath, args, self._vlcready) self._listener = self.__Listener(self, playerPath, filePath, args, self._vlcready)
except ValueError: except ValueError:
self._client.ui.showMessage(getMessage("en", "vlc-failed-connection")) self._client.ui.showErrorMessage(getMessage("en", "vlc-failed-connection"), True)
self.reactor.callFromThread(self._client.stop, (True),) self.reactor.callFromThread(self._client.stop, (True),)
return return
self._listener.setDaemon(True) self._listener.setDaemon(True)
self._listener.start() self._listener.start()
if(not self._vlcready.wait(constants.VLC_OPEN_MAX_WAIT_TIME)): if(not self._vlcready.wait(constants.VLC_OPEN_MAX_WAIT_TIME)):
self._vlcready.set() self._vlcready.set()
self._client.ui.showMessage(getMessage("en", "vlc-failed-connection")) self._client.ui.showErrorMessage(getMessage("en", "vlc-failed-connection"), True)
self.reactor.callFromThread(self._client.stop, (True),) self.reactor.callFromThread(self._client.stop, (True),)
self.reactor.callFromThread(self._client.initPlayer, (self),) self.reactor.callFromThread(self._client.initPlayer, (self),)
@ -137,7 +137,7 @@ class VlcPlayer(BasePlayer):
elif (line[:16] == "VLC media player"): elif (line[:16] == "VLC media player"):
vlc_version = line[17:22] vlc_version = line[17:22]
if (int(vlc_version.replace(".","")) < int(constants.VLC_MIN_VERSION.replace(".",""))): if (int(vlc_version.replace(".","")) < int(constants.VLC_MIN_VERSION.replace(".",""))):
self._client.ui.showMessage(getMessage("en", "vlc-version-mismatch").format(str(vlc_version), str(constants.VLC_MIN_VERSION))) self._client.ui.showErrorMessage(getMessage("en", "vlc-version-mismatch").format(str(vlc_version), str(constants.VLC_MIN_VERSION)))
self._vlcready.set() self._vlcready.set()
@ -192,6 +192,14 @@ class VlcPlayer(BasePlayer):
self._vlcready = vlcReady self._vlcready = vlcReady
self.__process = subprocess.Popen(call, stderr=subprocess.PIPE) self.__process = subprocess.Popen(call, stderr=subprocess.PIPE)
for line in iter(self.__process.stderr.readline,''):
if "[syncplay]" in line:
if "Listening on host" in line:
break
elif "lua interface error" in line:
playerController._client.ui.showErrorMessage("VLC Error: " + line)
playerController._client.ui.showErrorMessage(getMessage("en", "vlc-failed-connection"), True)
break
threading.Thread.__init__(self, name="VLC Listener") threading.Thread.__init__(self, name="VLC Listener")
asynchat.async_chat.__init__(self) asynchat.async_chat.__init__(self)
self.set_terminator("\n") self.set_terminator("\n")
@ -205,7 +213,6 @@ class VlcPlayer(BasePlayer):
def run(self): def run(self):
self._vlcready.clear() self._vlcready.clear()
time.sleep(constants.VLC_SOCKET_OPEN_WAIT_TIME)
self.connect(('localhost', self.__playerController.vlcport)) self.connect(('localhost', self.__playerController.vlcport))
asyncore.loop() asyncore.loop()