From 53266f9b3d7e63f2b98fa479c688b37a3298c189 Mon Sep 17 00:00:00 2001 From: Uriziel Date: Wed, 12 Jun 2013 00:08:05 +0200 Subject: [PATCH] Added openFile(filePath) method for players. --- syncplay/players/basePlayer.py | 7 +++++++ syncplay/players/mpc.py | 5 ++++- syncplay/players/mplayer.py | 5 +++++ syncplay/players/vlc.py | 3 +++ 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/syncplay/players/basePlayer.py b/syncplay/players/basePlayer.py index c26dc6b..7546281 100644 --- a/syncplay/players/basePlayer.py +++ b/syncplay/players/basePlayer.py @@ -46,6 +46,13 @@ class BasePlayer(object): def setSpeed(self, value): raise NotImplementedError() + ''' + @type filePath: string + ''' + def openFile(self, filePath): + raise NotImplementedError() + + ''' @return: list of strings ''' diff --git a/syncplay/players/mpc.py b/syncplay/players/mpc.py index 991b07c..5944080 100644 --- a/syncplay/players/mpc.py +++ b/syncplay/players/mpc.py @@ -383,7 +383,10 @@ class MPCHCAPIPlayer(BasePlayer): if(self.__mpcVersion[0:3] >= ['1', '6', '5']): self.speedSupported = True if(filePath): - self._mpcApi.openFile(filePath) + self.openFile(filePath) + + def openFile(self, filePath): + self._mpcApi.openFile(filePath) def displayMessage(self, message, duration = (constants.OSD_DURATION*1000)): self._mpcApi.sendOsd(message, constants.MPC_OSD_POSITION, duration) diff --git a/syncplay/players/mplayer.py b/syncplay/players/mplayer.py index ae8efbe..e8ae8fa 100644 --- a/syncplay/players/mplayer.py +++ b/syncplay/players/mplayer.py @@ -82,6 +82,11 @@ class MplayerPlayer(BasePlayer): def setSpeed(self, value): self._setProperty('speed', "{:.2f}".format(value)) + def openFile(self, filePath): + pass + #Notification about new file opened must be added first. + #self._setProperty('loadfile', "{}".format(filePath)) + def setPosition(self, value): self._position = value self._setProperty('time_pos', "{}".format(value)) diff --git a/syncplay/players/vlc.py b/syncplay/players/vlc.py index 92b32da..50de725 100644 --- a/syncplay/players/vlc.py +++ b/syncplay/players/vlc.py @@ -95,6 +95,9 @@ class VlcPlayer(BasePlayer): self._paused = value self._listener.sendLine('set-playstate: {}'.format("paused" if value else "playing")) + def openFile(self, filePath): + self._listener.sendLine('load-file: {}'.format(filePath)) + def _getFileInfo(self): self._listener.sendLine("get-duration") self._listener.sendLine("get-filepath")