[gnome-music/wip/mschraal/search-cleanups: 7/8] Mark player as internal for view classes

[Jean Felder <jfelder src gnome org>]

commit 90bba0291dc2f2ad2b36ae0da747c9a425dfbf69
Author: Marinus Schraal <mschraal gnome org>
Date:   Fri Jul 19 20:40:43 2019 +0200

    Mark player as internal for view classes

 gnomemusic/views/artistsview.py   |  4 ++--
 gnomemusic/views/playlistsview.py |  8 ++++----
 gnomemusic/views/searchview.py    |  6 +++---
 gnomemusic/views/songsview.py     | 10 +++++-----
 4 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/gnomemusic/views/artistsview.py b/gnomemusic/views/artistsview.py
index 1df3028c..cf799d27 100644
--- a/gnomemusic/views/artistsview.py
+++ b/gnomemusic/views/artistsview.py
@@ -58,7 +58,7 @@ class ArtistsView(BaseView):
         super().__init__(
             'artists', _("Artists"), application, sidebar_container)
 
-        self.player = player
+        self._player = player
         self._artists = {}
 
         self._window = application.props.window
@@ -152,7 +152,7 @@ class ArtistsView(BaseView):
             return
 
         self._artist_albums = ArtistAlbumsWidget(
-            coreartist, self.player, self._window, False)
+            coreartist, self._player, self._window, False)
         artist_albums_frame = Gtk.Frame(
             shadow_type=Gtk.ShadowType.NONE, hexpand=True)
         artist_albums_frame.add(self._artist_albums)
diff --git a/gnomemusic/views/playlistsview.py b/gnomemusic/views/playlistsview.py
index 1b2cdc2e..2d368605 100644
--- a/gnomemusic/views/playlistsview.py
+++ b/gnomemusic/views/playlistsview.py
@@ -60,7 +60,7 @@ class PlaylistsView(BaseView):
         self._coremodel = application.props.coremodel
         self._model = self._coremodel.props.playlists_sort
         self._window = application.props.window
-        self.player = player
+        self._player = player
 
         self._pl_ctrls = PlaylistControls()
 
@@ -277,7 +277,7 @@ class PlaylistsView(BaseView):
         current_playlist = selection.props.playlist
         self._coremodel.set_player_model(
             PlayerPlaylist.Type.PLAYLIST, current_playlist.props.model)
-        self.player.play(coresong)
+        self._player.play(coresong)
 
         return True
 
@@ -312,9 +312,9 @@ class PlaylistsView(BaseView):
 
         # FIXME: Should Check that the playlist is not playing
         # playlist_id = selection.playlist.props.pl_id
-        # if self.player.playing_playlist(
+        # if self._player.playing_playlist(
         #         PlayerPlaylist.Type.PLAYLIST, playlist_id):
-        #     self.player.stop()
+        #     self._player.stop()
         #     self._window.set_player_visible(False)
 
     def _on_song_widget_moved(self, target, source_position):
diff --git a/gnomemusic/views/searchview.py b/gnomemusic/views/searchview.py
index c6eb8fed..1e0b5030 100644
--- a/gnomemusic/views/searchview.py
+++ b/gnomemusic/views/searchview.py
@@ -52,7 +52,7 @@ class SearchView(BaseView):
         self._artist_model = self._coremodel.props.artists_search
         super().__init__('search', None, application)
 
-        self.player = player
+        self._player = player
 
         self.previous_view = None
 
@@ -157,7 +157,7 @@ class SearchView(BaseView):
 
             self._coremodel.set_player_model(
                 PlayerPlaylist.Type.SEARCH_RESULT, self._model)
-            self.player.play(widget.props.coresong)
+            self._player.play(widget.props.coresong)
 
         # FIXME: Need to ignore the event from the checkbox.
         # if self.props.selection_mode:
@@ -195,7 +195,7 @@ class SearchView(BaseView):
             # self.emit('song-activated', widget)
 
             self._artist_albums_widget = ArtistAlbumsWidget(
-                coreartist, self.player, self._window, False)
+                coreartist, self._player, self._window, False)
             self.add(self._artist_albums_widget)
             self._artist_albums_widget.show()
 
diff --git a/gnomemusic/views/songsview.py b/gnomemusic/views/songsview.py
index 49400c7a..a940824c 100644
--- a/gnomemusic/views/songsview.py
+++ b/gnomemusic/views/songsview.py
@@ -64,8 +64,8 @@ class SongsView(BaseView):
 
         self._playlist_model = self._coremodel.props.playlist_sort
 
-        self.player = player
-        self.player.connect('song-changed', self._update_model)
+        self._player = player
+        self._player.connect('song-changed', self._update_model)
 
         self._model = self._view.props.model
         self._view.show()
@@ -139,7 +139,7 @@ class SongsView(BaseView):
         self._star_handler.add_star_renderers(column_star)
 
     def _on_list_widget_icon_render(self, col, cell, model, itr, data):
-        current_song = self.player.props.current_song
+        current_song = self._player.props.current_song
         if current_song is None:
             return
 
@@ -183,7 +183,7 @@ class SongsView(BaseView):
         self._coremodel.set_player_model(
             PlayerPlaylist.Type.SONGS, self._view.props.model)
 
-        self.player.play(coresong)
+        self._player.play(coresong)
 
     @log
     def _on_view_clicked(self, gesture, n_press, x, y):
@@ -214,7 +214,7 @@ class SongsView(BaseView):
         if self._iter_to_clean:
             self._view.props.model[self._iter_to_clean][9] = False
 
-        index = self.player.props.position
+        index = self._player.props.position
         current_coresong = self._playlist_model[index]
         for idx, liststore in enumerate(self._view.props.model):
             if liststore[7] == current_coresong: