[gnome-music/wip/mschraal/player-factor-out-gstreamer: 4/42] PlaybackStatus -> Playback



commit ca10912ad369999a740fefabb6344beac70bc6b1
Author: Marinus Schraal <mschraal gnome org>
Date:   Fri Feb 9 08:01:04 2018 +0100

    PlaybackStatus -> Playback

 gnomemusic/gstplayer.py | 19 ++++++++++---------
 gnomemusic/player.py    | 10 +++++-----
 2 files changed, 15 insertions(+), 14 deletions(-)
---
diff --git a/gnomemusic/gstplayer.py b/gnomemusic/gstplayer.py
index 8077295..74985d0 100644
--- a/gnomemusic/gstplayer.py
+++ b/gnomemusic/gstplayer.py
@@ -22,6 +22,7 @@
 # code, but you are not obligated to do so.  If you do not wish to do so,
 # delete this exception statement from your version.
 
+from enum import IntEnum
 import logging
 
 import gi
@@ -38,7 +39,7 @@ logger = logging.getLogger(__name__)
 playlists = Playlists.get_default()
 
 
-class PlaybackStatus:
+class Playback(IntEnum):
     PLAYING = 0
     PAUSED = 1
     STOPPED = 2
@@ -297,14 +298,14 @@ class GstPlayer(GObject.GObject):
         if ok == Gst.StateChangeReturn.ASYNC:
             state = pending
         elif (ok != Gst.StateChangeReturn.SUCCESS):
-            return PlaybackStatus.STOPPED
+            return Playback.STOPPED
 
         if state == Gst.State.PLAYING:
-            return PlaybackStatus.PLAYING
+            return Playback.PLAYING
         elif state == Gst.State.PAUSED:
-            return PlaybackStatus.PAUSED
+            return Playback.PAUSED
         else:
-            return PlaybackStatus.STOPPED
+            return Playback.STOPPED
 
     @GObject.Property
     @log
@@ -313,12 +314,12 @@ class GstPlayer(GObject.GObject):
 
     @state.setter
     @log
-    def state(self, playbackstate):
-        if playbackstate == PlaybackStatus.PAUSED:
+    def state(self, state):
+        if state == Playback.PAUSED:
             self._player.set_state(Gst.State.PAUSED)
-        if playbackstate == PlaybackStatus.STOPPED:
+        if state == Playback.STOPPED:
             self._player.set_state(Gst.State.NULL)
-        if playbackstate == PlaybackStatus.PLAYING:
+        if state == Playback.PLAYING:
             self._player.set_state(Gst.State.PLAYING)
 
     @GObject.Property
diff --git a/gnomemusic/player.py b/gnomemusic/player.py
index ef1e7da..f3c627f 100644
--- a/gnomemusic/player.py
+++ b/gnomemusic/player.py
@@ -44,7 +44,7 @@ from gettext import gettext as _, ngettext
 
 from gnomemusic import log
 from gnomemusic.albumartcache import Art
-from gnomemusic.gstplayer import GstPlayer, PlaybackStatus
+from gnomemusic.gstplayer import GstPlayer, Playback
 from gnomemusic.grilo import grilo
 from gnomemusic.playlists import Playlists
 from gnomemusic.scrobbler import LastFmScrobbler
@@ -426,7 +426,7 @@ class Player(GObject.GObject):
 
         media = None
 
-        if self._player.state != PlaybackStatus.PAUSED:
+        if self._player.state != Playback.PAUSED:
             self.stop()
 
             media = self.get_current_media()
@@ -435,7 +435,7 @@ class Player(GObject.GObject):
 
             self.load(media)
 
-        self._player.state = PlaybackStatus.PLAYING
+        self._player.state = Playback.PLAYING
 
         self._update_position_callback()
         if media:
@@ -450,7 +450,7 @@ class Player(GObject.GObject):
     def pause(self):
         self._remove_timeout()
 
-        self._player.state = PlaybackStatus.PAUSED
+        self._player.state = Playback.PAUSED
         self.emit('playback-status-changed')
         self.emit('playing-changed')
 
@@ -458,7 +458,7 @@ class Player(GObject.GObject):
     def stop(self):
         self._remove_timeout()
 
-        self._player.state = PlaybackStatus.STOPPED
+        self._player.state = Playback.STOPPED
         self.emit('playing-changed')
 
     @log


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]