5.4.4.5 Beta

Changelog.md

@@ -1,8 +1,15 @@
 
-5.4.4.5 Beta (not yet released)
+5.4.4.6 Beta (not yet released)
+============
+
+
+
+
+5.4.4.5 Beta
 ============
 
 - overhaul of the [webpage](README.md) and the [manual](Manual.md).
+- change that possibly could fix a multimedia keyboard volume issue.
 
 
 5.4.4.4 Beta

mpv.net/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("5.4.4.4")]
+[assembly: AssemblyVersion("5.4.4.5")]
-[assembly: AssemblyFileVersion("5.4.4.4")]
+[assembly: AssemblyFileVersion("5.4.4.5")]

mpv.net/WPF/LearnWindow.xaml.cs

@@ -183,6 +183,9 @@ namespace mpvnet
                 OnKeyUp(new WinForms.KeyEventArgs((WinForms.Keys)(unchecked((int)(long)m.WParam)) | ModifierKeys));
             else if (m.Msg == WM_APPCOMMAND)
             {
+                if (!mp.get_property_bool("input-media-keys"))
+                    return;
+
                 var value = (AppCommand)(m.LParam.ToInt64() >> 16 & ~0xf000);
 
                 switch (value)

mpv.net/WinForms/MainForm.cs

@@ -23,10 +23,10 @@ namespace mpvnet
         public new ContextMenuStripEx ContextMenu { get; set; }
         Point  LastCursorPosition;
         int    LastCursorChanged;
+        int    LastCycleFullscreen;
         int    TaskbarButtonCreatedMessage;
         int    ShownTickCount;
 
-        DateTime LastCycleFullscreen;
         Taskbar  Taskbar;
         List<string> RecentFiles;
         bool WasMaximized;
@@ -380,7 +380,7 @@ namespace mpvnet
 
         public void CycleFullscreen(bool enabled)
         {
-            LastCycleFullscreen = DateTime.Now;
+            LastCycleFullscreen = Environment.TickCount;
             mp.Fullscreen = enabled;
 
             if (enabled)
@@ -517,23 +517,23 @@ namespace mpvnet
                 case 0x020A: // WM_MOUSEWHEEL
                 case 0x0100: // WM_KEYDOWN
                 case 0x0101: // WM_KEYUP
+                case 0x0102: // WM_CHAR
                 case 0x0104: // WM_SYSKEYDOWN
                 case 0x0105: // WM_SYSKEYUP
+                case 0x0106: // WM_SYSCHAR
                 case 0x319:  // WM_APPCOMMAND
                     if (mp.WindowHandle != IntPtr.Zero)
-                        WinAPI.SendMessage(mp.WindowHandle, m.Msg, m.WParam, m.LParam);
+                        m.Result = WinAPI.SendMessage(mp.WindowHandle, m.Msg, m.WParam, m.LParam);
                     break;
                 case 0x0200: // WM_MOUSEMOVE
+                    if (Environment.TickCount - LastCycleFullscreen > 500)
                     {
-                        if ((DateTime.Now - LastCycleFullscreen).TotalMilliseconds > 500)
+                        Point pos = PointToClient(Cursor.Position);
-                        {
+                        mp.command($"mouse {pos.X} {pos.Y}");
-                            Point pos = PointToClient(Cursor.Position);
-                            mp.command($"mouse {pos.X} {pos.Y}");
-                        }
-
-                        if (CursorHelp.IsPosDifferent(LastCursorPosition))
-                            CursorHelp.Show();
                     }
+
+                    if (CursorHelp.IsPosDifferent(LastCursorPosition))
+                        CursorHelp.Show();
                     break;
                 case 0x2a3: // WM_MOUSELEAVE
                     //osc won't auto hide after mouse left window in borderless mode
@@ -717,7 +717,7 @@ namespace mpvnet
             if (mp.GPUAPI != "vulkan")
                 mp.VideoSizeAutoResetEvent.WaitOne(App.StartThreshold);
 
-            LastCycleFullscreen = DateTime.Now;
+            LastCycleFullscreen = Environment.TickCount;
             SetFormPosAndSize();
         }