From 1bdea763973dd6fb274a3af5605758d3912fe9a1 Mon Sep 17 00:00:00 2001 From: Et0h Date: Mon, 16 Feb 2015 23:07:45 +0000 Subject: [PATCH] Future-proof mpv _getProperty --- syncplay/players/mplayer.py | 2 +- syncplay/players/mpv.py | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/syncplay/players/mplayer.py b/syncplay/players/mplayer.py index 2f70057..7449504 100644 --- a/syncplay/players/mplayer.py +++ b/syncplay/players/mplayer.py @@ -149,7 +149,7 @@ class MplayerPlayer(BasePlayer): def lineReceived(self, line): if line: self._client.ui.showDebugMessage("player << {}".format(line)) - if "Failed to get value of property" in line: + if "Failed to get value of property" in line or "=(unavailable)" in line: if "filename" in line: self._getFilename() elif "length" in line: diff --git a/syncplay/players/mpv.py b/syncplay/players/mpv.py index 99ce1db..3a64936 100644 --- a/syncplay/players/mpv.py +++ b/syncplay/players/mpv.py @@ -101,6 +101,14 @@ class OldMpvPlayer(MpvPlayer): class NewMpvPlayer(OldMpvPlayer): lastResetTime = None + def _getProperty(self, property_): + floatProperties = ['length','time-pos'] + if property_ in floatProperties: + propertyID = u"={}".format(property_) + else: + propertyID = property_ + self._listener.sendLine(u"print_text ""ANS_{}=${{{}}}""".format(property_, propertyID)) + def _storePosition(self, value): if self._recentlyReset(): self._position = 0