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

playerbar: Improve seeking

Browse source
This commit is contained in:
Elias Projahn 2023-11-07 15:57:56 +01:00
parent 0d0d8e668f
commit e4940d693b
2 changed files with 62 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

58
src/player_bar.rs
View file

@ -1,11 +1,12 @@
use crate::player::MusicusPlayer;
use gtk::{
gdk,
glib::{self, clone, subclass::Signal, Properties},
prelude::*,
subclass::prelude::*,
};
use once_cell::sync::Lazy;
use std::cell::RefCell;
use std::cell::{Cell, RefCell};
mod imp {
use super::*;
@ -17,6 +18,8 @@ mod imp {
#[property(get, construct_only)]
pub player: RefCell<MusicusPlayer>,
pub seeking: Cell<bool>,
#[template_child]
pub title_label: TemplateChild<gtk::Label>,
#[template_child]
@ -54,13 +57,22 @@ mod imp {
fn update_time(&self) {
let player = self.player.borrow();
let current_time_ms = if self.seeking.get() {
(self.slider.value() * player.duration_ms() as f64) as u64
} else {
let current_time_ms = player.position_ms();
self.slider
.set_value(current_time_ms as f64 / player.duration_ms() as f64);
current_time_ms
};
self.current_time_label
.set_label(&format_time(player.current_time_ms()));
.set_label(&format_time(current_time_ms));
self.remaining_time_label.set_label(&format_time(
player
.duration_ms()
.checked_sub(player.current_time_ms())
.checked_sub(current_time_ms)
.unwrap_or(0),
));
}
@ -120,17 +132,41 @@ mod imp {
clone!(@weak obj => move |_, _, _, _| obj.imp().update_item()),
);
player.connect_current_time_ms_notify(
clone!(@weak obj => move |_| obj.imp().update_time()),
);
player
.connect_position_ms_notify(clone!(@weak obj => move |_| obj.imp().update_time()));
player
.connect_duration_ms_notify(clone!(@weak obj => move |_| obj.imp().update_time()));
player
.bind_property("position", &self.slider.adjustment(), "value")
.sync_create()
.bidirectional()
.build();
let seeking_controller = gtk::EventControllerLegacy::new();
seeking_controller.connect_event(
clone!(@weak obj => @default-return glib::Propagation::Proceed, move |_, event| {
if let Some(event) = event.downcast_ref::<gdk::ButtonEvent>() {
let imp = obj.imp();
if event.button() == gdk::BUTTON_PRIMARY {
match event.event_type() {
gdk::EventType::ButtonPress => {
imp.seeking.set(true);
}
gdk::EventType::ButtonRelease => {
let player = obj.player();
player.seek_to((imp.slider.value() * player.duration_ms() as f64) as u64);
imp.seeking.set(false);
}
_ => (),
}
}
}
glib::Propagation::Proceed
}),
);
self.slider.add_controller(seeking_controller);
self.slider
.connect_value_changed(clone!(@weak obj => move |_| obj.imp().update_time()));
}
}