[gnome-music/wip/mschraal/coremodel-playlist-fixes: 5/5] coremodel: Rename set_playlist_model to set_player_model
- From: Jean Felder <jfelder src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-music/wip/mschraal/coremodel-playlist-fixes: 5/5] coremodel: Rename set_playlist_model to set_player_model
- Date: Wed, 17 Jul 2019 10:18:22 +0000 (UTC)
commit 839f13321f55b3fba9f0f4a5c3f155f353ff67c2
Author: Marinus Schraal <mschraal gnome org>
Date: Wed Jul 17 11:29:01 2019 +0200
coremodel: Rename set_playlist_model to set_player_model
To avoid confusion between regular playlists and the playlist used for the
player.
gnomemusic/coremodel.py | 2 +-
gnomemusic/views/playlistsview.py | 2 +-
gnomemusic/views/searchview.py | 2 +-
gnomemusic/views/songsview.py | 2 +-
gnomemusic/widgets/albumwidget.py | 2 +-
gnomemusic/widgets/artistalbumswidget.py | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/gnomemusic/coremodel.py b/gnomemusic/coremodel.py
index f71e1c8c..d71092d2 100644
--- a/gnomemusic/coremodel.py
+++ b/gnomemusic/coremodel.py
@@ -203,7 +203,7 @@ class CoreModel(GObject.GObject):
return albums_model_sort
- def set_playlist_model(self, playlist_type, model):
+ def set_player_model(self, playlist_type, model):
if model is self._previous_playlist_model:
for song in self._playlist_model:
if song.props.state == SongWidget.State.PLAYING:
diff --git a/gnomemusic/views/playlistsview.py b/gnomemusic/views/playlistsview.py
index bcab1ba1..72a6d6aa 100644
--- a/gnomemusic/views/playlistsview.py
+++ b/gnomemusic/views/playlistsview.py
@@ -279,7 +279,7 @@ class PlaylistsView(BaseView):
selection = self._sidebar.get_selected_row()
current_playlist = selection.props.playlist
- self._coremodel.set_playlist_model(
+ self._coremodel.set_player_model(
PlayerPlaylist.Type.PLAYLIST, current_playlist.props.model)
self.player.play(coresong)
diff --git a/gnomemusic/views/searchview.py b/gnomemusic/views/searchview.py
index 6eed8afa..2dec8844 100644
--- a/gnomemusic/views/searchview.py
+++ b/gnomemusic/views/searchview.py
@@ -159,7 +159,7 @@ class SearchView(BaseView):
and not self.props.selection_mode):
# self.emit('song-activated', widget)
- self._coremodel.set_playlist_model(
+ self._coremodel.set_player_model(
PlayerPlaylist.Type.SEARCH_RESULT, self._model)
self.player.play(widget.props.coresong)
diff --git a/gnomemusic/views/songsview.py b/gnomemusic/views/songsview.py
index 5e6b9d5f..dcba02ce 100644
--- a/gnomemusic/views/songsview.py
+++ b/gnomemusic/views/songsview.py
@@ -191,7 +191,7 @@ class SongsView(BaseView):
itr = self._view.props.model.get_iter(path)
coresong = self._view.props.model[itr][7]
- self._window._app._coremodel.set_playlist_model(
+ self._window._app._coremodel.set_player_model(
PlayerPlaylist.Type.SONGS, self._view.props.model)
self.player.play(coresong)
diff --git a/gnomemusic/widgets/albumwidget.py b/gnomemusic/widgets/albumwidget.py
index dba32f17..bae4b3ba 100644
--- a/gnomemusic/widgets/albumwidget.py
+++ b/gnomemusic/widgets/albumwidget.py
@@ -167,7 +167,7 @@ class AlbumWidget(Gtk.EventBox):
coremodel.disconnect(signal_id)
signal_id = coremodel.connect("playlist-loaded", _on_playlist_loaded)
- coremodel.set_playlist_model(
+ coremodel.set_player_model(
PlayerPlaylist.Type.ALBUM, self._album_model)
return True
diff --git a/gnomemusic/widgets/artistalbumswidget.py b/gnomemusic/widgets/artistalbumswidget.py
index 354c62e9..a9b4567e 100644
--- a/gnomemusic/widgets/artistalbumswidget.py
+++ b/gnomemusic/widgets/artistalbumswidget.py
@@ -91,7 +91,7 @@ class ArtistAlbumsWidget(Gtk.ListBox):
coremodel.disconnect(signal_id)
signal_id = coremodel.connect("playlist-loaded", _on_playlist_loaded)
- coremodel.set_playlist_model(PlayerPlaylist.Type.ARTIST, self._model)
+ coremodel.set_player_model(PlayerPlaylist.Type.ARTIST, self._model)
def _add_album(self, corealbum):
widget = ArtistAlbumWidget(
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]