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

mpv: Hopefully fix mpv compatability issues

Browse Source
This commit is contained in:
Et0h 2014-09-27 00:27:39 +01:00
parent 634124b4e5
commit 442e753a11
2 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
syncplay/constants.py
View File

@ -108,9 +108,11 @@ STYLE_NOFILEITEM_COLOR = 'blue'
MPLAYER_SLAVE_ARGS = ['-slave', '--hr-seek=always', '-nomsgcolor', '-msglevel', 'all=1:global=4:cplayer=4'] MPLAYER_SLAVE_ARGS = ['-slave', '--hr-seek=always', '-nomsgcolor', '-msglevel', 'all=1:global=4:cplayer=4']
# --quiet works with both mpv 0.2 and 0.3 # --quiet works with both mpv 0.2 and 0.3
MPV_SLAVE_ARGS = ['--hr-seek=always', '--quiet', '--keep-open', '--term-playing-msg=<SyncplayUpdateFile>\nANS_filename=${filename}\nANS_length=${=length}\nANS_path=${path}\n</SyncplayUpdateFile>'] MPV_SLAVE_ARGS = ['--hr-seek=always', '--quiet', '--keep-open']
MPV_SLAVE_ARGS_WINDOWS = ['--slave-broken'] MPV_SLAVE_ARGS_WINDOWS = ['--slave-broken']
MPV_SLAVE_ARGS_NONWINDOWS = ['--input-terminal=no','--input-file=/dev/stdin'] MPV_SLAVE_ARGS_NONWINDOWS = ['--input-terminal=no','--input-file=/dev/stdin']
MPV_SLAVE_ARGS_NEW = ['--term-playing-msg=<SyncplayUpdateFile>\nANS_filename=${filename}\nANS_length=${=length}\nANS_path=${path}\n</SyncplayUpdateFile>']
MPV_NEW_VERSION = False
VLC_SLAVE_ARGS = ['--extraintf=luaintf', '--lua-intf=syncplay', '--no-quiet', '--no-input-fast-seek', VLC_SLAVE_ARGS = ['--extraintf=luaintf', '--lua-intf=syncplay', '--no-quiet', '--no-input-fast-seek',
'--play-and-pause', '--start-time=0'] '--play-and-pause', '--start-time=0']
VLC_SLAVE_NONOSX_ARGS = ['--no-one-instance', '--no-one-instance-when-started-from-file'] VLC_SLAVE_NONOSX_ARGS = ['--no-one-instance', '--no-one-instance-when-started-from-file']

37
syncplay/players/mpv.py
View File

@ -33,16 +33,35 @@ class MpvPlayer(MplayerPlayer):
self._paused = self._client.getGlobalPaused() self._paused = self._client.getGlobalPaused()
def _onFileUpdate(self): def _onFileUpdate(self):
pass if not constants.MPV_NEW_VERSION:
oldFilename = self._filename
oldLength = self._duration
oldFilepath = self._filepath
self._fileUpdateClearEvents()
self._getFilename()
self._getLength()
self._getFilepath()
self._fileUpdateWaitEvents()
if (self._filename != oldFilename) or (self._duration != oldLength) or (self._filepath != oldFilepath):
self._client.updateFile(self._filename, self._duration, self._filepath)
def _clearFileLoaded(self): def _clearFileLoaded(self):
self.fileLoaded = False self.fileLoaded = False
self.lastLoadedTime = None self.lastLoadedTime = None
def _loadFile(self, filePath): def _loadFile(self, filePath):
self._clearFileLoaded() if constants.MPV_NEW_VERSION:
self._clearFileLoaded()
self._listener.sendLine(u'loadfile {}'.format(self._quoteArg(filePath))) self._listener.sendLine(u'loadfile {}'.format(self._quoteArg(filePath)))
def openFile(self, filePath, resetPosition=False):
if resetPosition:
self.lastResetTime = time.time()
self._loadFile(filePath)
if self._paused != self._client.getGlobalPaused():
self.setPaused(self._client.getGlobalPaused())
self.setPosition(self._client.getGlobalPosition())
def _handleUnknownLine(self, line): def _handleUnknownLine(self, line):
if "Error parsing option" in line or "Error parsing commandline 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")
@ -65,7 +84,13 @@ class MpvPlayer(MplayerPlayer):
self._positionAsk.set() self._positionAsk.set()
elif "Playing:" in line: elif "Playing:" in line:
self._clearFileLoaded() if constants.MPV_NEW_VERSION:
self._clearFileLoaded()
else:
self.fileLoaded = True
if not self._recentlyReset():
self._onMPVFileUpdate()
self.reactor.callFromThread(self._onFileUpdate)
def _recentlyReset(self): def _recentlyReset(self):
if not self.lastResetTime: if not self.lastResetTime:
@ -100,9 +125,11 @@ class MpvPlayer(MplayerPlayer):
ver = MpvPlayer.RE_VERSION.search(subprocess.check_output([path, '--version'])) ver = MpvPlayer.RE_VERSION.search(subprocess.check_output([path, '--version']))
except: except:
ver = None ver = None
new_mpv = ver is None or int(ver.group(1)) > 0 or int(ver.group(2)) >= 5 constants.MPV_NEW_VERSION = 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 constants.MPV_NEW_VERSION or sys.platform.startswith('win'):
args.extend(constants.MPV_SLAVE_ARGS_NEW)
if sys.platform.startswith('win') or not constants.MPV_NEW_VERSION:
args.extend(constants.MPV_SLAVE_ARGS_WINDOWS) args.extend(constants.MPV_SLAVE_ARGS_WINDOWS)
else: else:
args.extend(constants.MPV_SLAVE_ARGS_NONWINDOWS) args.extend(constants.MPV_SLAVE_ARGS_NONWINDOWS)