anna/emmental
anna
/
emmental
1
0
Fork 0
Code Issues 11 Pull Requests Projects 1 Releases 12 Wiki Activity

audio: Remove the Player get_state() function 

We can just check the playing property from the BasePlayer instead

Signed-off-by: Anna Schumaker <Anna@NoWheyCreamery.com>
This commit is contained in:
Anna Schumaker 2021-09-06 21:05:49 -04:00
parent 8e509345bf
commit f55377cc69
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
audio/player.py
View File

@ -25,12 +25,6 @@ class Player(bass.BassPlayer):
if self.track:
self.track.add_to_playlist("Previous")
def get_state(self):
(ret, state, pending) = self.playbin.get_state(Gst.CLOCK_TIME_NONE)
if ret == Gst.StateChangeReturn.SUCCESS:
return state
return ret
def load_track(self, track):
self.uri = None
self.emit("track-changed", self.track, track)

15
audio/test_player.py
View File

@ -57,8 +57,8 @@ class TestPlayer(unittest.TestCase):
self.assertEqual(play.get_property("uri"), test_uri)
self.assertEqual(play.track, self.track)
self.assertEqual(settings.get_int("audio.trackid"), self.track.trackid)
self.assertEqual(play.get_state(), Gst.State.READY)
self.assertEqual(self.changed, (None, self.track) )
self.assertFalse(play.playing)
tagdb.tags.User["Previous"].tracks.clear()
play2 = player.Player()
@ -70,24 +70,21 @@ class TestPlayer(unittest.TestCase):
play.load_track(self.track)
self.assertEqual(play.track, self.track)
self.assertEqual(play.get_state(), Gst.State.READY)
play.pause()
self.assertEqual(play.get_state(), Gst.State.PAUSED)
self.assertFalse(play.playing)
play.play()
self.assertEqual(play.get_state(), Gst.State.PLAYING)
self.assertTrue(play.playing)
play.playpause()
self.assertEqual(play.get_state(), Gst.State.PAUSED)
self.assertFalse(play.playing)
play.playpause()
self.assertEqual(play.get_state(), Gst.State.PLAYING)
self.assertTrue(play.playing)
play.pause()
self.assertEqual(play.get_state(), Gst.State.PAUSED)
while main_context.iteration(may_block=False): pass
self.assertFalse(play.playing)
def test_player_next_previous(self):
play = player.Player()