[gnome-music] view: Store current playlist as media object
- From: Vadim Rutkovsky <vrutkovsky src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-music] view: Store current playlist as media object
- Date: Thu, 5 Jun 2014 09:09:24 +0000 (UTC)
commit a82358e278e3efc8b8b62529f48698878e40cea3
Author: Arnel Borja <arnelborja src gnome org>
Date: Wed Jun 4 00:31:24 2014 +0800
view: Store current playlist as media object
Also updates callback for song-added-to-playlist signal to match recent
changes to Playlists.add_to_playlist method.
gnomemusic/view.py | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
---
diff --git a/gnomemusic/view.py b/gnomemusic/view.py
index bba350f..5194846 100644
--- a/gnomemusic/view.py
+++ b/gnomemusic/view.py
@@ -1004,7 +1004,10 @@ class Playlist(ViewContainer):
def _on_item_activated(self, widget, id, path):
_iter = self._model.get_iter(path)
if self._model.get_value(_iter, 8) != self.errorIconName:
- self.player.set_playlist('Playlist', self.current_playlist, self._model, _iter, 5)
+ self.player.set_playlist(
+ 'Playlist', self.current_playlist.get_id(),
+ self._model, _iter, 5
+ )
self.player.set_playing(True)
@log
@@ -1013,10 +1016,10 @@ class Playlist(ViewContainer):
playlist_name = self.playlists_model.get_value(_iter, 2)
playlist = self.playlists_model.get_value(_iter, 5)
- if self.current_playlist == playlist_name:
+ if self.current_playlist == playlist:
return
- self.current_playlist = playlist_name
+ self.current_playlist = playlist
self.name_label.set_text(playlist_name)
# if the active queue has been set by this playlist,
@@ -1123,11 +1126,14 @@ class Playlist(ViewContainer):
self.playlists_model.get_path(_iter))
@log
- def _on_song_added_to_playlist(self, playlists, name, item):
- if name == self.current_playlist:
+ def _on_song_added_to_playlist(self, playlists, playlist, item):
+ if self.current_playlist and \
+ playlist.get_id() == self.current_playlist.get_id():
self._add_item_to_model(item, self._model)
else:
- cached_playlist = self.player.running_playlist('Playlist', name)
+ cached_playlist = self.player.running_playlist(
+ 'Playlist', playlist.get_id()
+ )
if cached_playlist and cached_playlist != self._model:
self._add_item_to_model(item, cached_playlist)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]