use NAPacketiser::attach_stream() where appropriate

[nihav-player.git] / videoplayer / src / main.rs

diff --git a/videoplayer/src/main.rs b/videoplayer/src/main.rs
index cabb925fb5e0ecd1dbcd6d7ecfcf8a7cc72b8d58..82fb56ffeca8c8aafcdcf4489d019a2ef069625a 100644 (file)
--- a/videoplayer/src/main.rs
+++ b/videoplayer/src/main.rs
@@ -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);