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

mpv: Handle old vers / exceptions better

Browse Source
This commit is contained in:
Et0h 2014-09-26 13:01:40 +01:00
parent 9ca2c54a69
commit b9f20dfb07
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
syncplay/players/mpv.py
View File

@ -44,7 +44,7 @@ class MpvPlayer(MplayerPlayer):
self._listener.sendLine(u'loadfile {}'.format(self._quoteArg(filePath))) self._listener.sendLine(u'loadfile {}'.format(self._quoteArg(filePath)))
def _handleUnknownLine(self, line): def _handleUnknownLine(self, line):
if "Error parsing option" in line: if "Error parsing option" in line or "Error parsing commandline option" in line:
self.quitReason = getMessage("mpv-version-error") self.quitReason = getMessage("mpv-version-error")
elif line == "<SyncplayUpdateFile>": elif line == "<SyncplayUpdateFile>":
@ -91,7 +91,10 @@ class MpvPlayer(MplayerPlayer):
@staticmethod @staticmethod
def getStartupArgs(path): def getStartupArgs(path):
ver = MpvPlayer.RE_VERSION.search(subprocess.check_output([path, '--version'])) try:
ver = MpvPlayer.RE_VERSION.search(subprocess.check_output([path, '--version']))
except:
ver = None
new_mpv = ver is None or int(ver.group(1)) > 0 or int(ver.group(2)) >= 5 new_mpv = ver is None or int(ver.group(1)) > 0 or int(ver.group(2)) >= 5
args = constants.MPV_SLAVE_ARGS args = constants.MPV_SLAVE_ARGS
if sys.platform.startswith('win') or not new_mpv: if sys.platform.startswith('win') or not new_mpv: