5.6.2.0 Beta

docs/Changelog.md

@@ -1,10 +1,19 @@
 
+5.6.2.0 Beta (2022-03-05)
+
+- Fix script-opts files being ignored, removed options are:
+  script-opts = osc-scalewindowed=1.5,osc-hidetimeout=2000,console-scale=1.5
+- Update MediaInfo to version 21.9.0.0 and
+  write version and date in About dialog.
+- Provide setup options in command palette to ensure backward
+  compatibility with previous input.conf definitions.
+
 5.6.1.0 Beta (2022-03-05)
 
 - Various conf editor improvements. (hooke007)
 - Custom conf folder location feature removed.
 - Inno Setup replaced with Microsoft Store setup.
-- Fix script-opts files being ingnored.
+- Fix script-opts files being ignored.
 - Showing the recent list in the command palette,
   the top item gets auto selected.
   https://github.com/stax76/mpv.net/issues/328#issuecomment-1057296054
@@ -17,8 +26,8 @@
 - The usability of the menu structure was improved.
 - Audio and subtitle tracks and various other features
   are now available in the command palette.
-- Single character input in the command palette searches exclusivly
-  key bindings much like the search field of the input editor.
+- Single character input in the command palette searches exclusively
+  key bindings, much like the search field of the input editor.
 - Various default key bindings improved.
 - New protocol registrations, so far supported are: ytdl, rtsp, srt, srtp
 - libmpv zhongfly 2022-02-27

docs/Manual.md

@@ -44,31 +44,20 @@ the terminal and adds a modern Windows GUI on top of it.
 Download
 --------
 
-[Changelog](Changelog.md)
+1. [Stable via Microsoft Store](https://www.microsoft.com/store/productId/9N64SQZTB3LM)
 
-
-### Stable
-
-1. [Microsoft Store](https://www.microsoft.com/store/productId/9N64SQZTB3LM)
-
-2. [Portable](../../../releases)
+2. [Stable and beta via GitHub download](../../../releases)
 
 3. `winget install mpv.net`
 
-
-### Beta
-
-[OneDrive](https://1drv.ms/u/s!ArwKS_ZUR01g1ldoLA90tX9DzKTj?e=xITXbC)
-
-[DropBox](https://www.dropbox.com/sh/t54p9igdwvllbpl/AADKyWpaFnIhdyosxyP5d3_xa?dl=0)
-
+[Changelog](Changelog.md)
 
 Installation
 ------------
 
 mpv.net requires the .NET Framework 4.8 and Windows 7 or higher and a modern graphics card.
 
-For internet streaming youtube-dl or yt-dlp must be downloaded and installed manually.
+For internet streaming yt-dlp must be downloaded and installed manually.
 
 #### File Associations
 
@@ -91,7 +80,7 @@ the files are opened in mpv.net in random order, this works with maximum 15 file
 Support
 -------
 
-Before making a support request, please try a newer [beta version](#beta) first.
+Before making a support request, please try a newer beta version first.
 
 Bugs and feature requests can be made on the github [issue tracker](../../../issues),
 feel free to use for anything mpv.net related, usage questions are welcome.

src/Misc/App.cs

@@ -131,7 +131,7 @@ namespace mpvnet
 
         public static string Version => "Copyright (C) 2000-2022 mpv.net/mpv/mplayer\n" +
             $"mpv.net {Application.ProductVersion} ({File.GetLastWriteTime(Application.ExecutablePath).ToShortDateString()})\n" +
-            $"{Core.GetPropertyString("mpv-version")} ({File.GetLastWriteTime(Folder.Startup + "mpv-2.dll").ToShortDateString()})\nffmpeg {Core.GetPropertyString("ffmpeg-version")}\nGPL v2 License";
+            $"{Core.GetPropertyString("mpv-version")} ({File.GetLastWriteTime(Folder.Startup + "mpv-2.dll").ToShortDateString()})\nffmpeg {Core.GetPropertyString("ffmpeg-version")}\nMediaInfo {FileVersionInfo.GetVersionInfo(Path.Combine(Application.StartupPath, "MediaInfo.dll")).FileVersion} ({File.GetLastWriteTime(Path.Combine(Application.StartupPath , "MediaInfo.dll")).ToShortDateString()})\nGPL v2 License";
 
         public static void ShowException(object obj)
         {

src/Misc/Commands.cs

@@ -26,7 +26,7 @@ namespace mpvnet
             {
                 case "add-files-to-playlist": OpenFiles("append"); break; // deprecated 2019
                 case "cycle-audio": CycleAudio(); break;
-                case "execute-mpv-command": Msg.ShowError("Command was removed, reset input.conf."); break; // deprecated 2020
+                case "execute-mpv-command": Msg.ShowError("The command was removed, please reset input.conf by deleting it, in the new menu use the on screen console."); break; // deprecated 2020
                 case "load-audio": LoadAudio(); break;
                 case "load-sub": LoadSubtitle(); break;
                 case "open-conf-folder": ProcessHelp.ShellExecute(Core.ConfigFolder); break;
@@ -58,6 +58,7 @@ namespace mpvnet
                 case "show-properties": ShowProperties(); break;
                 case "show-protocols": ShowStrings(mpvHelp.GetProtocols().Split("\r\n".ToCharArray(), StringSplitOptions.RemoveEmptyEntries)); break;
                 case "show-recent": ShowRecent(); break;
+                case "show-setup-dialog": ShowSetupDialog(); break;  // deprecated 2022
                 case "show-subtitle-tracks": ShowSubtitleTracks(); break;
                 case "show-text": ShowText(args[0], Convert.ToInt32(args[1]), Convert.ToInt32(args[2])); break;
                 case "window-scale": WindowScale(float.Parse(args[0], CultureInfo.InvariantCulture)); break;
@@ -624,5 +625,19 @@ namespace mpvnet
             MainForm.Instance.ShowCommandPalette();
             CommandPalette.Instance.SelectFirst();
         });
+
+        public static void ShowSetupDialog() => App.InvokeOnMainThread(() =>
+        {
+            (string, string)[] pairs = {
+                ("Register video file associations", "script-message mpv.net reg-file-assoc video"),
+                ("Register audio file associations", "script-message mpv.net reg-file-assoc audio"),
+                ("Register image file associations", "script-message mpv.net reg-file-assoc image"),
+                ("Unregister file associations",     "script-message mpv.net reg-file-assoc unreg") };
+
+            var list = pairs.Select(i => new CommandPaletteItem(i.Item1, () => Core.Command(i.Item2)));
+            CommandPalette.Instance.SetItems(list);
+            MainForm.Instance.ShowCommandPalette();
+            CommandPalette.Instance.SelectFirst();
+        });
     }
 }

src/Misc/CorePlayer.cs

@@ -125,7 +125,6 @@ namespace mpvnet
                 SetPropertyString("msg-level", "osd/libass=fatal");
             }
 
-            SetPropertyString("script-opts", "osc-scalewindowed=1.5,osc-hidetimeout=2000,console-scale=1.5");
             SetPropertyString("watch-later-options", "mute");
             SetPropertyString("screenshot-directory", "~~desktop/");
             SetPropertyString("osd-playing-msg", "${filename}");

src/Misc/Misc.cs

@@ -233,6 +233,14 @@ namespace mpvnet
 
     public class CommandPaletteItem
     {
+        public CommandPaletteItem() {}
+
+        public CommandPaletteItem(string text, Action action)
+        {
+            Text = text;
+            Action = action;
+        }
+
         public string Text { get; set; } = "";
         public string SecondaryText { get; set; } = "";
         public Action Action { get; set; }

src/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.6.1.0")]
-[assembly: AssemblyFileVersion("5.6.1.0")]
+[assembly: AssemblyVersion("5.6.2.0")]
+[assembly: AssemblyFileVersion("5.6.2.0")]

src/Resources/input.conf.txt

@@ -71,6 +71,7 @@ _           ignore                 #menu: Video > -
 s           async screenshot       #menu: Video > Take Screenshot
 d           cycle deinterlace      #menu: Video > Toggle Deinterlace
 a           cycle-values video-aspect 16:9 4:3 2.35:1 -1 #menu: Video > Cycle Aspect Ratio
+Ctrl+r      cycle-values video-rotate 90 180 270 0       #menu: Video > Rotate Video
 
 KP7         script-message mpv.net cycle-audio #menu: Audio > Cycle/Next
 _           ignore                 #menu: Audio > -
@@ -119,7 +120,6 @@ b       cycle border                                #menu: View > Toggle Border
 Ctrl+t  cycle ontop                                 #menu: View > Toggle On Top 
 t       script-binding stats/display-stats-toggle   #menu: View > Toggle Statistics
 Del     script-binding osc/visibility               #menu: View > Toggle OSC Visibility
-Ctrl+r  cycle-values video-rotate 90 180 270 0      #menu: View > Rotate Video
 i       script-message mpv.net show-info            #menu: View > Show File/Stream Info
 p       show-progress                               #menu: View > Show Progress
 Ctrl+p  script-message mpv.net show-profiles        #menu: View > Show Profiles