Remove play button related functions from trait and move onto specifi…

…c models

src/app/components/details/details.rs

@@ -8,8 +8,7 @@ use super::release_details::ReleaseDetailsWindow;
 use super::DetailsModel;
 
 use crate::app::components::{
- playlist::PlaylistModel, Component, EventListener, HeaderBarComponent, HeaderBarWidget,
- Playlist, ScrollingHeaderWidget,
+ Component, EventListener, HeaderBarComponent, HeaderBarWidget, Playlist, ScrollingHeaderWidget,
 };
 use crate::app::dispatch::Worker;
 use crate::app::loader::ImageLoader;
@@ -246,7 +245,7 @@ impl Details {
  }
 
  fn update_playing(&self, is_playing: bool) {
- if !self.model.playlist_is_playing() || !self.model.is_playing() {
+ if !self.model.album_is_playing() || !self.model.is_playing() {
  self.widget.set_playing(false);
  return;
  }

src/app/components/details/details_model.rs

@@ -99,9 +99,19 @@ impl DetailsModel {
  }
  }
 
+ pub fn is_playing(&self) -> bool {
+ self.state().playback.is_playing()
+ }
+
+ pub fn album_is_playing(&self) -> bool {
+ matches!(
+ self.app_model.get_state().playback.current_source(),
+ Some(SongsSource::Album(ref id)) if id == &self.id)
+ }
+
  pub fn toggle_play_album(&self) {
  if let Some(album) = self.get_album_description() {
- if !self.playlist_is_playing() {
+ if !self.album_is_playing() {
  if self.state().playback.is_shuffled() {
  self.dispatcher
  .dispatch(AppAction::PlaybackAction(PlaybackAction::ToggleShuffle));
@@ -197,16 +207,6 @@ impl PlaylistModel for DetailsModel {
  self.state().playback.current_song_id()
  }
 
- fn is_playing(&self) -> bool {
- self.state().playback.is_playing()
- }
-
- fn playlist_is_playing(&self) -> bool {
- matches!(
- self.app_model.get_state().playback.current_source(),
- Some(SongsSource::Album(ref id)) if id == &self.id)
- }
-
  fn play_song_at(&self, pos: usize, id: &str) {
  let source = SongsSource::Album(self.id.clone());
  let batch = self.song_list_model().song_batch_for(pos);

src/app/components/playlist/playlist.rs

@@ -16,16 +16,6 @@ pub trait PlaylistModel {
 
  fn current_song_id(&self) -> Option<String>;
 
- // NOTE: `is_playing` is for if there is *any* song being played
- // `playlist_is_playing` is for if the specific playlist is being played
- fn is_playing(&self) -> bool {
- false
- }
-
- fn playlist_is_playing(&self) -> bool {
- false
- }
-
  fn play_song_at(&self, pos: usize, id: &str);
 
  fn autoscroll_to_playing(&self) -> bool {

src/app/components/playlist_details/playlist_details_model.rs

@@ -27,7 +27,7 @@ impl PlaylistDetailsModel {
  }
  }
 
- fn state(&self) -> Ref<'_, AppState> {
+ pub fn state(&self) -> Ref<'_, AppState> {
  self.app_model.get_state()
  }
 
@@ -45,6 +45,16 @@ impl PlaylistDetailsModel {
  })
  }
 
+ pub fn is_playing(&self) -> bool {
+ self.state().playback.is_playing()
+ }
+
+ pub fn playlist_is_playing(&self) -> bool {
+ matches!(
+ self.app_model.get_state().playback.current_source(),
+ Some(SongsSource::Playlist(ref id)) if id == &self.id)
+ }
+
  pub fn toggle_play_playlist(&self) {
  if let Some(playlist) = self.get_playlist_info() {
  if !self.playlist_is_playing() {
@@ -157,16 +167,6 @@ impl PlaylistModel for PlaylistDetailsModel {
  self.state().playback.current_song_id()
  }
 
- fn is_playing(&self) -> bool {
- self.state().playback.is_playing()
- }
-
- fn playlist_is_playing(&self) -> bool {
- matches!(
- self.app_model.get_state().playback.current_source(),
- Some(SongsSource::Album(ref id)) if id == &self.id)
- }
-
  fn play_song_at(&self, pos: usize, id: &str) {
  let source = SongsSource::Playlist(self.id.clone());
  let batch = self.song_list_model().song_batch_for(pos);