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

Re-add try/except to VLC

Browse Source
This commit is contained in:
Etoh 2020-09-20 13:01:47 +01:00 committed by GitHub
parent ecacd24e9c
commit d97251cda6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
syncplay/players/vlc.py
View File

@ -32,13 +32,13 @@ class VLCProtocol(LineReceiver):
if not self.factory.requestedVLCVersion:
self.factory.requestedVLCVersion = True
self.sendLine("get-vlc-version")
# try:
lineToSend = line.encode('utf-8') + self.delimiter
self.transport.write(lineToSend)
if self.factory._playerController._client and self.factory._playerController._client.ui:
self.factory._playerController._client.ui.showDebugMessage("player >> {}".format(line))
# except:
# pass
try:
lineToSend = line.encode('utf-8') + self.delimiter
self.transport.write(lineToSend)
if self.factory._playerController._client and self.factory._playerController._client.ui:
self.factory._playerController._client.ui.showDebugMessage("player >> {}".format(line))
except:
pass
def connectionMade(self):
self.factory.connected = True
@ -82,10 +82,10 @@ class VLCClientFactory(ClientFactory):
self._playerController._vlcclosed.set()
if not self.connected and not self.timeVLCLaunched:
# For circumstances where Syncplay is not connected to VLC and is not reconnecting
#try:
self._process.terminate()
#except: # When VLC is already closed
# pass
try:
self._process.terminate()
except: # When VLC is already closed
pass
class VlcPlayer(BasePlayer):
@ -139,11 +139,14 @@ class VlcPlayer(BasePlayer):
return
def initWhenConnected(self):
if not self._vlcready.wait(constants.VLC_OPEN_MAX_WAIT_TIME):
self._vlcready.set()
self._client.ui.showErrorMessage(getMessage("vlc-failed-connection"), True)
self.reactor.callFromThread(self._client.stop, True,)
self.reactor.callFromThread(self._client.initPlayer, self,)
try:
if not self._vlcready.wait(constants.VLC_OPEN_MAX_WAIT_TIME):
self._vlcready.set()
self._client.ui.showErrorMessage(getMessage("vlc-failed-connection"), True)
self.reactor.callFromThread(self._client.stop, True,)
self.reactor.callFromThread(self._client.initPlayer, self,)
except:
pass
def _fileUpdateClearEvents(self):
self._durationAsk.clear()
@ -533,4 +536,4 @@ class VlcPlayer(BasePlayer):
out.close()
def sendLine(self, line):
self.reactor.callFromThread(self._factory.protocol.sendLine, line)
self.reactor.callFromThread(self._factory.protocol.sendLine, line)