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

Improved VLC handling of unicode files

Browse Source
This commit is contained in:
Etoh 2013-07-04 16:40:00 +01:00
parent 63b4ed02ca
commit 9dc7f7ca3e
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
syncplay/players/vlc.py
View File

@ -82,7 +82,7 @@ class VlcPlayer(BasePlayer):
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)) 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))
@ -94,9 +94,15 @@ class VlcPlayer(BasePlayer):
def setPaused(self, value): def setPaused(self, value):
self._paused = value self._paused = value
self._listener.sendLine('set-playstate: {}'.format("paused" if value else "playing")) self._listener.sendLine('set-playstate: {}'.format("paused" if value else "playing"))
def _isASCII (self, s):
return all(ord(c) < 256 for c in s)
def openFile(self, filePath): def openFile(self, filePath):
self._listener.sendLine('load-file: {}'.format(filePath)) if (self._isASCII(filePath) == True):
self._listener.sendLine('load-file: {}'.format(filePath.encode('ascii','ignore'))) #TODO: Proper Unicode support
else:
self._client.ui.showErrorMessage(getMessage("en", "vlc-unicode-loadfile-error"), True)
def _getFileInfo(self): def _getFileInfo(self):
self._listener.sendLine("get-duration") self._listener.sendLine("get-duration")
@ -190,7 +196,10 @@ class VlcPlayer(BasePlayer):
self.__playerController = playerController self.__playerController = playerController
call = [playerPath] call = [playerPath]
if(filePath): if(filePath):
call.append(filePath) if (self.__playerController._isASCII(filePath) == True):
call.append(filePath) #TODO: Proper Unicode support
else:
playerController._client.ui.showErrorMessage(getMessage("en", "vlc-unicode-loadfile-error"), True)
call.extend(playerController.SLAVE_ARGS) call.extend(playerController.SLAVE_ARGS)
if(args): if(args):
call.extend(args) call.extend(args)