X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=videoplayer%2Fsrc%2Fmain.rs;h=d60f4395b1217f59a7c08053a86c51b2535d592c;hb=1e14f1e2ef1b1eb1994908d7fe839e5e2893b799;hp=6becffd09bd7e897b3b40de86a10895a4d3797b8;hpb=8a51f59b47c832f38c260322d0115ef70d660bad;p=nihav-player.git

diff --git a/videoplayer/src/main.rs b/videoplayer/src/main.rs
index 6becffd..d60f439 100644
--- a/videoplayer/src/main.rs
+++ b/videoplayer/src/main.rs
@@ -13,7 +13,7 @@ use std::sync::atomic::{AtomicU8, Ordering};
 
 use sdl2::event::{Event, WindowEvent};
 use sdl2::keyboard::{Keycode, Mod};
-use sdl2::mouse::MouseButton;
+use sdl2::mouse::{MouseButton, MouseWheelDirection};
 use sdl2::render::{Canvas, Texture, TextureCreator};
 use sdl2::pixels::PixelFormatEnum;
 use sdl2::video::{Window, WindowContext};
@@ -332,7 +332,7 @@ impl Player {
         let vsystem = sdl_context.video().expect("video subsystem init failure");
         let asystem = sdl_context.audio().expect("audio subsystem init failure");
         vsystem.disable_screen_saver();
-        let acontrol = AudioControl::new(None, None, &asystem);
+        let acontrol = AudioControl::new(None, None, false, &asystem);
         let vcontrol = VideoControl::new(None, 0, 0, 0, 0);
         Self {
             sdl_context, asystem, vsystem,
@@ -473,8 +473,15 @@ impl Player {
                 canvas.copy(disp_queue.get_last_texture(&self.osd), None, None).expect("blitting failure");
                 canvas.present();
             }
-            if let Event::MouseButtonDown {mouse_btn: MouseButton::Right, ..} = event {
-                self.toggle_pause();
+            if let Event::MouseButtonDown {mouse_btn, ..} = event {
+                match mouse_btn {
+                    MouseButton::Right => self.toggle_pause(),
+                    MouseButton::Middle => self.osd.toggle(),
+                    _ => {},
+                };
+            }
+            if let Event::MouseWheel {direction: MouseWheelDirection::Normal, x: 0, y, ..} = event {
+                self.seek(10, y > 0, dmx, disp_queue)?;
             }
             if let Event::KeyDown {keycode: Some(keycode), keymod, ..} = event {
                 match keycode {
@@ -483,7 +490,7 @@ impl Player {
                         println!();
                         return Ok(true);
                     },
-                    Keycode::Q if matches!(keymod, Mod::RSHIFTMOD | Mod::LSHIFTMOD) => {
+                    Keycode::Q if keymod.contains(Mod::RSHIFTMOD) || keymod.contains(Mod::LSHIFTMOD) => {
                         self.end = true;
                         println!();
                         return Ok(true);
@@ -592,6 +599,7 @@ impl Player {
         let mut tb_num = 0;
         let mut tb_den = 0;
         let mut ainfo: Option<NAAudioInfo> = None;
+        let mut sbr_hack = false;
 
         let mut video_dec: Option<DecoderStuff> = None;
         let mut audio_dec: Option<DecoderStuff> = None;
@@ -673,6 +681,11 @@ impl Player {
                         let mut dec = (decfunc)();
                         let mut dsupp = Box::new(NADecoderSupport::new());
                         ainfo = info.get_properties().get_audio_info();
+                        if let (true, Some(ref ai)) = (info.get_name() == "aac", ainfo) {
+                            if ai.sample_rate < 32000 {
+                                sbr_hack = true;
+                            }
+                        }
                         if dec.init(&mut dsupp, info).is_err() {
                             println!("failed to initialise audio decoder");
                             return;
@@ -702,7 +715,7 @@ impl Player {
         let mut new_vcontrol = VideoControl::new(video_dec, width, height, tb_num, tb_den);
         std::mem::swap(&mut self.vcontrol, &mut new_vcontrol);
 
-        let mut new_acontrol = AudioControl::new(audio_dec, ainfo, &self.asystem);
+        let mut new_acontrol = AudioControl::new(audio_dec, ainfo, sbr_hack, &self.asystem);
         std::mem::swap(&mut self.acontrol, &mut new_acontrol);
 
         if self.mute {