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

Formatting vlc.py

Browse Source
This commit is contained in:
Etoh 2014-04-19 19:49:04 +01:00
parent 07684254d1
commit 89e5af0499
1 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
syncplay/players/vlc.py
View File

@ -75,16 +75,16 @@ class VlcPlayer(BasePlayer):
self._positionAsk.clear() self._positionAsk.clear()
self._pausedAsk.clear() self._pausedAsk.clear()
self._listener.sendLine(".") self._listener.sendLine(".")
if self._filechanged == False: if self._filechanged == False:
self._positionAsk.wait() self._positionAsk.wait()
self._pausedAsk.wait() self._pausedAsk.wait()
self._client.updatePlayerStatus(self._paused, self._position) self._client.updatePlayerStatus(self._paused, self._position)
else: else:
self._client.updatePlayerStatus(self._client.getGlobalPaused(), self._client.getGlobalPosition()) self._client.updatePlayerStatus(self._client.getGlobalPaused(), self._client.getGlobalPosition())
def displayMessage(self, message, duration = constants.OSD_DURATION * 1000): def displayMessage(self, message, duration=constants.OSD_DURATION * 1000):
duration /= 1000 duration /= 1000
self._listener.sendLine('display-osd: {}, {}, {}'.format('top-right', duration, message.encode('ascii','ignore'))) #TODO: Proper Unicode support self._listener.sendLine('display-osd: {}, {}, {}'.format('top-right', duration, message.encode('ascii', 'ignore'))) #TODO: Proper Unicode support
def setSpeed(self, value): def setSpeed(self, value):
self._listener.sendLine("set-rate: {:.2n}".format(value)) self._listener.sendLine("set-rate: {:.2n}".format(value))
@ -102,7 +102,7 @@ class VlcPlayer(BasePlayer):
def openFile(self, filePath): def openFile(self, filePath):
if (self._isASCII(filePath) == True): if (self._isASCII(filePath) == True):
self._listener.sendLine('load-file: {}'.format(filePath.encode('ascii','ignore'))) #TODO: Proper Unicode support self._listener.sendLine('load-file: {}'.format(filePath.encode('ascii', 'ignore'))) #TODO: Proper Unicode support
else: else:
self._client.ui.showErrorMessage(getMessage("en", "vlc-unicode-loadfile-error"), True) self._client.ui.showErrorMessage(getMessage("en", "vlc-unicode-loadfile-error"), True)
@ -144,11 +144,11 @@ class VlcPlayer(BasePlayer):
self._filenameAsk.set() self._filenameAsk.set()
elif(line.startswith("interface-version: ")): elif(line.startswith("interface-version: ")):
interface_version = line[19:24] interface_version = line[19:24]
if (int(interface_version.replace(".","")) < int(constants.VLC_INTERFACE_MIN_VERSION.replace(".",""))): if (int(interface_version.replace(".", "")) < int(constants.VLC_INTERFACE_MIN_VERSION.replace(".", ""))):
self._client.ui.showErrorMessage(getMessage("en", "vlc-interface-version-mismatch").format(str(interface_version), str(constants.VLC_INTERFACE_MIN_VERSION))) self._client.ui.showErrorMessage(getMessage("en", "vlc-interface-version-mismatch").format(str(interface_version), str(constants.VLC_INTERFACE_MIN_VERSION)))
elif (line[:16] == "VLC media player"): elif (line[:16] == "VLC media player"):
vlc_version = line[17:22] vlc_version = line[17:22]
if (int(vlc_version.replace(".","")) < int(constants.VLC_MIN_VERSION.replace(".",""))): if (int(vlc_version.replace(".", "")) < int(constants.VLC_MIN_VERSION.replace(".", ""))):
self._client.ui.showErrorMessage(getMessage("en", "vlc-version-mismatch").format(str(vlc_version), str(constants.VLC_MIN_VERSION))) self._client.ui.showErrorMessage(getMessage("en", "vlc-version-mismatch").format(str(vlc_version), str(constants.VLC_MIN_VERSION)))
self._vlcready.set() self._vlcready.set()
self._listener.sendLine("get-interface-version") self._listener.sendLine("get-interface-version")
@ -222,7 +222,7 @@ class VlcPlayer(BasePlayer):
for line in interfacefile: for line in interfacefile:
if "local connectorversion" in line: if "local connectorversion" in line:
interface_version = line[26:31] interface_version = line[26:31]
if (int(interface_version.replace(".","")) >= int(constants.VLC_INTERFACE_MIN_VERSION.replace(".",""))): if (int(interface_version.replace(".", "")) >= int(constants.VLC_INTERFACE_MIN_VERSION.replace(".", ""))):
return True return True
else: else:
playerController._client.ui.showErrorMessage(getMessage("en", "vlc-interface-oldversion-ignored")) playerController._client.ui.showErrorMessage(getMessage("en", "vlc-interface-oldversion-ignored"))
@ -234,7 +234,7 @@ class VlcPlayer(BasePlayer):
elif sys.platform.startswith('darwin'): elif sys.platform.startswith('darwin'):
playerController.vlcIntfPath = "/Applications/VLC.app/Contents/MacOS/share/lua/intf/" playerController.vlcIntfPath = "/Applications/VLC.app/Contents/MacOS/share/lua/intf/"
else: else:
playerController.vlcIntfPath = os.path.dirname(playerPath).replace("\\","/") + "/lua/intf/" # TODO: Make Mac version use /Applications/VLC.app/Contents/MacOS/share/lua/intf/ playerController.vlcIntfPath = os.path.dirname(playerPath).replace("\\", "/") + "/lua/intf/" # TODO: Make Mac version use /Applications/VLC.app/Contents/MacOS/share/lua/intf/
playerController.vlcModulePath = playerController.vlcIntfPath + "modules/?.luac" playerController.vlcModulePath = playerController.vlcIntfPath + "modules/?.luac"
if _usevlcintf(playerController.vlcIntfPath) == True: if _usevlcintf(playerController.vlcIntfPath) == True:
playerController.SLAVE_ARGS.append('--lua-config=syncplay={{port=\"{}\"}}'.format(str(playerController.vlcport))) playerController.SLAVE_ARGS.append('--lua-config=syncplay={{port=\"{}\"}}'.format(str(playerController.vlcport)))
@ -242,9 +242,9 @@ class VlcPlayer(BasePlayer):
if sys.platform.startswith('linux'): if sys.platform.startswith('linux'):
playerController.vlcDataPath = "/usr/lib/syncplay/resources" playerController.vlcDataPath = "/usr/lib/syncplay/resources"
else: else:
playerController.vlcDataPath = utils.findWorkingDir()+"\\resources" playerController.vlcDataPath = utils.findWorkingDir() + "\\resources"
playerController.SLAVE_ARGS.append('--data-path={}'.format(playerController.vlcDataPath)) playerController.SLAVE_ARGS.append('--data-path={}'.format(playerController.vlcDataPath))
playerController.SLAVE_ARGS.append('--lua-config=syncplay={{modulepath=\"{}\",port=\"{}\"}}'.format(playerController.vlcModulePath,str(playerController.vlcport))) playerController.SLAVE_ARGS.append('--lua-config=syncplay={{modulepath=\"{}\",port=\"{}\"}}'.format(playerController.vlcModulePath, str(playerController.vlcport)))
call.extend(playerController.SLAVE_ARGS) call.extend(playerController.SLAVE_ARGS)
if(args): if(args):
@ -253,7 +253,7 @@ class VlcPlayer(BasePlayer):
self._vlcready = vlcReady self._vlcready = vlcReady
self._vlcclosed = vlcClosed self._vlcclosed = vlcClosed
self.__process = subprocess.Popen(call, stderr=subprocess.PIPE) self.__process = subprocess.Popen(call, stderr=subprocess.PIPE)
for line in iter(self.__process.stderr.readline,''): for line in iter(self.__process.stderr.readline, ''):
if "[syncplay]" in line: if "[syncplay]" in line:
if "Listening on host" in line: if "Listening on host" in line:
break break