RepoMirrors
/
syncplay
mirror of https://github.com/Syncplay/syncplay
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Arugments passed to mplayer are now correctly executed

This commit is contained in:
Uriziel 2012-12-19 20:09:33 +01:00
parent a547646704
commit 6531877968
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/mplayer.py
View File

@ -6,14 +6,14 @@ from syncplay.players.basePlayer import BasePlayer
class MplayerPlayer(BasePlayer): class MplayerPlayer(BasePlayer):
speedSupported = True speedSupported = True
RE_ANSWER = re.compile('^ANS_([a-zA-Z_]+)=(.+)$') RE_ANSWER = re.compile('^ANS_([a-zA-Z_]+)=(.+)$')
def __init__(self, client, playerPath, filePath): def __init__(self, client, playerPath, filePath, args):
self._client = client self._client = client
self._paused = None self._paused = None
self._duration = None self._duration = None
self._filename = None self._filename = None
self._filepath = None self._filepath = None
try: try:
self._listener = self.__Listener(self, playerPath, filePath) self._listener = self.__Listener(self, playerPath, filePath, args)
except ValueError: except ValueError:
self._client.ui.showMessage("Syncplay using mplayer requires you to provide file when starting") self._client.ui.showMessage("Syncplay using mplayer requires you to provide file when starting")
self._client.ui.showMessage("Usage example: syncplay [options] [url|path/]filename") self._client.ui.showMessage("Usage example: syncplay [options] [url|path/]filename")
@ -123,7 +123,7 @@ class MplayerPlayer(BasePlayer):
@staticmethod @staticmethod
def run(client, playerPath, filePath, args): def run(client, playerPath, filePath, args):
mplayer = MplayerPlayer(client, playerPath, filePath) mplayer = MplayerPlayer(client, playerPath, filePath, args)
return mplayer return mplayer
def drop(self): def drop(self):
@ -138,11 +138,14 @@ class MplayerPlayer(BasePlayer):
self._client.ui.showMessage(line, True, True) self._client.ui.showMessage(line, True, True)
class __Listener(threading.Thread): class __Listener(threading.Thread):
def __init__(self, playerController, playerPath, filePath): def __init__(self, playerController, playerPath, filePath, args):
self.__playerController = playerController self.__playerController = playerController
if(not filePath): if(not filePath):
raise ValueError raise ValueError
self.__process = subprocess.Popen([playerPath, filePath, '-slave', '-msglevel', 'all=1:global=4'], stdout=subprocess.PIPE, stdin=subprocess.PIPE, stderr=subprocess.PIPE) call = [playerPath, filePath, '-slave', '-msglevel', 'all=1:global=4']
if(args):
call.extend(args)
self.__process = subprocess.Popen(call, stdout=subprocess.PIPE, stdin=subprocess.PIPE, stderr=subprocess.PIPE)
threading.Thread.__init__(self, name="MPlayer Listener") threading.Thread.__init__(self, name="MPlayer Listener")
def run(self): def run(self):