From 1a52b7f30335ec3b67b1fc23c4a4aeefff308a20 Mon Sep 17 00:00:00 2001 From: Tomasz Fluxid Kowalczyk Date: Sun, 29 Jan 2012 21:03:18 +0100 Subject: [PATCH] (Uriziel) Fix controlling MPC --- syncplay/players/mpc.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/syncplay/players/mpc.py b/syncplay/players/mpc.py index 0459d19..dda52d7 100644 --- a/syncplay/players/mpc.py +++ b/syncplay/players/mpc.py @@ -20,16 +20,16 @@ class MPCHCPlayer(object): manager.player = self def send_set_paused(self, value): - self.set_property('pause', value) + self.set_property('Paused', value) def send_get_paused(self): - self.get_property('pause') + self.get_property('Paused') def send_set_position(self, value): - self.set_property('time_pos', '%d'%(value*1000)) + self.set_property('Position', '%d'%(value*1000)) def send_get_position(self): - self.get_property('time_pos') + self.get_property('Position') def send_set_speed(self, value): pass @@ -39,8 +39,8 @@ class MPCHCPlayer(object): def set_property(self, name, value): requestData = { - 'paused': lambda value: 'wm_command=888&null=0' if value else 'wm_command=887&null=0', - 'time_pos': lambda value: "wm_command=-1&position="+ '%d.%d.%d.%d' % ((int(value)/3600000), (int(value)/60000)%60, (int(value)/1000)%60, int(value)%1000) + 'Paused': lambda value: 'wm_command=888&null=0' if value else 'wm_command=887&null=0', + 'Position': lambda value: "wm_command=-1&position="+ '%d.%d.%d.%d' % ((int(value)/3600000), (int(value)/60000)%60, (int(value)/1000)%60, int(value)%1000) }[name](value) body = StringBodyProducer(requestData) @@ -57,9 +57,9 @@ class MPCHCPlayer(object): def cbRequest(status, headers, body): m = RE_MPC_STATUS.match(body) fileName, playerStatus, currentTime = m.group(1), m.group(2), m.group(3) - if(propertyName == "paused"): + if(propertyName == "Paused"): self.manager.update_player_paused(True if playerStatus=="Paused" else False) - if(propertyName == "time_pos"): + if(propertyName == "Position"): self.manager.update_player_position(float(currentTime)/1000.0) request.addCallback(handle_response(cbRequest))