[gnome-music/wip/mschraal/core: 195/208] coremodel: Properly pass a CoreSong

[Marinus Schraal <mschraal src gnome org>]

commit 90c9e948722819eedb35cb848d93f6709b019960
Author: Marinus Schraal <mschraal gnome org>
Date:   Tue Jul 2 16:30:18 2019 +0200

    coremodel: Properly pass a CoreSong
    
    It was passing a Grl.Media instead for album and artist playlist type.

 gnomemusic/coremodel.py                  | 6 ++++--
 gnomemusic/widgets/albumwidget.py        | 3 ++-
 gnomemusic/widgets/artistalbumswidget.py | 3 ++-
 3 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/gnomemusic/coremodel.py b/gnomemusic/coremodel.py
index ffdb4273..f611d485 100644
--- a/gnomemusic/coremodel.py
+++ b/gnomemusic/coremodel.py
@@ -134,7 +134,8 @@ class CoreModel(GObject.GObject):
                             "state", model_song, "state",
                             GObject.BindingFlags.SYNC_CREATE)
 
-                        if song.props.media.get_id() == coresong.get_id():
+                        song_id = coresong.props.media.get_id()
+                        if song.props.media.get_id() == song_id:
                             song.props.state = SongWidget.State.PLAYING
 
                 self.emit("playlist-loaded")
@@ -153,7 +154,8 @@ class CoreModel(GObject.GObject):
                                 "state", model_song, "state",
                                 GObject.BindingFlags.SYNC_CREATE)
 
-                            if song.props.media.get_id() == coresong.get_id():
+                            song_id = coresong.props.media.get_id()
+                            if song.props.media.get_id() == song_id:
                                 song.props.state = SongWidget.State.PLAYING
 
                 self.emit("playlist-loaded")
diff --git a/gnomemusic/widgets/albumwidget.py b/gnomemusic/widgets/albumwidget.py
index 24305671..f1a62b6d 100644
--- a/gnomemusic/widgets/albumwidget.py
+++ b/gnomemusic/widgets/albumwidget.py
@@ -162,7 +162,8 @@ class AlbumWidget(Gtk.EventBox):
 
         signal_id = coremodel.connect("playlist-loaded", _on_playlist_loaded)
         coremodel.set_playlist_model(
-            PlayerPlaylist.Type.ALBUM, song_widget._media, self._album_model)
+            PlayerPlaylist.Type.ALBUM, song_widget.props.coresong,
+            self._album_model)
 
         return True
 
diff --git a/gnomemusic/widgets/artistalbumswidget.py b/gnomemusic/widgets/artistalbumswidget.py
index 23d37a03..de163f29 100644
--- a/gnomemusic/widgets/artistalbumswidget.py
+++ b/gnomemusic/widgets/artistalbumswidget.py
@@ -112,7 +112,8 @@ class ArtistAlbumsWidget(Gtk.Box):
 
         signal_id = coremodel.connect("playlist-loaded", _on_playlist_loaded)
         coremodel.set_playlist_model(
-            PlayerPlaylist.Type.ARTIST, song_widget._media, self._model)
+            PlayerPlaylist.Type.ARTIST, song_widget.props.coresong,
+            self._model)
 
     def _add_album(self, corealbum):
         widget = ArtistAlbumWidget(