From a82f558acf5b29c2d839a00f4057fe9825efac73 Mon Sep 17 00:00:00 2001 From: Frank Skare Date: Sun, 14 Jul 2019 12:22:50 +0200 Subject: [PATCH] - --- Changelog.md | 4 ++++ README.md | 8 ++++---- mpv.net/Properties/AssemblyInfo.cs | 4 ++-- mpv.net/WinForms/MainForm.cs | 6 +++--- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/Changelog.md b/Changelog.md index 9cbf64e..1f0580c 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,3 +1,7 @@ +### 4.7.4 + +- fix for mouse button back/forward causing freeze + ### 4.7.3 - fix cursor showing load activity on startup diff --git a/README.md b/README.md index f671fca..6221225 100644 --- a/README.md +++ b/README.md @@ -46,9 +46,9 @@ Table of contents ### Features -- Extremely high degree of mpv compatibility, almost all mpv features are available +- Very high degree of mpv compatibility, almost all mpv features are available - Great usability due to everything in the application being searchable -- Open source built with only modern tools and applications +- Open source built with modern tools and applications - Customizable context menu defined in the same file as the key bindings ([Screenshot](#context-menu-screenshot), [Defaults](https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/inputConf.txt)) - Searchable config dialog ([Screenshot](#config-editor-screenshot), [Defaults](https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/mpvConf.txt)) - Searchable input (key/mouse) binding editor ([Screenshot](#input-editor-screenshot), [Defaults](https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/inputConf.txt)) @@ -57,7 +57,7 @@ Table of contents - Modern WPF based graphical user interface with dark mode ([Screenshot](#config-editor-screenshot)) - Addon/extension API for .NET languages - Scripting API for Python, C#, Lua, JavaScript and PowerShell ([Wiki](https://github.com/stax76/mpv.net/wiki/Scripting)) -- Language agnostic JSON IPC to control the player out of process with a external programs +- Language agnostic JSON IPC to control the player with a external programs - On Screen Controler (OSC, play control buttons) - [Command Line Interface](https://mpv.io/manual/master/#options) - DXVA2 video decoding acceleration @@ -66,7 +66,7 @@ Table of contents - Extension to start mpv.net from Google Chrome ([Manual](Manual.md#chrome-extension)) - Extremely fast seek performance - Very fast startup performance, video is usally ready to play in less then a second -- Usable as video player, audio player and even image viewer with a wide range of supported formats +- Usable as video player, audio player and image viewer with a wide range of supported formats - All decoders are built-in, no external codecs have to be installed - Setup and portable download options, setup is recommended but not required - Build-in media streaming via youtube-dl diff --git a/mpv.net/Properties/AssemblyInfo.cs b/mpv.net/Properties/AssemblyInfo.cs index 4bf5e90..bed567b 100644 --- a/mpv.net/Properties/AssemblyInfo.cs +++ b/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("4.7.3.0")] -[assembly: AssemblyFileVersion("4.7.3.0")] +[assembly: AssemblyVersion("4.7.4.0")] +[assembly: AssemblyFileVersion("4.7.4.0")] diff --git a/mpv.net/WinForms/MainForm.cs b/mpv.net/WinForms/MainForm.cs index 315a34e..0463b7f 100644 --- a/mpv.net/WinForms/MainForm.cs +++ b/mpv.net/WinForms/MainForm.cs @@ -385,8 +385,6 @@ namespace mpvnet case 0x0207: // WM_MBUTTONDOWN case 0x0208: // WM_MBUTTONUP case 0x020A: // WM_MOUSEWHEEL - case 0x020C: // WM_XBUTTONUP - case 0x020B: // WM_XBUTTONDOWN case 0x0100: // WM_KEYDOWN case 0x0101: // WM_KEYUP case 0x0104: // WM_SYSKEYDOWN @@ -404,7 +402,9 @@ namespace mpvnet case 0x2a3: // WM_MOUSELEAVE mp.command_string("mouse 1 1"); // osc won't always auto hide break; - case 0x319: // WM_APPCOMMAND + case 0x319: // WM_APPCOMMAND + case 0x020C: // WM_XBUTTONUP + case 0x020B: // WM_XBUTTONDOWN if (mp.WindowHandle != IntPtr.Zero) Native.PostMessage(mp.WindowHandle, m.Msg, m.WParam, m.LParam); break;