seek and speed controls

Author: nz366

Cargo.lock

@@ -30,6 +30,7 @@ rust-embed = "8"
 # Logging
 env_logger = "0.11"
 log = "0.4"
+ordered-float = "5.3.0"
 
 [dependencies.iced_video_player]
 git = "https://github.com/wash2/iced_video_player.git"

Cargo.toml

@@ -1,5 +1,6 @@
 use cosmic::iced::keyboard::Key;
 use cosmic::iced::keyboard::key::Named;
+use ordered_float::OrderedFloat;
 use std::collections::HashMap;
 
 use crate::Action;
@@ -11,13 +12,13 @@ pub fn key_binds() -> HashMap<KeyBind, Action> {
     let mut key_binds = HashMap::new();
 
     macro_rules! bind {
-        ([$($modifier:ident),* $(,)?], $key:expr, $action:ident) => {{
+        ([$($modifier:ident),* $(,)?], $key:expr, $action:ident $(($($args:expr),*))?) => {{
             key_binds.insert(
                 KeyBind {
                     modifiers: vec![$(Modifier::$modifier),*],
                     key: $key,
                 },
-                Action::$action,
+                Action::$action $(($($args),*))?,
             );
         }};
     }
@@ -32,10 +33,23 @@ pub fn key_binds() -> HashMap<KeyBind, Action> {
     bind!([], Key::Character(",".into()), PreviousFrame);
     bind!([], Key::Character("a".into()), AbRepeat);
     bind!([], Key::Character("m".into()), AudioToggle);
-    bind!([], Key::Named(Named::ArrowUp), VolumeUp);
-    bind!([], Key::Named(Named::ArrowDown), VolumeDown);
     bind!([], Key::Named(Named::PageUp), PlayPrev);
     bind!([], Key::Named(Named::PageDown), PlayNext);
+    bind!([], Key::Named(Named::ArrowUp), ChangeVolume(OrderedFloat(0.002)));
+    bind!([], Key::Named(Named::ArrowDown), ChangeVolume(OrderedFloat(-0.002)));
+    bind!([Shift], Key::Character(",".into()), ChangeSpeed(OrderedFloat(-0.25)));
+    bind!([Shift], Key::Character(".".into()), ChangeSpeed(OrderedFloat(0.25)));
+
+    bind!([], Key::Character("0".into()), Seek(OrderedFloat(0.0)));
+    bind!([], Key::Character("1".into()), Seek(OrderedFloat(0.1)));
+    bind!([], Key::Character("2".into()), Seek(OrderedFloat(0.2)));
+    bind!([], Key::Character("3".into()), Seek(OrderedFloat(0.3)));
+    bind!([], Key::Character("4".into()), Seek(OrderedFloat(0.4)));
+    bind!([], Key::Character("5".into()), Seek(OrderedFloat(0.5)));
+    bind!([], Key::Character("6".into()), Seek(OrderedFloat(0.6)));
+    bind!([], Key::Character("7".into()), Seek(OrderedFloat(0.7)));
+    bind!([], Key::Character("8".into()), Seek(OrderedFloat(0.8)));
+    bind!([], Key::Character("9".into()), Seek(OrderedFloat(0.9)));
 
     key_binds
 }

src/key_bind.rs

@@ -17,6 +17,7 @@ use cosmic::widget::{self, Slider, nav_bar, segmented_button};
 use cosmic::{Application, ApplicationExt, Element, action, cosmic_theme, executor, font, theme};
 use iced_video_player::gst::prelude::*;
 use iced_video_player::{Video, VideoPlayer, gst, gst_pbutils};
+use ordered_float::OrderedFloat;
 use std::any::TypeId;
 use std::collections::HashMap;
 use std::ffi::{CStr, CString};
@@ -188,8 +189,9 @@ pub enum Action {
     PreviousFrame,
     AbRepeat,
     AudioToggle,
-    VolumeUp,
-    VolumeDown,
+    ChangeVolume(OrderedFloat<f64>),
+    ChangeSpeed(OrderedFloat<f64>),
+    Seek(OrderedFloat<f64>),
     WindowClose,
 }
 
@@ -217,8 +219,9 @@ impl MenuAction for Action {
             Self::AbRepeat => Message::AbRepeat,
             Self::AudioToggle => Message::AudioToggle,
             Self::WindowClose => Message::WindowClose,
-            Self::VolumeUp => Message::AudioVolumeDelta(0.02),
-            Self::VolumeDown => Message::AudioVolumeDelta(-0.02),
+            Self::ChangeVolume(change) => Message::ChangeVolumeRelative(change.into_inner()),
+            Self::ChangeSpeed(change) => Message::ChangeSpeedRelative(change.into_inner()),
+            Self::Seek(value) => Message::SeekPercent(value.into_inner())
         }
     }
 }
@@ -303,7 +306,6 @@ pub enum Message {
     AudioCode(usize),
     AudioToggle,
     AudioVolume(f64),
-    AudioVolumeDelta(f64),
     TextCode(usize),
     Pause,
     Play,
@@ -313,6 +315,9 @@ pub enum Message {
     Seek(f64),
     SeekRelative(f64),
     SeekRelease,
+    ChangeVolumeRelative(f64),
+    ChangeSpeedRelative(f64),
+    SeekPercent(f64),
     PlayPrev,
     PlayNext,
     NextFrame,
@@ -1250,7 +1255,7 @@ impl Application for App {
                     self.update_controls(true);
                 }
             }
-            Message::AudioVolumeDelta(delta) => {
+            Message::ChangeVolumeRelative(delta) => {
                 if let Some(video) = &mut self.video_opt {
                     let volume = video.volume();
                     return self.update(Message::AudioVolume(volume + delta));
@@ -1365,6 +1370,14 @@ impl Application for App {
                     video.seek(target, true).expect("seek");
                 }
             }
+            Message::SeekPercent(float) => {
+                if let Some(video) = &mut self.video_opt {
+                    self.position =
+                        (self.duration * float).clamp(0.0, self.duration);
+                    let target = Duration::try_from_secs_f64(self.position).unwrap_or_default();
+                    video.seek(target, true).expect("seek");
+                }
+            }
             Message::SeekRelease => {
                 //TODO: cleanest way to close dropdowns
                 self.dropdown_opt = None;
@@ -1525,6 +1538,11 @@ impl Application for App {
                 }
                 self.update_controls(true);
             }
+            Message::ChangeSpeedRelative(float) => {
+                if let Some(video) = self.video_opt.as_ref() {
+                    return self.update(Message::PlaybackSpeed(video.speed() + float));
+                }
+            }
             Message::VideoAreaClick => {
                 if self.dropdown_opt.is_some() {
                     self.dropdown_opt = None;