leyoda/cosmic-player
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve seek, add key bind for play/pause

Browse source
This commit is contained in:
Jeremy Soller 2024-10-06 11:01:01 -06:00
parent a85f4f6538
commit 52effa6efb
2 changed files with 27 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

55
src/gstreamer/mod.rs
View file

@ -71,6 +71,7 @@ pub fn main() -> Result<(), Box<dyn std::error::Error>> {
#[derive(Clone, Copy, Debug, Eq, PartialEq)] #[derive(Clone, Copy, Debug, Eq, PartialEq)]
pub enum Action { pub enum Action {
PlayPause,
SeekBackward, SeekBackward,
SeekForward, SeekForward,
} }
@ -78,6 +79,7 @@ pub enum Action {
impl Action { impl Action {
pub fn message(&self) -> Message { pub fn message(&self) -> Message {
match self { match self {
Self::PlayPause => Message::TogglePause,
Self::SeekBackward => Message::SeekRelative(-10.0), Self::SeekBackward => Message::SeekRelative(-10.0),
Self::SeekForward => Message::SeekRelative(10.0), Self::SeekForward => Message::SeekRelative(10.0),
} }
@ -115,6 +117,7 @@ pub struct App {
key_binds: HashMap<KeyBind, Action>, key_binds: HashMap<KeyBind, Action>,
video: Video, video: Video,
position: f64, position: f64,
duration: f64,
dragging: bool, dragging: bool,
audio_codes: Vec<String>, audio_codes: Vec<String>,
current_audio: i32, current_audio: i32,
@ -196,12 +199,15 @@ impl Application for App {
// Flags can be used to enable/disable subtitles // Flags can be used to enable/disable subtitles
println!("flags {:?}", pipeline.property_value("flags")); println!("flags {:?}", pipeline.property_value("flags"));
let duration = video.duration().as_secs_f64();
let mut app = App { let mut app = App {
core, core,
flags, flags,
key_binds: key_binds(), key_binds: key_binds(),
video, video,
position: 0.0, position: 0.0,
duration,
dragging: false, dragging: false,
audio_codes, audio_codes,
current_audio, current_audio,
@ -253,20 +259,19 @@ impl Application for App {
self.dragging = true; self.dragging = true;
self.position = secs; self.position = secs;
self.video.set_paused(true); self.video.set_paused(true);
self.video let duration = Duration::try_from_secs_f64(self.position).unwrap_or_default();
.seek(Duration::from_secs_f64(self.position), true) self.video.seek(duration, true).expect("seek");
.expect("seek");
} }
Message::SeekRelative(secs) => { Message::SeekRelative(secs) => {
self.video self.position = self.video.position().as_secs_f64();
.seek(Duration::from_secs_f64(self.position + secs), true) let duration =
.expect("seek"); Duration::try_from_secs_f64(self.position + secs).unwrap_or_default();
self.video.seek(duration, true).expect("seek");
} }
Message::SeekRelease => { Message::SeekRelease => {
self.dragging = false; self.dragging = false;
self.video let duration = Duration::try_from_secs_f64(self.position).unwrap_or_default();
.seek(Duration::from_secs_f64(self.position), true) self.video.seek(duration, true).expect("seek");
.expect("seek");
self.video.set_paused(false); self.video.set_paused(false);
} }
Message::EndOfStream => { Message::EndOfStream => {
@ -314,10 +319,11 @@ impl Application for App {
/// Creates a view after each update. /// Creates a view after each update.
fn view(&self) -> Element<Self::Message> { fn view(&self) -> Element<Self::Message> {
let format_time = |duration: Duration| -> String { let format_time = |time_float: f64| -> String {
let seconds = duration.as_secs() % 60; let time = time_float.floor() as i64;
let minutes = (duration.as_secs() / 60) % 60; let seconds = time % 60;
let hours = (duration.as_secs() / 60) / 60; let minutes = (time / 60) % 60;
let hours = (time / 60) / 60;
format!("{:02}:{:02}:{:02}", hours, minutes, seconds) format!("{:02}:{:02}:{:02}", hours, minutes, seconds)
}; };
widget::container( widget::container(
@ -343,24 +349,15 @@ impl Application for App {
}) })
.on_press(Message::TogglePause), .on_press(Message::TogglePause),
) )
.push(widget::text(format_time(self.position)).font(font::mono()))
.push( .push(
widget::text(format_time(Duration::from_secs_f64(self.position))) Slider::new(0.0..=self.duration, self.position, Message::Seek)
.step(0.1)
.on_release(Message::SeekRelease),
)
.push(
widget::text(format_time(self.duration - self.position))
.font(font::mono()), .font(font::mono()),
)
.push(
Slider::new(
0.0..=self.video.duration().as_secs_f64(),
self.position,
Message::Seek,
)
.step(0.1)
.on_release(Message::SeekRelease),
)
.push(
widget::text(format_time(
self.video.duration() - Duration::from_secs_f64(self.position),
))
.font(font::mono()),
), ),
), ),
) )

1
src/key_bind.rs
View file

@ -61,6 +61,7 @@ pub fn key_binds() -> HashMap<KeyBind, Action> {
} }
//TODO: key bindings //TODO: key bindings
bind!([], Key::Named(Named::Space), PlayPause);
bind!([], Key::Named(Named::ArrowLeft), SeekBackward); bind!([], Key::Named(Named::ArrowLeft), SeekBackward);
bind!([], Key::Named(Named::ArrowRight), SeekForward); bind!([], Key::Named(Named::ArrowRight), SeekForward);