andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

'shuffle' should be 'random' in our backend

Browse Source
This commit is contained in:
Stein Magnus Jodal 2011-06-21 23:19:57 +03:00
parent 3259a11c8d
commit 190faf745a
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mopidy/frontends/mpris.py
View File

@ -397,16 +397,16 @@ class MprisObject(dbus.service.Object):
self.Pause()
def get_Shuffle(self):
return self.backend.playback.shuffle.get()
return self.backend.playback.random.get()
def set_Shuffle(self, value):
if not self.get_CanControl():
logger.debug(u'Setting %s.Shuffle not allowed', PLAYER_IFACE)
return # TODO Raise error
if value:
self.backend.playback.shuffle = True
self.backend.playback.random = True
else:
self.backend.playback.shuffle = False
self.backend.playback.random = False
def get_Metadata(self):
current_cp_track = self.backend.playback.current_cp_track.get()

28
tests/frontends/mpris/player_interface_test.py
View File

@ -104,33 +104,33 @@ class PlayerInterfaceTest(unittest.TestCase):
self.mpris.Set(mpris.PLAYER_IFACE, 'Rate', 0)
self.assertEquals(self.backend.playback.state.get(), PAUSED)
def test_get_shuffle_returns_true_if_shuffle_is_active(self):
self.backend.playback.shuffle = True
def test_get_shuffle_returns_true_if_random_is_active(self):
self.backend.playback.random = True
result = self.mpris.Get(mpris.PLAYER_IFACE, 'Shuffle')
self.assertTrue(result)
def test_get_shuffle_returns_false_if_shuffle_is_inactive(self):
self.backend.playback.shuffle = False
def test_get_shuffle_returns_false_if_random_is_inactive(self):
self.backend.playback.random = False
result = self.mpris.Get(mpris.PLAYER_IFACE, 'Shuffle')
self.assertFalse(result)
def test_set_shuffle_is_ignored_if_can_control_is_false(self):
self.mpris.get_CanControl = lambda *_: False
self.backend.playback.shuffle = False
self.backend.playback.random = False
result = self.mpris.Set(mpris.PLAYER_IFACE, 'Shuffle', True)
self.assertFalse(self.backend.playback.shuffle.get())
self.assertFalse(self.backend.playback.random.get())
def test_set_shuffle_to_true_activates_shuffle_mode(self):
self.backend.playback.shuffle = False
self.assertFalse(self.backend.playback.shuffle.get())
def test_set_shuffle_to_true_activates_random_mode(self):
self.backend.playback.random = False
self.assertFalse(self.backend.playback.random.get())
result = self.mpris.Set(mpris.PLAYER_IFACE, 'Shuffle', True)
self.assertTrue(self.backend.playback.shuffle.get())
self.assertTrue(self.backend.playback.random.get())
def test_set_shuffle_to_false_deactivates_shuffle_mode(self):
self.backend.playback.shuffle = True
self.assertTrue(self.backend.playback.shuffle.get())
def test_set_shuffle_to_false_deactivates_random_mode(self):
self.backend.playback.random = True
self.assertTrue(self.backend.playback.random.get())
result = self.mpris.Set(mpris.PLAYER_IFACE, 'Shuffle', False)
self.assertFalse(self.backend.playback.shuffle.get())
self.assertFalse(self.backend.playback.random.get())
def test_get_metadata_has_trackid_even_when_no_current_track(self):
result = self.mpris.Get(mpris.PLAYER_IFACE, 'Metadata')