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

Adapt mplayer/mpv protocols to Python 3.x

Browse Source
This commit is contained in:
Alberto Sottile 2018-04-25 15:42:19 +02:00
parent dd2b0dfc74
commit 111976faf9
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
syncplay/players/mplayer.py
View File

@ -345,6 +345,7 @@ class MplayerPlayer(BasePlayer):
def run(self): def run(self):
line = self.__process.stdout.readline() line = self.__process.stdout.readline()
line = line.decode('utf-8')
if "MPlayer 1" in line: if "MPlayer 1" in line:
self.__playerController.notMplayer2() self.__playerController.notMplayer2()
else: else:
@ -352,6 +353,7 @@ class MplayerPlayer(BasePlayer):
self.__playerController.lineReceived(line) self.__playerController.lineReceived(line)
while self.__process.poll() is None: while self.__process.poll() is None:
line = self.__process.stdout.readline() line = self.__process.stdout.readline()
line = line.decode('utf-8')
line = line.rstrip("\r\n") line = line.rstrip("\r\n")
self.__playerController.lineReceived(line) self.__playerController.lineReceived(line)
self.__playerController.drop() self.__playerController.drop()
@ -442,6 +444,7 @@ class MplayerPlayer(BasePlayer):
#line = line.decode('utf8') #line = line.decode('utf8')
line = line + "\n" line = line + "\n"
self.__playerController._client.ui.showDebugMessage("player >> {}".format(line)) self.__playerController._client.ui.showDebugMessage("player >> {}".format(line))
line = line.encode('utf-8')
self.__process.stdin.write(line) self.__process.stdin.write(line)
except IOError: except IOError:
pass pass

2
syncplay/players/mpv.py
View File

@ -15,7 +15,7 @@ class MpvPlayer(MplayerPlayer):
@staticmethod @staticmethod
def run(client, playerPath, filePath, args): def run(client, playerPath, filePath, args):
try: try:
ver = MpvPlayer.RE_VERSION.search(subprocess.check_output([playerPath, '--version'])) ver = MpvPlayer.RE_VERSION.search(subprocess.check_output([playerPath, '--version']).decode('utf-8'))
except: except:
ver = None ver = None
constants.MPV_NEW_VERSION = ver is None or int(ver.group(1)) > 0 or int(ver.group(2)) >= 6 constants.MPV_NEW_VERSION = ver is None or int(ver.group(1)) > 0 or int(ver.group(2)) >= 6