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

Reconnect to VLC during max_wait_time if connection failed

Browse Source
This commit is contained in:
Et0h 2016-12-30 13:54:24 +00:00
parent fde8c05117
commit 0f7709e7a4
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
syncplay/players/vlc.py
View File

@ -302,6 +302,7 @@ class VlcPlayer(BasePlayer):
self.requestedVLCVersion = False self.requestedVLCVersion = False
self.vlcHasResponded = False self.vlcHasResponded = False
self.oldIntfVersion = None self.oldIntfVersion = None
self.timeVLCLaunched = None
call = [playerPath] call = [playerPath]
if filePath: if filePath:
if utils.isASCII(filePath): if utils.isASCII(filePath):
@ -362,9 +363,11 @@ class VlcPlayer(BasePlayer):
else: else:
self.__process = subprocess.Popen(call, stderr=subprocess.PIPE, stdout=subprocess.PIPE) self.__process = subprocess.Popen(call, stderr=subprocess.PIPE, stdout=subprocess.PIPE)
self.timeVLCLaunched = time.time()
if self._shouldListenForSTDOUT(): if self._shouldListenForSTDOUT():
for line in iter(self.__process.stderr.readline, ''): for line in iter(self.__process.stderr.readline, ''):
self.vlcHasResponded = True self.vlcHasResponded = True
self.timeVLCLaunched = None
if "[syncplay]" in line: if "[syncplay]" in line:
if "Listening on host" in line: if "Listening on host" in line:
break break
@ -404,12 +407,16 @@ class VlcPlayer(BasePlayer):
def handle_connect(self): def handle_connect(self):
asynchat.async_chat.handle_connect(self) asynchat.async_chat.handle_connect(self)
self._vlcready.set() self._vlcready.set()
self.timeVLCLaunched = None
def collect_incoming_data(self, data): def collect_incoming_data(self, data):
self._ibuffer.append(data) self._ibuffer.append(data)
def handle_close(self): def handle_close(self):
asynchat.async_chat.handle_close(self) asynchat.async_chat.handle_close(self)
if self.timeVLCLaunched and time.time() - self.timeVLCLaunched > constants.VLC_OPEN_MAX_WAIT_TIME:
self.__playerController._client.ui.showDebugMessage("Failed to connect to VLC, but reconnecting as within max wait time")
self.run()
if self.vlcHasResponded: if self.vlcHasResponded:
self.__playerController.drop() self.__playerController.drop()
else: else:
@ -427,7 +434,8 @@ class VlcPlayer(BasePlayer):
self.sendLine("get-vlc-version") self.sendLine("get-vlc-version")
try: try:
self.push(line + "\n") self.push(line + "\n")
self.__playerController._client.ui.showDebugMessage("player >> {}".format(line)) if self.__playerController._client and self.__playerController._client.ui:
self.__playerController._client.ui.showDebugMessage("player >> {}".format(line))
except: except:
pass pass
if line == "close-vlc": if line == "close-vlc":