Use playback.current_source for checking if a playlist is being played

src/app/components/details/album_header.rs

@@ -127,10 +127,13 @@ impl AlbumHeaderWidget {
  gettext("Play")
  };
  let tooltip_text = Some(translated_tooltip.as_str());
- let playback_control = imp::AlbumHeaderWidget::from_obj(self);
 
- playback_control.play_button.set_icon_name(playback_icon);
- playback_control.play_button.set_tooltip_text(tooltip_text);
+ self.imp()
+ .play_button
+ .set_icon_name(playback_icon);
+ self.imp()
+ .play_button.
+ set_tooltip_text(tooltip_text);
  }
 
  pub fn set_artwork(&self, art: &gdk_pixbuf::Pixbuf) {

src/app/components/details/details_model.rs

@@ -197,27 +197,20 @@ impl PlaylistModel for DetailsModel {
  self.state().playback.current_song_id()
  }
 
- fn playlist_song_ids(&self) -> Option<Vec<String>> {
- if let Some(album) = self.get_album_description() {
- let playlist_ids = album
- .songs
- .songs
- .iter()
- .map(|song| song.id.clone())
- .collect::<Vec<_>>();
- return Some(playlist_ids);
- }
- None
- }
-
  fn playlist_is_playing(&self) -> bool {
- let current_song_id = self.state().playback.current_song_id();
- if current_song_id.is_none() || self.playlist_song_ids().is_none() {
- return false;
+ if let Some(source) = self.state().playback.current_source() {
+ if let Some(uri) = source.spotify_uri() {
+ if let Some(album) = self.get_album_description() {
+ return uri == format!("spotify:album:{}", album.id);
+ } else {
+ false
+ }
+ } else {
+ false
+ }
+ } else {
+ false
  }
- self.playlist_song_ids()
- .unwrap()
- .contains(&current_song_id.unwrap())
  }
 
  fn play_song_at(&self, pos: usize, id: &str) {

src/app/components/playlist/playlist.rs

@@ -16,10 +16,6 @@ pub trait PlaylistModel {
 
  fn current_song_id(&self) -> Option<String>;
 
- fn playlist_song_ids(&self) -> Option<Vec<String>> {
- None
- }
-
  fn playlist_is_playing(&self) -> bool {
  false
  }