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

VLC: Don't freeze on no-input, etc

Browse Source
This commit is contained in:
Et0h 2014-07-04 22:33:32 +01:00
parent 3a148f7686
commit b8b5d779fa
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
syncplay/players/vlc.py
View File

@ -77,7 +77,7 @@ 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 not self._filechanged:
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)
@ -114,7 +114,7 @@ class VlcPlayer(BasePlayer):
return all(ord(c) < 128 for c in s) return all(ord(c) < 128 for c in s)
def openFile(self, filePath): def openFile(self, filePath):
if self._isASCII(filePath) == True: if self._isASCII(filePath):
self._listener.sendLine('load-file: {}'.format(filePath.encode('ascii', 'ignore'))) self._listener.sendLine('load-file: {}'.format(filePath.encode('ascii', 'ignore')))
else: else:
fileURL = self.getMRL(filePath) fileURL = self.getMRL(filePath)
@ -135,16 +135,22 @@ class VlcPlayer(BasePlayer):
t = threading.Thread(target=self._onFileUpdate) t = threading.Thread(target=self._onFileUpdate)
t.setDaemon(True) t.setDaemon(True)
t.start() t.start()
elif name == "filepath" and value != "no-input": elif name == "filepath":
self._filechanged = True self._filechanged = True
if "file://" in value: if value == "no-input":
value = value.replace("file://", "") self._filepath = None
if not os.path.isfile(value): else:
value = value.lstrip("/") if "file://" in value:
self._filepath = value value = value.replace("file://", "")
if not os.path.isfile(value):
value = value.lstrip("/")
self._filepath = value
self._pathAsk.set() self._pathAsk.set()
elif name == "duration" and (value != "no-input"): elif name == "duration":
self._duration = float(value.replace(",", ".")) if value == "no-input":
self._duration = 0
else:
self._duration = float(value.replace(",", "."))
self._durationAsk.set() self._durationAsk.set()
elif name == "playstate": elif name == "playstate":
self._paused = bool(value != 'playing') if(value != "no-input" and self._filechanged == False) else self._client.getGlobalPaused() self._paused = bool(value != 'playing') if(value != "no-input" and self._filechanged == False) else self._client.getGlobalPaused()
@ -225,7 +231,7 @@ class VlcPlayer(BasePlayer):
self.__playerController = playerController self.__playerController = playerController
call = [playerPath] call = [playerPath]
if filePath: if filePath:
if self.__playerController._isASCII(filePath) == True: if self.__playerController._isASCII(filePath):
call.append(filePath) call.append(filePath)
else: else:
call.append(self.__playerController.getMRL(filePath)) call.append(self.__playerController.getMRL(filePath))
@ -255,7 +261,7 @@ class VlcPlayer(BasePlayer):
playerController.vlcIntfPath = os.path.dirname(playerPath).replace("\\", "/") + "/lua/intf/" playerController.vlcIntfPath = os.path.dirname(playerPath).replace("\\", "/") + "/lua/intf/"
playerController.vlcIntfUserPath = os.path.join(os.getenv('APPDATA', '.'), "VLC\\lua\\intf\\") playerController.vlcIntfUserPath = os.path.join(os.getenv('APPDATA', '.'), "VLC\\lua\\intf\\")
playerController.vlcModulePath = playerController.vlcIntfPath + "modules/?.luac" playerController.vlcModulePath = playerController.vlcIntfPath + "modules/?.luac"
if _usevlcintf(playerController.vlcIntfPath, playerController.vlcIntfUserPath) == True: if _usevlcintf(playerController.vlcIntfPath, playerController.vlcIntfUserPath):
playerController.SLAVE_ARGS.append('--lua-config=syncplay={{port=\"{}\"}}'.format(str(playerController.vlcport))) playerController.SLAVE_ARGS.append('--lua-config=syncplay={{port=\"{}\"}}'.format(str(playerController.vlcport)))
else: else:
if sys.platform.startswith('linux'): if sys.platform.startswith('linux'):