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

player bar: Fix substraction overflow

Browse source
This commit is contained in:
Elias Projahn 2023-11-05 14:10:18 +01:00
parent 5387a51def
commit e2b59c6c11
1 changed files with 26 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/player_bar.rs
View file

@ -38,7 +38,7 @@ mod imp {
} }
impl PlayerBar { impl PlayerBar {
fn update(&self) { fn update_item(&self) {
if let Some(item) = self.player.borrow().current_item() { if let Some(item) = self.player.borrow().current_item() {
self.title_label.set_label(&item.make_title()); self.title_label.set_label(&item.make_title());
@ -50,6 +50,20 @@ mod imp {
} }
} }
} }
fn update_time(&self) {
let player = self.player.borrow();
self.current_time_label
.set_label(&format_time(player.current_time_ms()));
self.remaining_time_label.set_label(&format_time(
player
.duration_ms()
.checked_sub(player.current_time_ms())
.unwrap_or(0),
));
}
} }
#[glib::object_subclass] #[glib::object_subclass]
@ -99,22 +113,18 @@ mod imp {
let obj = self.obj().clone(); let obj = self.obj().clone();
player.connect_current_index_notify(clone!(@weak obj => move |_| obj.imp().update())); player.connect_current_index_notify(
clone!(@weak obj => move |_| obj.imp().update_item()),
);
player.playlist().connect_items_changed(
clone!(@weak obj => move |_, _, _, _| obj.imp().update_item()),
);
player.connect_current_time_ms_notify(
clone!(@weak obj => move |_| obj.imp().update_time()),
);
player player
.playlist() .connect_duration_ms_notify(clone!(@weak obj => move |_| obj.imp().update_time()));
.connect_items_changed(clone!(@weak obj => move |_, _, _, _| obj.imp().update()));
player.connect_current_time_ms_notify(clone!(@weak obj => move |player| {
let imp = obj.imp();
imp.current_time_label.set_label(&format_time(player.current_time_ms()));
imp.remaining_time_label.set_label(&format_time(player.duration_ms() - player.current_time_ms()));
}));
player.connect_duration_ms_notify(clone!(@weak obj => move |player| {
let imp = obj.imp();
imp.current_time_label.set_label(&format_time(player.current_time_ms()));
imp.remaining_time_label.set_label(&format_time(player.duration_ms() - player.current_time_ms()));
}));
player player
.bind_property("position", &self.slider.adjustment(), "value") .bind_property("position", &self.slider.adjustment(), "value")