X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=videoplayer%2Fsrc%2Fmain.rs;h=25ddcabe245f7141ac0dced820b9f9a99e808984;hb=HEAD;hp=cabb925fb5e0ecd1dbcd6d7ecfcf8a7cc72b8d58;hpb=35d0d63a755ace4c79769aeb04f94469f8b47709;p=nihav-player.git

diff --git a/videoplayer/src/main.rs b/videoplayer/src/main.rs
index cabb925..94dea16 100644
--- a/videoplayer/src/main.rs
+++ b/videoplayer/src/main.rs
@@ -320,7 +320,7 @@ fn try_display(disp_queue: &mut DispQueue, canvas: &mut Canvas<Window>, osd: &mu
 
             disp_queue.move_start();
             if !disp_queue.is_empty() {
-                return Some((disp_queue.first_ts - ctime).saturating_sub(2));
+                return Some(disp_queue.first_ts.saturating_sub(ctime).saturating_sub(2));
             } else {
                 return None;
             }
@@ -535,12 +535,13 @@ impl Player {
                         return Ok(true);
                     },
                     Keycode::Return | Keycode::KpEnter => return Ok(true),
-                    Keycode::Right      => { self.seek(10, true,  dmx, disp_queue)?; },
-                    Keycode::Left       => { self.seek(10, false, dmx, disp_queue)?; },
-                    Keycode::Up         => { self.seek(60, true,  dmx, disp_queue)?; },
-                    Keycode::Down       => { self.seek(60, false, dmx, disp_queue)?; },
-                    Keycode::PageUp     => { self.seek(600, true,  dmx, disp_queue)?; },
-                    Keycode::PageDown   => { self.seek(600, false, dmx, disp_queue)?; },
+                    Keycode::R          => { self.seek(0, true,  dmx, disp_queue)?; },
+                    Keycode::Right    | Keycode::Kp6 => { self.seek(10, true,  dmx, disp_queue)?; },
+                    Keycode::Left     | Keycode::Kp4 => { self.seek(10, false, dmx, disp_queue)?; },
+                    Keycode::Up       | Keycode::Kp8 => { self.seek(60, true,  dmx, disp_queue)?; },
+                    Keycode::Down     | Keycode::Kp2 => { self.seek(60, false, dmx, disp_queue)?; },
+                    Keycode::PageUp   | Keycode::Kp9 => { self.seek(600, true,  dmx, disp_queue)?; },
+                    Keycode::PageDown | Keycode::Kp3 => { self.seek(600, false, dmx, disp_queue)?; },
                     Keycode::Space => { self.toggle_pause(); },
                     Keycode::Plus | Keycode::KpPlus => {
                         self.volume = (self.volume + 10).min(MAX_VOLUME);
@@ -548,6 +549,12 @@ impl Player {
                             self.acontrol.set_volume(self.volume);
                         }
                     },
+                    Keycode::Equals if keymod.contains(Mod::RSHIFTMOD) || keymod.contains(Mod::LSHIFTMOD) => {
+                        self.volume = (self.volume + 10).min(MAX_VOLUME);
+                        if !self.mute {
+                            self.acontrol.set_volume(self.volume);
+                        }
+                    },
                     Keycode::Minus | Keycode::KpMinus => {
                         self.volume = self.volume.saturating_sub(10);
                         if !self.mute {