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

Fixed QT warning for VLC.

Browse Source
This commit is contained in:
daniel-123 2013-06-11 20:21:54 +02:00
parent bccc4db613
commit 6234b5d9f1
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
syncplay/players/vlc.py
View File

@ -20,6 +20,8 @@ class VlcPlayer(BasePlayer):
SLAVE_ARGS.append('--lua-config=syncplay={{port=\"{}\"}}'.format(str(vlcport))) SLAVE_ARGS.append('--lua-config=syncplay={{port=\"{}\"}}'.format(str(vlcport)))
def __init__(self, client, playerPath, filePath, args): def __init__(self, client, playerPath, filePath, args):
from twisted.internet import reactor
self.reactor = reactor
self._client = client self._client = client
self._paused = None self._paused = None
self._duration = None self._duration = None
@ -37,15 +39,15 @@ class VlcPlayer(BasePlayer):
self._listener = self.__Listener(self, playerPath, filePath, args, self._vlcready) self._listener = self.__Listener(self, playerPath, filePath, args, self._vlcready)
except ValueError: except ValueError:
self._client.ui.showMessage(getMessage("en", "vlc-failed-connection")) self._client.ui.showMessage(getMessage("en", "vlc-failed-connection"))
self._client.stop(True) self.reactor.callFromThread(self._client.stop, (True),)
return return
self._listener.setDaemon(True) self._listener.setDaemon(True)
self._listener.start() self._listener.start()
if(not self._vlcready.wait(constants.VLC_OPEN_MAX_WAIT_TIME)): if(not self._vlcready.wait(constants.VLC_OPEN_MAX_WAIT_TIME)):
self._vlcready.set() self._vlcready.set()
self._client.ui.showMessage(getMessage("en", "vlc-failed-connection")) self._client.ui.showMessage(getMessage("en", "vlc-failed-connection"))
self._client.stop(True) self.reactor.callFromThread(self._client.stop, (True),)
self._client.initPlayer(self) self.reactor.callFromThread(self._client.initPlayer, (self),)
def _fileUpdateClearEvents(self): def _fileUpdateClearEvents(self):
self._durationAsk.clear() self._durationAsk.clear()
@ -61,7 +63,8 @@ class VlcPlayer(BasePlayer):
self._fileUpdateClearEvents() self._fileUpdateClearEvents()
self._getFileInfo() self._getFileInfo()
self._fileUpdateWaitEvents() self._fileUpdateWaitEvents()
self._client.updateFile(self._filename, self._duration, self._filepath) args = (self._filename, self._duration, self._filepath)
self.reactor.callFromThread(self._client.updateFile, *args)
self.setPaused(self._client.getGlobalPaused()) self.setPaused(self._client.getGlobalPaused())
self.setPosition(self._client.getGlobalPosition()) self.setPosition(self._client.getGlobalPosition())
@ -172,7 +175,7 @@ class VlcPlayer(BasePlayer):
self._positionAsk.set() self._positionAsk.set()
self._vlcready.set() self._vlcready.set()
self._pausedAsk.set() self._pausedAsk.set()
self._client.stop(False) self.reactor.callFromThread(self._client.stop, (False),)
class __Listener(threading.Thread, asynchat.async_chat): class __Listener(threading.Thread, asynchat.async_chat):
def __init__(self, playerController, playerPath, filePath, args, vlcReady): def __init__(self, playerController, playerPath, filePath, args, vlcReady):