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

Fixed the deprecated calls in mpv, removed -no-msgcolor as it apparently didn't have any effect

Browse Source
This commit is contained in:
Uriziel 2014-05-04 17:06:37 +02:00
parent 68f619d3af
commit b8f84c80c3
3 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
syncplay/constants.py
View File

@ -86,10 +86,10 @@ VLC_MAX_PORT = 55000
#These are not changes you're looking for #These are not changes you're looking for
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 = ['--slave-broken', '--hr-seek=always', '--no-msgcolor', '--quiet'] MPV_SLAVE_ARGS = ['--slave-broken', '--hr-seek=always', '--quiet']
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']
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']
MPLAYER_ANSWER_REGEX = "^ANS_([a-zA-Z_]+)=(.+)$" MPLAYER_ANSWER_REGEX = "^ANS_([a-zA-Z_-]+)=(.+)$"
VLC_ANSWER_REGEX = r"(?:^(?P<command>[a-zA-Z_]+)(?:\: )?(?P<argument>.*))" VLC_ANSWER_REGEX = r"(?:^(?P<command>[a-zA-Z_]+)(?:\: )?(?P<argument>.*))"
UI_COMMAND_REGEX = r"^(?P<command>[^\ ]+)(?:\ (?P<parameter>.+))?" UI_COMMAND_REGEX = r"^(?P<command>[^\ ]+)(?:\ (?P<parameter>.+))?"
UI_OFFSET_REGEX = r"^(?:o|offset)\ ?(?P<sign>[/+-])?(?P<time>\d{1,4}(?:[^\d\.](?:\d{1,6})){0,2}(?:\.(?:\d{1,3}))?)$" UI_OFFSET_REGEX = r"^(?:o|offset)\ ?(?P<sign>[/+-])?(?P<time>\d{1,4}(?:[^\d\.](?:\d{1,6})){0,2}(?:\.(?:\d{1,3}))?)$"

12
syncplay/players/mplayer.py
View File

@ -10,6 +10,9 @@ class MplayerPlayer(BasePlayer):
speedSupported = True speedSupported = True
RE_ANSWER = re.compile(constants.MPLAYER_ANSWER_REGEX) RE_ANSWER = re.compile(constants.MPLAYER_ANSWER_REGEX)
SLAVE_ARGS = constants.MPLAYER_SLAVE_ARGS SLAVE_ARGS = constants.MPLAYER_SLAVE_ARGS
POSITION_QUERY = 'time_pos'
OSD_QUERY = 'osd_show_text'
def __init__(self, client, playerPath, filePath, args): def __init__(self, client, playerPath, filePath, args):
from twisted.internet import reactor from twisted.internet import reactor
self.reactor = reactor self.reactor = reactor
@ -75,7 +78,7 @@ class MplayerPlayer(BasePlayer):
self._listener.sendLine("get_property {}".format(property_)) self._listener.sendLine("get_property {}".format(property_))
def displayMessage(self, message, duration=(constants.OSD_DURATION * 1000)): def displayMessage(self, message, duration=(constants.OSD_DURATION * 1000)):
self._listener.sendLine(u'osd_show_text "{!s}" {} {}'.format(message, duration, constants.MPLAYER_OSD_LEVEL).encode('utf-8')) self._listener.sendLine(u'{} "{!s}" {} {}'.format(self.OSD_QUERY, message, duration, constants.MPLAYER_OSD_LEVEL).encode('utf-8'))
def setSpeed(self, value): def setSpeed(self, value):
self._setProperty('speed', "{:.2f}".format(value)) self._setProperty('speed', "{:.2f}".format(value))
@ -89,7 +92,7 @@ class MplayerPlayer(BasePlayer):
def setPosition(self, value): def setPosition(self, value):
self._position = value self._position = value
self._setProperty('time_pos', "{}".format(value)) self._setProperty(self.POSITION_QUERY, "{}".format(value))
def setPaused(self, value): def setPaused(self, value):
if self._paused <> value: if self._paused <> value:
@ -108,7 +111,7 @@ class MplayerPlayer(BasePlayer):
self._getProperty('pause') self._getProperty('pause')
def _getPosition(self): def _getPosition(self):
self._getProperty('time_pos') self._getProperty(self.POSITION_QUERY)
def _quoteArg(self, arg): def _quoteArg(self, arg):
arg = arg.replace('\\', '\\\\') arg = arg.replace('\\', '\\\\')
@ -121,8 +124,7 @@ class MplayerPlayer(BasePlayer):
if not match: if not match:
return return
name, value = match.group(1).lower(), match.group(2) name, value = match.group(1).lower(), match.group(2)
if(name == self.POSITION_QUERY):
if(name == "time_pos"):
self._position = float(value) self._position = float(value)
self._positionAsk.set() self._positionAsk.set()
elif(name == "pause"): elif(name == "pause"):

19
syncplay/players/mpv.py
View File

@ -4,26 +4,35 @@ import os
class MpvPlayer(MplayerPlayer): class MpvPlayer(MplayerPlayer):
SLAVE_ARGS = constants.MPV_SLAVE_ARGS SLAVE_ARGS = constants.MPV_SLAVE_ARGS
POSITION_QUERY = 'time-pos'
OSD_QUERY = 'show_text'
def _setProperty(self, property_, value):
self._listener.sendLine("no-osd set {} {}".format(property_, value))
def setPaused(self, value):
if self._paused <> value:
self._listener.sendLine('cycle pause')
@staticmethod @staticmethod
def run(client, playerPath, filePath, args): def run(client, playerPath, filePath, args):
return MpvPlayer(client, MpvPlayer.getExpandedPath(playerPath), filePath, args) return MpvPlayer(client, MpvPlayer.getExpandedPath(playerPath), filePath, args)
@staticmethod @staticmethod
def getDefaultPlayerPathsList(): def getDefaultPlayerPathsList():
l = [] l = []
for path in constants.MPV_PATHS: for path in constants.MPV_PATHS:
p = MpvPlayer.getExpandedPath(path) p = MpvPlayer.getExpandedPath(path)
if p: if p:
l.append(p) l.append(p)
return l return l
@staticmethod @staticmethod
def isValidPlayerPath(path): def isValidPlayerPath(path):
if("mpv" in path and MpvPlayer.getExpandedPath(path)): if("mpv" in path and MpvPlayer.getExpandedPath(path)):
return True return True
return False return False
@staticmethod @staticmethod
def getExpandedPath(playerPath): def getExpandedPath(playerPath):
if not os.path.isfile(playerPath): if not os.path.isfile(playerPath):