[gnome-music/wip/mschraal/player-factor-out-gstreamer: 49/56] player: Treemodel shorthands



commit 735b1cdfd1b66de1c0f63a4b47556cf6520fda6a
Author: Marinus Schraal <mschraal gnome org>
Date:   Fri Feb 9 17:58:08 2018 +0100

    player: Treemodel shorthands

 gnomemusic/player.py | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/gnomemusic/player.py b/gnomemusic/player.py
index 59af4ab..2cd05fc 100644
--- a/gnomemusic/player.py
+++ b/gnomemusic/player.py
@@ -169,8 +169,8 @@ class Player(GObject.GObject):
     def _on_glib_idle(self):
         self.current_track = self._next_track
         if self.current_track and self.current_track.valid():
-            self.current_track_uri = self.playlist.get_value(
-                self.playlist.get_iter(self.current_track.get_path()), 5).get_url()
+            iter_ = self.playlist.get_iter(self.current_track.get_path())
+            self.current_track_uri = self.playlist[iter_][5].get_url()
         self.play()
 
     @log
@@ -402,8 +402,8 @@ class Player(GObject.GObject):
             return
 
         iter_ = self.playlist.get_iter(self._next_track.get_path())
-        status = self.playlist.get_value(iter_, self.discovery_status_field)
-        next_song = self.playlist.get_value(iter_, self.playlist_field)
+        status = self.playlist[iter_][self.discovery_status_field]
+        next_song = self.playlist[iter_][self.playlist_field]
         url_ = self.playlist[iter_][5].get_url()
 
         # Skip remote songs discovery
@@ -434,8 +434,8 @@ class Player(GObject.GObject):
                 current_track = self.playlist.get_path(self.playlist.get_iter_first())
                 if current_track:
                     self.current_track = Gtk.TreeRowReference.new(self.playlist, current_track)
-                    self.current_track_uri = self.playlist.get_value(
-                        self.playlist.get_iter(self.current_track.get_path()), 5).get_url()
+                    iter_ = self.playlist.get_iter(self.current_track.get_path())
+                    self.current_track_uri = self.playlist.get_value[iter_][5].get_url()
                 else:
                     self.current_track = None
                 self.load(self.get_current_media())
@@ -501,8 +501,8 @@ class Player(GObject.GObject):
         self.current_track = self._next_track
 
         if self.current_track and self.current_track.valid():
-            self.current_track_uri = self.playlist.get_value(
-                self.playlist.get_iter(self.current_track.get_path()), 5).get_url()
+            iter_ = self.playlist.get_iter(self.current_track.get_path()
+            self.current_track_uri = self.playlist[iter_][5].get_url()
             self.play()
 
     @log
@@ -523,8 +523,8 @@ class Player(GObject.GObject):
 
         self.current_track = self._get_previous_track()
         if self.current_track and self.current_track.valid():
-            self.current_track_uri = self.playlist.get_value(
-                self.playlist.get_iter(self.current_track.get_path()), 5).get_url()
+            iter_ = self.playlist.get_iter(self.current_track.get_path()
+            self.current_track_uri = self.playlist.get_value[iter_][5].get_url()
             self.play()
 
     @log
@@ -551,8 +551,8 @@ class Player(GObject.GObject):
         self.playlist_id = id
         self.current_track = Gtk.TreeRowReference.new(model, model.get_path(iter))
         if self.current_track and self.current_track.valid():
-            self.current_track_uri = self.playlist.get_value(
-                self.playlist.get_iter(self.current_track.get_path()), 5).get_url()
+            iter_ = self.playlist.get_iter(self.current_track.get_path()
+            self.current_track_uri = self.playlist.get_value[iter_][5].get_url()
         self.playlist_field = field
         self.discovery_status_field = discovery_status_field
 
@@ -867,10 +867,10 @@ class Player(GObject.GObject):
     def get_current_media(self):
         if not self.current_track or not self.current_track.valid():
             return None
-        current_track = self.playlist.get_iter(self.current_track.get_path())
-        if self.playlist.get_value(current_track, self.discovery_status_field) == DiscoveryStatus.FAILED:
+        iter_ = self.playlist.get_iter(self.current_track.get_path())
+        if self.playlist[iter_][self.discovery_status_field] == DiscoveryStatus.FAILED:
             return None
-        return self.playlist.get_value(current_track, self.playlist_field)
+        return self.playlist[iter_][self.playlist_field]
 
 
 class SelectionToolbar():


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