johrpan/musicus
1
0
Fork 0
mirror of https://github.com/johrpan/musicus.git synced 2025-10-26 11:47:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Keep playing random tracks after the playlist ends

Browse source
This commit is contained in:
Elias Projahn 2022-02-08 17:44:21 +01:00
parent 42d1d047e3
commit 487fd0a048
3 changed files with 35 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
backend/src/player.rs
View file

@ -17,6 +17,7 @@ pub struct Player {
current_track: Cell<Option<usize>>,
playing: Cell<bool>,
duration: Cell<u64>,
generate_next_track_cb: RefCell<Option<Box<dyn Fn() -> Track>>>,
playlist_cbs: RefCell<Vec<Box<dyn Fn(Vec<Track>)>>>,
track_cbs: RefCell<Vec<Box<dyn Fn(usize)>>>,
duration_cbs: RefCell<Vec<Box<dyn Fn(u64)>>>,
@ -44,6 +45,7 @@ impl Player {
current_track: Cell::new(None),
playing: Cell::new(false),
duration: Cell::new(0),
generate_next_track_cb: RefCell::new(None),
playlist_cbs: RefCell::new(Vec::new()),
track_cbs: RefCell::new(Vec::new()),
duration_cbs: RefCell::new(Vec::new()),
@ -144,6 +146,10 @@ impl Player {
result
}
pub fn set_generate_next_track_cb<F: Fn() -> Track + 'static>(&self, cb: F) {
self.generate_next_track_cb.replace(Some(Box::new(cb)));
}
pub fn add_playlist_cb<F: Fn(Vec<Track>) + 'static>(&self, cb: F) {
self.playlist_cbs.borrow_mut().push(Box::new(cb));
}
@ -270,7 +276,9 @@ impl Player {
}
pub fn has_next(&self) -> bool {
if let Some(current_track) = self.current_track.get() {
if self.generate_next_track_cb.borrow().is_some() {
true
} else if let Some(current_track) = self.current_track.get() {
let playlist = self.playlist.borrow();
current_track + 1 < playlist.len()
} else {
@ -285,9 +293,11 @@ impl Player {
))
})?;
let playlist = self.playlist.borrow();
if current_track + 1 < playlist.len() {
if current_track + 1 < self.playlist.borrow().len() {
current_track += 1;
} else if let Some(cb) = &*self.generate_next_track_cb.borrow() {
let new_track = cb();
self.add_item(new_track)?;
current_track += 1;
} else {
return Err(Error::Other(String::from("No existing next track.")));