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

Fix crash in player by caching the duration

Browse source
This commit is contained in:
Elias Projahn 2021-10-10 20:35:54 +02:00
parent ae2f01afda
commit ed8b7c0d97
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
backend/src/player.rs
View file

@ -16,6 +16,7 @@ pub struct Player {
playlist: RefCell<Vec<Track>>, playlist: RefCell<Vec<Track>>,
current_track: Cell<Option<usize>>, current_track: Cell<Option<usize>>,
playing: Cell<bool>, playing: Cell<bool>,
duration: Cell<u64>,
playlist_cbs: RefCell<Vec<Box<dyn Fn(Vec<Track>)>>>, playlist_cbs: RefCell<Vec<Box<dyn Fn(Vec<Track>)>>>,
track_cbs: RefCell<Vec<Box<dyn Fn(usize)>>>, track_cbs: RefCell<Vec<Box<dyn Fn(usize)>>>,
duration_cbs: RefCell<Vec<Box<dyn Fn(u64)>>>, duration_cbs: RefCell<Vec<Box<dyn Fn(u64)>>>,
@ -42,6 +43,7 @@ impl Player {
playlist: RefCell::new(Vec::new()), playlist: RefCell::new(Vec::new()),
current_track: Cell::new(None), current_track: Cell::new(None),
playing: Cell::new(false), playing: Cell::new(false),
duration: Cell::new(0),
playlist_cbs: RefCell::new(Vec::new()), playlist_cbs: RefCell::new(Vec::new()),
track_cbs: RefCell::new(Vec::new()), track_cbs: RefCell::new(Vec::new()),
duration_cbs: RefCell::new(Vec::new()), duration_cbs: RefCell::new(Vec::new()),
@ -95,7 +97,9 @@ impl Player {
let clone = fragile::Fragile::new(result.clone()); let clone = fragile::Fragile::new(result.clone());
player.connect_duration_changed(move |_, duration| { player.connect_duration_changed(move |_, duration| {
for cb in &*clone.get().duration_cbs.borrow() { for cb in &*clone.get().duration_cbs.borrow() {
cb(duration.unwrap().mseconds()); let duration = duration.unwrap().mseconds();
clone.get().duration.set(duration);
cb(duration);
} }
}); });
@ -353,7 +357,7 @@ impl Player {
} }
for cb in &*self.duration_cbs.borrow() { for cb in &*self.duration_cbs.borrow() {
cb(self.player.duration().unwrap().mseconds()); cb(self.duration.get());
} }
for cb in &*self.playing_cbs.borrow() { for cb in &*self.playing_cbs.borrow() {