From 52dded9a709e9c7925554e2716910d6dd5b25cb0 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Fri, 29 Jul 2011 23:08:36 +0200 Subject: [PATCH] Remove 'Raise error' TODOs I don't know what kind of errors I should throw, and the MPRIS spec always use 'may' and 'should' regarding the throwing of errors. --- mopidy/frontends/mpris/objects.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mopidy/frontends/mpris/objects.py b/mopidy/frontends/mpris/objects.py index 2156d37c..ec7f3eb6 100644 --- a/mopidy/frontends/mpris/objects.py +++ b/mopidy/frontends/mpris/objects.py @@ -200,7 +200,7 @@ class MprisObject(dbus.service.Object): logger.debug(u'%s.PlayPause called', PLAYER_IFACE) if not self.get_CanPause(): logger.debug(u'%s.PlayPause not allowed', PLAYER_IFACE) - return # TODO Raise error + return state = self.backend.playback.state.get() if state == PlaybackController.PLAYING: self.backend.playback.pause().get() @@ -214,7 +214,7 @@ class MprisObject(dbus.service.Object): logger.debug(u'%s.Stop called', PLAYER_IFACE) if not self.get_CanControl(): logger.debug(u'%s.Stop not allowed', PLAYER_IFACE) - return # TODO Raise error + return self.backend.playback.stop().get() @dbus.service.method(dbus_interface=PLAYER_IFACE) @@ -312,7 +312,7 @@ class MprisObject(dbus.service.Object): def set_LoopStatus(self, value): if not self.get_CanControl(): logger.debug(u'Setting %s.LoopStatus not allowed', PLAYER_IFACE) - return # TODO Raise error + return if value == 'None': self.backend.playback.repeat = False self.backend.playback.single = False @@ -328,7 +328,7 @@ class MprisObject(dbus.service.Object): # NOTE The spec does not explictly require this check, but it was # added to be consistent with all the other property setters. logger.debug(u'Setting %s.Rate not allowed', PLAYER_IFACE) - return # TODO Raise error + return if value == 0: self.Pause() @@ -338,7 +338,7 @@ class MprisObject(dbus.service.Object): def set_Shuffle(self, value): if not self.get_CanControl(): logger.debug(u'Setting %s.Shuffle not allowed', PLAYER_IFACE) - return # TODO Raise error + return if value: self.backend.playback.random = True else: @@ -381,7 +381,7 @@ class MprisObject(dbus.service.Object): def set_Volume(self, value): if not self.get_CanControl(): logger.debug(u'Setting %s.Volume not allowed', PLAYER_IFACE) - return # TODO Raise error + return if value is None: return elif value < 0: