5.2 Release

Changelog.md

@@ -1,3 +1,52 @@
+### 5.2
+
+- bug fix for single-instance not working with unicode filenames
+- bug fix for logo not shown on start
+- osd-visibility.js script was removed because the OSC uses too much memory
+- youtube-dl was updated
+- libmpv was updated to shinchiro 2019-08-04
+- in case mpv.net was started from a terminal it sets now the mpv property input-terminal to yes,
+  this means mpv.net will now receive and handle input keys from the terminal
+- certain command line properties didn't work (input-terminal, terminal, input-file,
+  config, config-dir, input-conf, load-scripts, script, scripts, player-operation-mode)
+- the about dialog shows now the mpv version and build date
+- the dialog that asks for a config folder has now a cancel option
+
+### 5.1
+
+- 'Tools > Execute mpv command' was replaced with [mpv-repl](https://github.com/rossy/mpv-repl)
+- many [wiki pages](https://github.com/stax76/mpv.net/wiki) were improved
+- the logo/icon had a very small cosmetic change
+- the help in the context menu was improved,
+  for quick access consider the command palette (F1 key)
+- config options specific to mpv.net are now available from the command line
+- the input editor no longer has known limitations, 'alt gr' and ctrl+alt are working now
+- the help in the input editor was simplified and the filter logic was improved
+- fixed issue in file associations causing mpv.net not to appear in OS default apps
+- 'Tools > Manage File Associations' was replaced by 'Tools > OS Setup',
+  it has now a feature to add and remove mpv.net to and from the Path
+  environment variable and the OS default apps settings can be opened (Win 10 only)
+- startup folder and config folder being identical was causing a critical issue
+  as mpv.net was loading extensions twice and scripts four times, now identical
+  folders are no longer permitted
+- error messages are shown when unknown scripts and extensions are found in the startup folder
+  because user scripts and extensions are supposed to be located in the config folder instead
+- changing from maximized to fullscreen did not work
+- the search field in the config editor was not always remembered
+- new setting remember-volume added, saves volume and mute on exit
+  and restores it on start.
+- it's now enforced that mpv properties on the command line and in
+  the mpv.conf config file are lowercase, if not a error is shown
+- gpu-api vulkan was not working if media files were opened via
+  command line (that included Explorer)
+- new setting minimum-aspect-ratio added, minimum aspect ratio for the window,
+  this was previously hard coded to 1.3
+- new setting auto-load-folder added, for single files automatically load
+  the entire directory into the playlist, previously this was forced,
+  now it can be disabled
+- new setting themed-menu added, follow theme color in context menu,
+  default: no. UI related settings have now a separate UI tab in the config editor
+
 ### 5.0
 
 - [changed icon design](https://github.com/stax76/mpv.net/blob/master/img/mpvnet.png)
@@ -12,13 +61,13 @@
   change is that there exist too many different terms, addons, addins,
   extensions, modules, packages etc.. mpv.net follows Google Chrome as the worlds
   most popular extendable app, Chrome uses the term Extension.
-- a thread synchronisation bug was fixed, the shutdown thread was aborted
+- a thread synchronization bug was fixed, the shutdown thread was aborted
-  if it was running more then 3 seconds, this caused the rating extension
+  if it was running more than 3 seconds, this caused the rating extension
   to fail if it was waiting for a drive to wake up
 - a new JavaScript was included to show the playlist with a smaller font size,
   the script is located at startup/scripts
 - terminal support added using mpvnet.com !
-- script engine performence and error handling was improved
+- script engine performance and error handling was improved
 - the [scripting wiki page](https://github.com/stax76/mpv.net/wiki/Scripting) was improved
 - the C# scripting host extension was converted from VB to C# because it's not
   only used for hosting but I also use it now to code and debug script code

README.md

@@ -1,5 +1,7 @@
 ![](https://raw.githubusercontent.com/stax76/mpv.net/master/img/mpvnet.png)
 
+![GitHub closed pull requests](https://img.shields.io/github/issues-pr-closed/stax76/mpv.net) ![GitHub closed issues](https://img.shields.io/github/issues-closed/stax76/mpv.net) ![GitHub All Releases](https://img.shields.io/github/downloads/stax76/mpv.net/total) ![GitHub tag (latest by date)](https://img.shields.io/github/tag-date/stax76/mpv.net) ![GitHub stars](https://img.shields.io/github/stars/stax76/mpv.net) [![PayPal donate button](https://img.shields.io/badge/paypal-donate-yellow.svg)](https://www.paypal.me/stax76)
+
 # 🎞 mpv.net
 
 mpv.net is a modern media player for Windows that works just like [mpv](https://mpv.io).
@@ -60,6 +62,8 @@ Table of contents
 - 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)
+- If started from a PowerShell terminal mpv.net will attach to the terminal and print status and debug output
+- [OSD REPL](https://github.com/rossy/mpv-repl)
 - DXVA2 video decoding acceleration
 - OpenGL based video output capable of features loved by videophiles, such as video scaling with popular high quality algorithms, color management, frame timing, interpolation, HDR, and more
 - Search feature powered by [Everything](https://www.voidtools.com) to find and play media ([Screenshot](#media-search-screenshot))
@@ -97,6 +101,12 @@ A searchable config editor as alternative to edit the mpv.conf file manually.
 
 ![](https://raw.githubusercontent.com/stax76/mpv.net/master/img/ConfEditor.png)
 
+#### Terminal and REPL Screenshot
+
+mpv.net attached to a PowerShell terminal showing the [OSD REPL](https://github.com/rossy/mpv-repl).
+
+![](https://raw.githubusercontent.com/stax76/mpv.net/master/img/Terminal.png)
+
 #### Input Editor Screenshot
 
 A searchable key and mouse binding editor.
@@ -218,39 +228,30 @@ Third party components:
 
 [Support thread in VideoHelp forum](https://forum.videohelp.com/threads/392514-mpv-net-a-extendable-media-player-for-windows)
 
-[Issue tracker to report bugs and request features](https://github.com/stax76/mpv.net/issues)
+[Issue tracker](https://github.com/stax76/mpv.net/issues), feel free to use for anything mpv.net related
 
 [frank.skare.de@gmail.com](mailto:frank.skare.de@gmail.com?Subject=mpv.net%20support)
 
 Please click on the star at the top of the page and like mpv.net at [alternativeto.net](https://alternativeto.net/software/mpv-net/).
 
-If you like you can express your appreciation for my player by sending little beer money with paypal.
+If you want to support the development of mpv.net or express your appreciation you can do so with a donation:
 
 <https://www.paypal.me/stax76>
 
 ### Links
 
-mpv manual: <https://mpv.io/manual/master/>
+- mpv.net wiki: <https://github.com/stax76/mpv.net/wiki>
-
+- mpv.net default key bindings: <https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/inputConf.txt>
-mpv wiki: <https://github.com/mpv-player/mpv/wiki>
+- mpv.net download: <https://github.com/stax76/mpv.net/releases>
-
+- mpv.net bugs and requests: <https://github.com/stax76/mpv.net/issues>
-mpv.net wiki: <https://github.com/stax76/mpv.net/wiki>
+- mpv website: <https://mpv.io/>
-
+- mpv manual: <https://mpv.io/manual/master/>
-mpv apps: <https://github.com/mpv-player/mpv/wiki/Applications-using-mpv>
+- mpv wiki: <https://github.com/mpv-player/mpv/wiki>
-
+- mpv apps: <https://github.com/mpv-player/mpv/wiki/Applications-using-mpv>
-mpv user scripts: <https://github.com/mpv-player/mpv/wiki/User-Scripts>
+- mpv user scripts: <https://github.com/mpv-player/mpv/wiki/User-Scripts>
-
+- mpv default key bindings: <https://github.com/mpv-player/mpv/blob/master/etc/input.conf>
-mpv default key bindings: <https://github.com/mpv-player/mpv/blob/master/etc/input.conf>
+- mpv download: <https://mpv.io/installation/>
-
+- mpv bugs and requests: <https://mpv.io/bug-reports/>
-mpv.net default key bindings: <https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/inputConf.txt>
-
-mpv download: <https://mpv.io/installation/>
-
-mpv.net download: <https://github.com/stax76/mpv.net/releases>
-
-mpv bugs and requests: <https://mpv.io/bug-reports/>
-
-mpv.net bugs and requests: <https://github.com/stax76/mpv.net/issues>
 
 ### Changelog
 

extensions/RatingExtension/RatingExtension.cs

@@ -1,4 +1,8 @@
-using System;
+// This extension writes a rating to the filename of rated videos when mpv.net shuts down.
+
+// The input.conf defaults contain key bindings for this extension to set ratings.
+
+using System;
 using System.ComponentModel.Composition;
 using System.Collections.Generic;
 using System.IO;

extensions/ScriptingExtension/ScriptingExtension.cs

@@ -1,14 +1,14 @@
-//'This extension implements the C# scripting feature of mpv.net which
+// This extension implements the C# scripting feature of mpv.net which
 // is based on CS-Script (https://www.cs-script.net).
 
-// Furthermore the extension is used to code and debug scripts
+// I also use this extension to code scripts in order to have full
-// because writing script code without debugger is not an option :-)
+// code completion and debugger support, once the script code is
+// finished I move it from the extension to a standalone script.
 
 using System;
 using System.ComponentModel.Composition;
 using System.Collections.Generic;
 using System.IO;
-using System.Windows.Forms;
 
 using mpvnet;
 using CSScriptLibrary;
@@ -18,7 +18,7 @@ namespace ScriptingExtension // the file name of extensions must end with 'Exten
     [Export(typeof(IExtension))]
     public class ScriptingExtension : IExtension
     {
-        Script Script;
+        //Script Script;
 
         public ScriptingExtension()
         {
@@ -28,8 +28,9 @@ namespace ScriptingExtension // the file name of extensions must end with 'Exten
             if (Directory.Exists(mp.ConfigFolder + "scripts"))
                 scriptFiles.AddRange(Directory.GetFiles(mp.ConfigFolder + "scripts", "*.cs"));
 
-            if (Directory.Exists(Application.StartupPath + "\\scripts"))
+            if (Directory.Exists(PathHelp.StartupPath + "scripts"))
-                scriptFiles.AddRange(Directory.GetFiles(Application.StartupPath + "\\scripts", "*.cs"));
+                foreach (string path in Directory.GetFiles(PathHelp.StartupPath + "scripts", "*.cs"))
+                    scriptFiles.AddRange(Directory.GetFiles(PathHelp.StartupPath + "scripts", "*.cs"));
 
             if (scriptFiles.Count == 0) return;
             CSScriptLibrary.CSScript.EvaluatorConfig.Engine = EvaluatorEngine.CodeDom;

mpv.net/Misc/App.cs

@@ -0,0 +1,124 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Windows.Forms;
+
+namespace mpvnet
+{
+    public class App
+    {
+        public static string[] VideoTypes { get; } = "264 265 asf avc avi avs flv h264 h265 hevc m2ts m2v m4v mkv mov mp4 mpeg mpg mpv mts ts vob vpy webm webm wmv y4m".Split(' ');
+        public static string[] AudioTypes { get; } = "mp3 mp2 ac3 ogg opus flac wav w64 m4a dts dtsma dtshr dtshd eac3 thd thd+ac3 mka aac mpa".Split(' ');
+        public static string[] ImageTypes { get; } = {"jpg", "bmp", "gif", "png"};
+        public static string[] SubtitleTypes { get; } = { "srt", "ass", "idx", "sup", "ttxt", "ssa", "smi" };
+        public static string[] UrlWhitelist { get; set; } = { "tube", "vimeo", "ard", "zdf" };
+
+        public static string RegPath { get; } = @"HKCU\Software\" + Application.ProductName;
+        public static string ConfPath { get; } = mp.ConfigFolder + "\\mpvnet.conf";
+        public static string DarkMode { get; set; } = "always";
+        public static string ProcessInstance { get; set; } = "single";
+        public static string DarkColor { get; set; }
+        public static string LightColor { get; set; }
+
+        public static bool RememberHeight { get; set; } = true;
+        public static bool RememberPosition { get; set; }
+        public static bool DebugMode { get; set; }
+        public static bool IsStartedFromTerminal { get; } = Environment.GetEnvironmentVariable("_started_from_console") == "yes";
+        public static bool RememberVolume { get; set; }
+        public static bool AutoLoadFolder { get; set; } = true;
+        public static bool ThemedMenu { get; set; }
+
+        public static int StartThreshold { get; set; } = 1500;
+
+        public static float MinimumAspectRatio { get; set; } = 1.3f;
+               
+        public static bool IsDarkMode {
+            get => (DarkMode == "system" && Sys.IsDarkTheme) || DarkMode == "always";
+        }
+
+        public static void Init()
+        {
+            string dummy = mp.ConfigFolder;
+            var dummy2 = mp.Conf;
+
+            foreach (var i in Conf)
+                ProcessProperty(i.Key, i.Value);
+
+            if (App.DebugMode)
+            {
+                try
+                {
+                    string filePath = mp.ConfigFolder + "\\mpvnet-debug.log";
+                    if (File.Exists(filePath)) File.Delete(filePath);
+                    Trace.Listeners.Add(new TextWriterTraceListener(filePath));
+                    Trace.AutoFlush = true;
+                    //if (App.DebugMode) Trace.WriteLine("");
+                }
+                catch (Exception e)
+                {
+                    Msg.ShowException(e);
+                }
+            }
+
+            mp.Shutdown += Shutdown;
+            mp.Initialized += Initialized;
+        }
+
+        private static void Initialized()
+        {
+            if (RememberVolume)
+            {
+                mp.set_property_int("volume", RegHelp.GetInt(App.RegPath, "Volume"));
+                mp.set_property_string("mute", RegHelp.GetString(App.RegPath, "Mute"));
+            }
+        }
+
+        private static void Shutdown()
+        {
+            if (RememberVolume)
+            {
+                RegHelp.SetObject(App.RegPath, "Volume", mp.get_property_int("volume"));
+                RegHelp.SetObject(App.RegPath, "Mute", mp.get_property_string("mute"));
+            }
+        }
+
+        static Dictionary<string, string> _Conf;
+
+        public static Dictionary<string, string> Conf {
+            get {
+                if (_Conf == null)
+                {
+                    _Conf = new Dictionary<string, string>();
+
+                    if (File.Exists(ConfPath))
+                        foreach (string i in File.ReadAllLines(ConfPath))
+                            if (i.Contains("=") && !i.StartsWith("#"))
+                                _Conf[i.Substring(0, i.IndexOf("=")).Trim()] = i.Substring(i.IndexOf("=") + 1).Trim();
+                }
+                return _Conf;
+            }
+        }
+
+        public static bool ProcessProperty(string name, string value)
+        {
+            switch (name)
+            {
+                case "remember-position": RememberPosition = value == "yes"; return true;
+                case "start-size": RememberHeight = value == "previous"; return true;
+                case "process-instance": ProcessInstance = value; return true;
+                case "dark-mode": DarkMode = value; return true;
+                case "debug-mode": DebugMode = value == "yes"; return true;
+                case "dark-color": DarkColor = value.Trim('\'', '"'); return true;
+                case "light-color": LightColor = value.Trim('\'', '"'); return true;
+                case "url-whitelist": UrlWhitelist = value.Split(' ', ',', ';'); return true;
+                case "remember-volume": RememberVolume = value == "yes"; return true;
+                case "start-threshold": StartThreshold = value.Int(); return true;
+                case "minimum-aspect-ratio": MinimumAspectRatio = value.Float(); return true;
+                case "auto-load-folder": AutoLoadFolder = value == "yes"; return true;
+                case "themed-menu": ThemedMenu = value == "yes"; return true;
+            }
+            return false;
+        }
+    }
+}

mpv.net/Misc/Command.cs

@@ -16,7 +16,7 @@ namespace mpvnet
         {
             switch (id)
             {
-                case "manage-file-associations": ManageFileAssociations(); break;
+                case "manage-file-associations": ManageFileAssociations(); break; // deprecated 2019
                 case "cycle-audio": CycleAudio(); break;
                 case "load-audio": LoadAudio(); break;
                 case "load-sub": LoadSubtitle(); break;
@@ -28,6 +28,7 @@ namespace mpvnet
                 case "show-about": ShowDialog(typeof(AboutWindow)); break;
                 case "show-conf-editor": ShowDialog(typeof(ConfWindow)); break;
                 case "show-input-editor": ShowDialog(typeof(InputWindow)); break;
+                case "show-setup-dialog": ShowDialog(typeof(SetupWindow)); break;
                 case "open-conf-folder": Process.Start(mp.ConfigFolder); break;
                 case "open-files": OpenFiles(args); break;
                 case "shell-execute": Process.Start(args[0]); break;
@@ -92,7 +93,7 @@ namespace mpvnet
                 {
                     fileSize = new FileInfo(path).Length;
 
-                    if (App.AudioTypes.Contains(Path.GetExtension(path).ToLower().TrimStart('.')))
+                    if (App.AudioTypes.Contains(path.ShortExt()))
                     {
                         using (MediaInfo mediaInfo = new MediaInfo(path))
                         {
@@ -110,13 +111,13 @@ namespace mpvnet
                             if (date != "") text += "Year: " + date + "\n";
                             if (duration != "") text += "Length: " + duration + "\n";
                             text += "Size: " + mediaInfo.GetInfo(MediaInfoStreamKind.General, "FileSize/String") + "\n";
-                            text += "Type: " + Path.GetExtension(path).ToUpper().TrimStart('.');
+                            text += "Type: " + path.ShortExt().ToUpper();
 
                             mp.commandv("show-text", text, "5000");
                             return;
                         }
                     }
-                    else if (App.ImageTypes.Contains(Path.GetExtension(path).ToLower().TrimStart('.')))
+                    else if (App.ImageTypes.Contains(path.ShortExt()))
                     {
                         using (MediaInfo mediaInfo = new MediaInfo(path))
                         {
@@ -124,7 +125,7 @@ namespace mpvnet
                                 "Width: " + mediaInfo.GetInfo(MediaInfoStreamKind.Image, "Width") + "\n" +
                                 "Height: " + mediaInfo.GetInfo(MediaInfoStreamKind.Image, "Height") + "\n" +
                                 "Size: " + mediaInfo.GetInfo(MediaInfoStreamKind.General, "FileSize/String") + "\n" +
-                                "Type: " + Path.GetExtension(path).ToUpper().TrimStart('.');
+                                "Type: " + path.ShortExt().ToUpper();
 
                             mp.commandv("show-text", text, "5000");
                             return;
@@ -137,7 +138,7 @@ namespace mpvnet
                 string videoFormat = mp.get_property_string("video-format").ToUpper();
                 string audioCodec = mp.get_property_string("audio-codec-name").ToUpper();
 
-                text = PathHelp.GetFileName(path) + "\n" +
+                text = path.FileName() + "\n" +
                     FormatTime(position.TotalMinutes) + ":" +
                     FormatTime(position.Seconds) + " / " +
                     FormatTime(duration2.TotalMinutes) + ":" +
@@ -158,7 +159,7 @@ namespace mpvnet
             }
         }
 
-        public static void ExecuteMpvCommand()
+        public static void ExecuteMpvCommand() // deprecated 2019
         {
             InvokeOnMainThread(new Action(() => {
                 string command = VB.Interaction.InputBox("Enter a mpv command to be executed.", "Execute Command", RegHelp.GetString(App.RegPath, "RecentExecutedCommand"));
@@ -230,31 +231,6 @@ namespace mpvnet
             }
         }
 
-        public static void ManageFileAssociations()
+        public static void ManageFileAssociations() => ShowDialog(typeof(SetupWindow)); // deprecated 2019
-        {
-            using (var td = new TaskDialog<string>())
-            {
-                td.MainInstruction = "Choose an option.";
-                td.MainIcon = MsgIcon.Shield;
-
-                td.AddCommandLink("Register video file extensions", "video");
-                td.AddCommandLink("Register audio file extensions", "audio");
-                td.AddCommandLink("Register image file extensions", "image");
-                td.AddCommandLink("Unregister file extensions", "unreg");
-
-                string result = td.Show();
-
-                if (!string.IsNullOrEmpty(result))
-                {
-                    using (var proc = new Process())
-                    {
-                        proc.StartInfo.FileName = System.Windows.Forms.Application.ExecutablePath;
-                        proc.StartInfo.Arguments = "--reg-file-assoc " + result;
-                        proc.StartInfo.Verb = "runas";
-                        try { proc.Start(); } catch { }
-                    }
-                }
-            }
-        }
     }
 }

mpv.net/Misc/Extension.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.ComponentModel.Composition;
 using System.ComponentModel.Composition.Hosting;
 using System.IO;
-using System.Windows.Forms;
+using System.Linq;
 
 namespace mpvnet
 {
@@ -19,14 +19,22 @@ namespace mpvnet
             try
             {
                 AggregateCatalog catalog = new AggregateCatalog();
-
+                string dir = PathHelp.StartupPath + "Extensions";
-                string dir = Application.StartupPath + "\\Extensions";
 
                 if (Directory.Exists(dir))
-                    foreach (string i in Directory.GetDirectories(dir))
+                {
-                        catalog.Catalogs.Add(new DirectoryCatalog(i, "*Extension.dll"));
+                    string[] knownExtensions = { "RatingExtension", "ScriptingExtension" };
 
-                dir = mp.ConfigFolder + "\\Extensions";
+                    foreach (string path in Directory.GetDirectories(dir))
+                    {
+                        if (knownExtensions.Contains(Path.GetFileName(path)))
+                            catalog.Catalogs.Add(new DirectoryCatalog(path, "*Extension.dll"));
+                        else
+                            Msg.ShowError("Failed to load extension", path + "\n\nOnly extensions that ship with mpv.net are allowed in <startup>\\extensions\n\nUser extensions have to use <config folder>\\extensions\n\nNever copy or install a new mpv.net version over a old mpv.net version.");
+                    }
+                }
+
+                dir = mp.ConfigFolder + "Extensions";
 
                 if (Directory.Exists(dir))
                     foreach (string i in Directory.GetDirectories(dir))

mpv.net/Misc/ExtensionMethods.cs

@@ -0,0 +1,32 @@
+using System.Globalization;
+using System.IO;
+
+public static class Extensions
+{
+    public static string FileName(this string path)
+    {
+        if (string.IsNullOrEmpty(path)) return "";
+        int index = path.LastIndexOf('\\');
+        if (index > -1) return path.Substring(index + 1);
+        index = path.LastIndexOf('/');
+        if (index > -1) return path.Substring(index + 1);
+        return path;
+    }
+
+    public static string ShortExt(this string path)
+    {
+        return Path.GetExtension(path).ToLower().TrimStart('.');
+    }
+
+    public static int Int(this string value)
+    {
+        int.TryParse(value, out int result);
+        return result;
+    }
+
+    public static float Float(this string value)
+    {
+        float.TryParse(value.Replace(",", "."), NumberStyles.Float, CultureInfo.InvariantCulture, out float result);
+        return result;
+    }
+}

mpv.net/Misc/Misc.cs

@@ -3,7 +3,6 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
-using System.Diagnostics;
 using System.Drawing;
 using System.IO;
 using System.Linq;
@@ -16,121 +15,6 @@ using Microsoft.Win32;
 
 namespace mpvnet
 {
-    public class App
-    {
-        public static string RegPath { get; } = @"HKCU\Software\" + Application.ProductName;
-        public static string ConfPath { get; } = mp.ConfigFolder + "\\mpvnet.conf";
-        public static string DarkMode { get; set; } = "always";
-        public static string ProcessInstance { get; set; } = "single";
-        public static string DarkColor { get; set; }
-        public static string LightColor { get; set; }
-
-        public static string[] VideoTypes { get; } = "264 265 asf avc avi avs flv h264 h265 hevc m2ts m2v m4v mkv mov mp4 mpeg mpg mpv mts ts vob vpy webm webm wmv y4m".Split(' ');
-        public static string[] AudioTypes { get; } = "mp3 mp2 ac3 ogg opus flac wav w64 m4a dts dtsma dtshr dtshd eac3 thd thd+ac3 mka aac mpa".Split(' ');
-        public static string[] ImageTypes { get; } = "jpg bmp gif png".Split(' ');
-        public static string[] SubtitleTypes { get; } = "srt ass idx sup ttxt ssa smi".Split(' ');
-        public static string[] UrlWhitelist { get; set; } = { "tube", "vimeo", "ard", "zdf" };
-
-        public static bool RememberHeight { get; set; } = true;
-        public static bool RememberPosition { get; set; }
-        public static bool DebugMode { get; set; }
-        public static bool IsStartedFromTerminal { get; } = Environment.GetEnvironmentVariable("_started_from_console") == "yes";
-
-        public static int StartThreshold { get; set; } = 1500;
-
-        public static bool IsDarkMode {
-            get => (DarkMode == "system" && Sys.IsDarkTheme) || DarkMode == "always";
-        }
-
-        public static void Init()
-        {
-            string dummy = mp.ConfigFolder;
-            var dummy2 = mp.Conf;
-
-            foreach (var i in Conf)
-                ProcessProperty(i.Key, i.Value);
-
-            if (App.DebugMode)
-            {
-                try
-                {
-                    string filePath = mp.ConfigFolder + "\\mpvnet-debug.log";
-                    if (File.Exists(filePath)) File.Delete(filePath);
-                    Trace.Listeners.Add(new TextWriterTraceListener(filePath));
-                    Trace.AutoFlush = true;
-                    //if (App.DebugMode) Trace.WriteLine("");
-                }
-                catch (Exception e)
-                {
-                    Msg.ShowException(e);
-                }
-            }
-        }
-
-        static Dictionary<string, string> _Conf;
-
-        public static Dictionary<string, string> Conf {
-            get {
-                if (_Conf == null)
-                {
-                    _Conf = new Dictionary<string, string>();
-
-                    if (File.Exists(ConfPath))
-                        foreach (string i in File.ReadAllLines(ConfPath))
-                            if (i.Contains("=") && !i.StartsWith("#"))
-                                _Conf[i.Substring(0, i.IndexOf("=")).Trim()] = i.Substring(i.IndexOf("=") + 1).Trim();
-                }
-                return _Conf;
-            }
-        }
-
-        public static void ProcessProperty(string name, string value)
-        {
-            switch (name)
-            {
-                case "remember-position": RememberPosition = value == "yes"; break;
-                case "start-size": RememberHeight = value == "previous"; break;
-                case "process-instance": ProcessInstance = value; break;
-                case "dark-mode": DarkMode = value; break;
-                case "debug-mode": DebugMode = value == "yes"; break;
-                case "dark-color": DarkColor = value.Trim('\'', '"'); break;
-                case "light-color": LightColor = value.Trim('\'', '"'); break;
-                case "url-whitelist":
-                    UrlWhitelist = value.Split(' ', ',', ';');
-                    break;
-                case "start-threshold":
-                    int.TryParse(value, out int result);
-                    StartThreshold = result;
-                    break;
-            }
-        }
-
-        public static void ProcessCommandLineEarly()
-        {
-            var args = Environment.GetCommandLineArgs().Skip(1);
-
-            foreach (string i in args)
-            {
-                if (i.StartsWith("--"))
-                {
-                    if (i.Contains("="))
-                    {
-                        string left = i.Substring(2, i.IndexOf("=") - 2);
-                        string right = i.Substring(left.Length + 3);
-                        mp.ProcessProperty(left, right);
-                        ProcessProperty(left, right);
-                    }
-                    else
-                    {
-                        string name = i.Substring(2);
-                        mp.ProcessProperty(name, "yes");
-                        ProcessProperty(name, "yes");
-                    }
-                }
-            }
-        }
-    }
-
     public class Sys
     {
         public static bool IsDarkTheme {
@@ -178,25 +62,23 @@ namespace mpvnet
         {
             Types = types;
 
-            RegHelp.SetObject(@"HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\" + ExeFilename, null, ExePath);
+            RegHelp.SetObject($"HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\App Paths\\{ExeFilename}", null, ExePath);
             RegHelp.SetObject($"HKCR\\Applications\\{ExeFilename}", "FriendlyAppName", "mpv.net media player");
             RegHelp.SetObject($"HKCR\\Applications\\{ExeFilename}\\shell\\open\\command", null, $"\"{ExePath}\" \"%1\"");
             RegHelp.SetObject(@"HKLM\SOFTWARE\Clients\Media\mpv.net\Capabilities", "ApplicationDescription", "mpv.net media player");
             RegHelp.SetObject(@"HKLM\SOFTWARE\Clients\Media\mpv.net\Capabilities", "ApplicationName", "mpv.net");
             RegHelp.SetObject($"HKCR\\SystemFileAssociations\\video\\OpenWithList\\{ExeFilename}", null, "");
             RegHelp.SetObject($"HKCR\\SystemFileAssociations\\audio\\OpenWithList\\{ExeFilename}", null, "");
+            RegHelp.SetObject(@"HKLM\SOFTWARE\RegisteredApplications", "mpv.net", @"SOFTWARE\Clients\Media\mpv.net\Capabilities");
 
             foreach (string ext in Types)
             {
                 RegHelp.SetObject($"HKCR\\Applications\\{ExeFilename}\\SupportedTypes", "." + ext, "");
                 RegHelp.SetObject($"HKCR\\" + "." + ext, null, ExeFilenameNoExt + "." + ext);
                 RegHelp.SetObject($"HKCR\\" + "." + ext + "\\OpenWithProgIDs", ExeFilenameNoExt + "." + ext, "");
-                if (App.VideoTypes.Contains(ext))
+                if (App.VideoTypes.Contains(ext)) RegHelp.SetObject($"HKCR\\" + "." + ext, "PerceivedType", "video");
-                    RegHelp.SetObject($"HKCR\\" + "." + ext, "PerceivedType", "video");
+                if (App.AudioTypes.Contains(ext)) RegHelp.SetObject($"HKCR\\" + "." + ext, "PerceivedType", "audio");
-                if (App.AudioTypes.Contains(ext))
+                if (App.ImageTypes.Contains(ext)) RegHelp.SetObject($"HKCR\\" + "." + ext, "PerceivedType", "image");
-                    RegHelp.SetObject($"HKCR\\" + "." + ext, "PerceivedType", "audio");
-                if (App.ImageTypes.Contains(ext))
-                    RegHelp.SetObject($"HKCR\\" + "." + ext, "PerceivedType", "image");
                 RegHelp.SetObject($"HKCR\\" + ExeFilenameNoExt + "." + ext + "\\shell\\open", null, "Play with " +  Application.ProductName);
                 RegHelp.SetObject($"HKCR\\" + ExeFilenameNoExt + "." + ext + "\\shell\\open\\command", null, $"\"{ExePath}\" \"%1\"");
                 RegHelp.SetObject(@"HKLM\SOFTWARE\Clients\Media\mpv.net\Capabilities\FileAssociations", "." + ext, ExeFilenameNoExt + "." + ext);
@@ -205,17 +87,16 @@ namespace mpvnet
 
         public static void Unregister()
         {
-            RegHelp.RemoveKey(@"HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\" + ExeFilename);
+            RegHelp.RemoveKey($"HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\App Paths\\{ExeFilename}");
             RegHelp.RemoveKey($"HKCR\\Applications\\{ExeFilename}");
-            RegHelp.RemoveKey(@"HKLM\SOFTWARE\Clients\Media\mpv.net");
+            RegHelp.RemoveKey($"HKLM\\SOFTWARE\\Clients\\Media\\mpv.net");
             RegHelp.RemoveKey($"HKCR\\SystemFileAssociations\\video\\OpenWithList\\{ExeFilename}");
             RegHelp.RemoveKey($"HKCR\\SystemFileAssociations\\audio\\OpenWithList\\{ExeFilename}");
+            RegHelp.RemoveValue(@"HKLM\SOFTWARE\RegisteredApplications", "mpv.net");
 
             foreach (string id in Registry.ClassesRoot.GetSubKeyNames())
             {
-                if (id.StartsWith(ExeFilenameNoExt + "."))
+                if (id.StartsWith(ExeFilenameNoExt + ".")) Registry.ClassesRoot.DeleteSubKeyTree(id);
-                    Registry.ClassesRoot.DeleteSubKeyTree(id);
-
                 RegHelp.RemoveValue($"HKCR\\Software\\Classes\\" + id + "\\OpenWithProgIDs", ExeFilenameNoExt + id);
                 RegHelp.RemoveValue($"HKLM\\Software\\Classes\\" + id + "\\OpenWithProgIDs", ExeFilenameNoExt + id);
             }
@@ -412,14 +293,6 @@ namespace mpvnet
 
     public class PathHelp
     {
-        public static string GetFileName(string path)
+        public static string StartupPath { get; } = Application.StartupPath + "\\";
-        {
-            if (string.IsNullOrEmpty(path)) return "";
-            int index = path.LastIndexOf('\\');
-            if (index > -1) return path.Substring(index + 1);
-            index = path.LastIndexOf('/');
-            if (index > -1) return path.Substring(index + 1);
-            return path;
-        }
     }
 }

mpv.net/Misc/Program.cs

@@ -18,6 +18,8 @@ namespace mpvnet
                 Application.EnableVisualStyles();
                 Application.SetCompatibleTextRenderingDefault(false);
 
+                if (mp.ConfigFolder == "") return;
+
                 string[] args = Environment.GetCommandLineArgs().Skip(1).ToArray();
 
                 if (args.Length == 2 && args[0] == "--reg-file-assoc")

mpv.net/Native/Native.cs

@@ -88,7 +88,7 @@ namespace mpvnet
         {
             public IntPtr dwData;
             public int cbData;
-            [MarshalAs(UnmanagedType.LPStr)]
+            [MarshalAs(UnmanagedType.LPTStr)]
             public string lpData;
         }
     }

mpv.net/Native/TaskDialog.cs

@@ -359,7 +359,7 @@ public class TaskDialog<T> : TaskDialogNative, IDisposable
     public void AddCommandLink(string text, T value)
     {
         int n = 1000 + IdValueDic.Count + 1;
-        IdValueDic[n] = value == null ? (T)(object)text : value;
+        IdValueDic[n] = value;
         IdTextDic[n] = text;
         Buttons.Add(new TaskDialogNative.TASKDIALOG_BUTTON(n, text));
         Config.dwFlags |= TaskDialogNative.TASKDIALOG_FLAGS.TDF_USE_COMMAND_LINKS;

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.0.0.0")]
+[assembly: AssemblyVersion("5.2.0.0")]
-[assembly: AssemblyFileVersion("5.0.0.0")]
+[assembly: AssemblyFileVersion("5.2.0.0")]

mpv.net/Resources/inputConf.txt

@@ -150,17 +150,25 @@
 
  F1     script-message mpv.net show-command-palette #menu: Tools > Show All Commands
  h      script-message mpv.net show-history         #menu: Tools > Show History
+ Ctrl+r script-message-to repl type ""              #menu: Tools > Show REPL
  l      ab-loop                                     #menu: Tools > Set/clear A-B loop points
  L      cycle-values loop-file "inf" "no"           #menu: Tools > Toggle infinite file looping
  Ctrl+h cycle-values hwdec "auto" "no"              #menu: Tools > Toggle Hardware Decoding
- _ script-message mpv.net execute-mpv-command       #menu: Tools > Execute mpv command...
+ _ script-message mpv.net show-setup-dialog         #menu: Tools > OS Setup...
- _ script-message mpv.net manage-file-associations  #menu: Tools > Manage File Associations...
 
- _ script-message mpv.net shell-execute https://mpv.io/manual/stable/ #menu: Help > Show mpv manual
+ _ script-message mpv.net shell-execute https://github.com/stax76/mpv.net/blob/master/Manual.md      #menu: Help > mpv.net Manual
- _ script-message mpv.net shell-execute https://github.com/mpv-player/mpv/blob/master/etc/input.conf #menu: Help > Show mpv default keys
+ _ script-message mpv.net shell-execute https://github.com/stax76/mpv.net                            #menu: Help > mpv.net GitHub
- _ script-message mpv.net shell-execute https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/inputConf.txt #menu: Help > Show mpv.net default keys
+ _ script-message mpv.net shell-execute https://github.com/stax76/mpv.net/wiki                       #menu: Help > mpv.net Wiki
- _ script-message mpv.net shell-execute https://mpv-net.github.io/mpv.net-web-site/ #menu: Help > Show mpv.net web site
+ _ script-message mpv.net shell-execute https://github.com/stax76/mpv.net#support                    #menu: Help > mpv.net Support
- _ script-message mpv.net shell-execute https://github.com/stax76/mpv.net/blob/master/Manual.md #menu: Help > Show mpv.net manual
+ _ script-message mpv.net shell-execute https://github.com/stax76/mpv.net/releases                   #menu: Help > mpv.net Download
+ _ script-message mpv.net shell-execute https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/inputConf.txt #menu: Help > mpv.net Default Key Bindings
+ _ ignore                                                                                            #menu: Help > -
+ _ script-message mpv.net shell-execute https://mpv.io/manual/stable/                                #menu: Help > mpv Manual
+ _ script-message mpv.net shell-execute https://github.com/mpv-player/mpv/wiki                       #menu: Help > mpv Wiki
+ _ script-message mpv.net shell-execute https://github.com/mpv-player/mpv/wiki/User-Scripts          #menu: Help > mpv User Scripts
+ _ script-message mpv.net shell-execute https://mpv.io/bug-reports/                                  #menu: Help > mpv Bugs and Requests
+ _ script-message mpv.net shell-execute https://mpv.io/installation/                                 #menu: Help > mpv Download
+ _ script-message mpv.net shell-execute https://github.com/mpv-player/mpv/blob/master/etc/input.conf #menu: Help > mpv Default Key Bindings
  _ ignore                                                                                            #menu: Help > -
  _ script-message mpv.net show-about                                                                 #menu: Help > About mpv.net
 

mpv.net/Resources/mpvConf.txt

@@ -1,9 +1,4 @@
-
+input-ar-delay = 500
-# manual: https://mpv.io/manual/master/
-
-# defaults: https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/mpvConf.txt
-
-input-ar-delay = 500
 input-ar-rate = 20
 volume = 50
 hwdec = yes

mpv.net/Resources/mpvConfToml.txt

@@ -23,7 +23,7 @@ options = [{ name = "no",           help = "always use software decoding" },
 name = "gpu-api"
 default = "auto"
 filter = "Video"
-help = "Controls which type of graphics APIs will be accepted."
+help = "Controls which type of graphics APIs will be accepted. Auto uses d3d11, it should only be changed in case of problems."
 options = [{ name = "auto",   help = "Use any available API" },
            { name = "opengl", help = "Allow only OpenGL (requires OpenGL 2.1+ or GLES 2.0+)" },
            { name = "vulkan", help = "Allow only Vulkan (requires a valid/working spirv-compiler)" },
@@ -244,17 +244,17 @@ help = "Specify the OSD font size. See sub-font-size for details. Default: 55"
 [[settings]]
 name = "autofit"
 filter = "Screen"
-help = "<int> Initial window height in percent. Default: 50%"
+help = "<int> Initial window height in percent. Default: 50"
 
 [[settings]]
 name = "autofit-smaller"
 filter = "Screen"
-help = "<int> Minimum window height in percent. Default: 40%"
+help = "<int> Minimum window height in percent. Default: 40"
 
 [[settings]]
 name = "autofit-larger"
 filter = "Screen"
-help = "<int> Maximum window height in percent. Default: 75%"
+help = "<int> Maximum window height in percent. Default: 75"
 
 [[settings]]
 name = "screenshot-directory"

mpv.net/Resources/mpvNetConfToml.txt

@@ -1,29 +1,9 @@
 [[settings]]
-name = "dark-mode"
-default = "always"
-filter = "General"
-help = "Enables a dark theme. (mpv.net specific setting)"
-options = [{ name = "always" },
-           { name = "system" , help = "Available on Windows 10 or higher" },
-		   { name = "never" }]
-
-[[settings]]
-name = "dark-color"
-type = "color"
-filter = "General"
-help = "Theme color used in dark-mode. Leave empty to use OS theme. (mpv.net specific setting)"
-
-[[settings]]
-name = "light-color"
-type = "color"
-filter = "General"
-help = "Theme color used when dark-mode is disabled. Leave empty to use OS theme. (mpv.net specific setting)"
-
-[[settings]]
 name = "url-whitelist"
 filter = "General"
 type = "string"
-help = "Whitelist setting to monitor the clipboard for URLs to play. (mpv.net specific setting)\n\nDefault: tube vimeo ard zdf"
+help = "Whitelist setting to monitor the clipboard for URLs to play. (mpv.net specific setting)\n\nDefault: tube vimeo ard zdf\n\nHow to start mpv.net directly from Google Chrome is described in the manual:"
+url = "https://github.com/stax76/mpv.net/blob/master/Manual.md#chrome-extension"
 
 [[settings]]
 name = "process-instance"
@@ -55,10 +35,60 @@ name = "start-threshold"
 filter = "Screen"
 help = "Threshold in milliseconds to wait for libmpv returning the video resolution before the window is shown, otherwise default dimensions are used as defined by autofit and start-size. (mpv.net specific setting) Default: 1500"
 
+[[settings]]
+name = "minimum-aspect-ratio"
+filter = "Screen"
+help = "<float> Minimum aspect ratio for the window. Default: 1.3"
+
 [[settings]]
 name = "remember-position"
 default = "no"
 filter = "Screen"
-help = "Setting to save the window position on exit. (mpv.net specific setting)"
+help = "Save the window position on exit. (mpv.net specific setting)"
+options = [{ name = "yes" },
+           { name = "no" }]
+
+[[settings]]
+name = "remember-volume"
+default = "no"
+filter = "Audio"
+help = "Save volume and mute on exit and restore it on start. (mpv.net specific setting)"
+options = [{ name = "yes" },
+           { name = "no" }]
+
+[[settings]]
+name = "auto-load-folder"
+default = "yes"
+filter = "Playback"
+help = "For single files automatically load the entire directory into the playlist. (mpv.net specific setting)"
+options = [{ name = "yes" },
+           { name = "no" }]
+
+[[settings]]
+name = "dark-mode"
+default = "always"
+filter = "UI"
+help = "Enables a dark theme. (mpv.net specific setting)"
+options = [{ name = "always" },
+           { name = "system" , help = "Available on Windows 10 or higher" },
+		   { name = "never" }]
+
+[[settings]]
+name = "dark-color"
+type = "color"
+filter = "UI"
+help = "Theme color used in dark-mode. Leave empty to use OS theme. (mpv.net specific setting)"
+
+[[settings]]
+name = "light-color"
+type = "color"
+filter = "UI"
+help = "Theme color used when dark-mode is disabled. Leave empty to use OS theme. (mpv.net specific setting)"
+
+[[settings]]
+name = "themed-menu"
+default = "no"
+filter = "UI"
+help = "Follow theme color in context menu. (mpv.net specific setting)"
 options = [{ name = "yes" },
            { name = "no" }]

mpv.net/WPF/AboutWindow.xaml

@@ -4,13 +4,14 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d"
-        Title="About mpv.net" Height="230" Width="420" FontSize="16" ShowInTaskbar="False"
+        Title="About mpv.net" Height="230" Width="500" FontSize="16" ShowInTaskbar="False"
         WindowStartupLocation="CenterOwner" ResizeMode="NoResize">
     <Grid>
         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
             <TextBlock FontSize="48" HorizontalAlignment="Center" Margin="0,0,0,10">mpv.net</TextBlock>
             <TextBlock HorizontalAlignment="Center">Copyright (c) 2017-2019 Frank Skare (stax76)</TextBlock>
             <TextBlock Name="Version" HorizontalAlignment="Center" />
+            <TextBlock Name="mpvVersion" HorizontalAlignment="Center" />
             <TextBlock HorizontalAlignment="Center" Margin="0,0,0,20">MIT License</TextBlock>
         </StackPanel>
     </Grid>

mpv.net/WPF/AboutWindow.xaml.cs

@@ -1,4 +1,5 @@
-using System.Windows;
+using System.IO;
+using System.Windows;
 using System.Windows.Input;
 using System.Windows.Media;
 
@@ -9,7 +10,8 @@ namespace mpvnet
         public AboutWindow()
         {
             InitializeComponent();
-            Version.Text = $"Version {System.Windows.Forms.Application.ProductVersion}";
+            Version.Text = $"mpv.net Version {System.Windows.Forms.Application.ProductVersion}";
+            mpvVersion.Text = $"{mp.get_property_string("mpv-version")} ({File.GetLastWriteTime(PathHelp.StartupPath + "mpv-1.dll").ToShortDateString()})";
         }
 
         protected override void OnPreviewKeyDown(KeyEventArgs e) => Close();

mpv.net/WPF/ConfWindow.xaml

@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:WPF="clr-namespace:WPF"
         mc:Ignorable="d"
-        Height="500" Width="700" Loaded="ConfWindow1_Loaded" ShowInTaskbar="False"
+        Height="530" Width="700" Loaded="ConfWindow1_Loaded" ShowInTaskbar="False"
         WindowStartupLocation="CenterScreen" Title="Config Editor">
     <Grid>
         <Grid.RowDefinitions>
@@ -21,7 +21,7 @@
             <StackPanel x:Name="MainStackPanel"></StackPanel>
         </ScrollViewer>
         <StackPanel Margin="20,0,0,0" Grid.Row="1">
-            <ListBox x:Name="FilterListBox" ItemsSource="{Binding FilterStrings}" BorderThickness="0" SelectionChanged="ListBox_SelectionChanged" Foreground="{x:Static WPF:WPF.ThemeBrush}" Background="{Binding Path=Background, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}">
+            <ListBox x:Name="FilterListBox" ItemsSource="{Binding FilterStrings}" BorderThickness="0" SelectionChanged="FilterListBox_SelectionChanged" Foreground="{x:Static WPF:WPF.ThemeBrush}" Background="{Binding Path=Background, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}">
                 <ListBox.ItemTemplate>
                     <DataTemplate>
                         <TextBlock Text="{Binding}" FontSize="16" />

mpv.net/WPF/ConfWindow.xaml.cs

@@ -29,7 +29,7 @@ namespace mpvnet
             LoadSettings(NetSettingsDefinitions, NetConf);
             InitialContent = GetContent(mp.ConfPath, Conf, SettingsDefinitions) +
                              GetContent(App.ConfPath, NetConf, NetSettingsDefinitions);
-            SearchControl.Text = RegHelp.GetString(App.RegPath, "config editor search");
+            SearchControl.Text = RegHelp.GetString(App.RegPath, "ConfigEditorSearch");
 
             if (App.IsDarkMode)
             {
@@ -124,14 +124,13 @@ namespace mpvnet
         protected override void OnClosed(EventArgs e)
         {
             base.OnClosed(e);
+            RegHelp.SetObject(App.RegPath, "ConfigEditorSearch", SearchControl.Text);
             string content = GetContent(mp.ConfPath, Conf, SettingsDefinitions);
             string netContent = GetContent(App.ConfPath, NetConf, NetSettingsDefinitions);
             if (InitialContent == content + netContent) return;
-            string header = "\r\n# manual: https://mpv.io/manual/master/\r\n\r\n# defaults: https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/mpvConf.txt\r\n\r\n";
+            File.WriteAllText(mp.ConfPath, content);
-            File.WriteAllText(mp.ConfPath, header + content);
             File.WriteAllText(App.ConfPath, netContent);
             Msg.Show("Changes will be available on next mpv.net startup.");            
-            RegHelp.SetObject(App.RegPath, "config editor search", SearchControl.Text);
         }
 
         string GetContent(string filePath, Dictionary<string, string> confSettings, List<SettingBase> settings)
@@ -198,7 +197,7 @@ namespace mpvnet
                 i.Update();
         }
 
-        private void ListBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        private void FilterListBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             if (e.AddedItems.Count > 0)
                 SearchControl.Text = e.AddedItems[0].ToString() + ":";

mpv.net/WPF/EverythingWindow.xaml.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
@@ -137,10 +136,11 @@ namespace mpvnet
                     Everything_SetRequestFlags(EVERYTHING_REQUEST_FILE_NAME | EVERYTHING_REQUEST_PATH);
                     Everything_SetSort(EVERYTHING_SORT_SIZE_DESCENDING);
                     Everything_Query(true);
+
                     for (i = 0; i < Everything_GetNumResults(); i++)
                     {
                         Everything_GetResultFullPathName(i, buf, bufsize);
-                        string ext = Path.GetExtension(buf.ToString()).TrimStart('.').ToLower();
+                        string ext = buf.ToString().ShortExt();
 
                         if (App.AudioTypes.Contains(ext) || App.VideoTypes.Contains(ext) ||
                             App.ImageTypes.Contains(ext))
@@ -149,6 +149,7 @@ namespace mpvnet
 
                         if (items.Count > 100) break;
                     }
+
                     Application.Current.Dispatcher.Invoke(() => {
                         ListView.ItemsSource = items;
                         SelectFirst();

mpv.net/WPF/InputWindow.xaml.cs

@@ -48,16 +48,21 @@ namespace mpvnet
             CollectionView.Refresh();
 
             if (SearchControl.SearchTextBox.Text == "?")
-                Msg.Show("Filtering works by searching in the Input, Menu and Command but it's possible to reduce the filter scope to either of Input, Menu or Command by prefixing as follows:\n\ni <input search>\ni: <input search>\n\nm <menu search>\nm: <menu search>\n\nc <command search>\nc: <command search>\n\nIf only one character is entered the search will be performed only in the input.", "Filtering");
+            {
+                SearchControl.SearchTextBox.Text = "";
+                Msg.Show("Filtering", "Reduce the filter scope with:\n\ni input\n\nm menu\n\nc command\n\nIf only one character is entered input search is performed.");
+            }
         }
 
         bool Filter(CommandItem item)
         {
             if (item.Command == "") return false;
             string searchText = SearchControl.SearchTextBox.Text.ToLower();
-            if (searchText == "") return true;
+            if (searchText == "" || searchText == "?") return true;
 
-            if (searchText.StartsWith("i ") || searchText.StartsWith("i:") || searchText.Length == 1)
+            if (searchText.Length == 1)
+                return item.Input.ToLower().Replace("ctrl+", "").Replace("shift+", "").Replace("alt+", "") == searchText.ToLower();
+            else if (searchText.StartsWith("i ") || searchText.StartsWith("i:") || searchText.Length == 1)
             {
                 if (searchText.Length > 1)
                     searchText = searchText.Substring(2).Trim();

mpv.net/WPF/LearnWindow.xaml

@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d"
         Title="Learn Input" Height="200" Width="400" WindowStartupLocation="CenterOwner"
-        ResizeMode="NoResize" Loaded="Window_Loaded" Background="Black" MouseWheel="Window_MouseWheel" MouseUp="Window_MouseUp" MouseDoubleClick="Window_MouseDoubleClick">
+        ResizeMode="NoResize" Loaded="Window_Loaded" Background="Black" MouseWheel="Window_MouseWheel" MouseUp="Window_MouseUp" MouseDoubleClick="Window_MouseDoubleClick" TextInput="Window_TextInput">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="*" />

mpv.net/WPF/LearnWindow.xaml.cs

@@ -10,7 +10,8 @@ namespace mpvnet
     public partial class LearnWindow : Window
     {
         public CommandItem InputItem { get; set; }
-        public string NewKey { get; set; } = "";
+        string NewKey = "";
+        string KeyChar = "";
 
         public LearnWindow() => InitializeComponent();
 
@@ -60,9 +61,9 @@ namespace mpvnet
                 case WF.Keys.NumPad9:
                     text = "KP" + e.KeyCode.ToString()[6].ToString(); break;
                 case WF.Keys.Space:
-                    text = "SPACE"; break;
+                    text = "Space"; break;
                 case WF.Keys.Enter:
-                    text = "ENTER"; break;
+                    text = "Enter"; break;
                 case WF.Keys.Tab:
                     text = "TAB"; break;
                 case WF.Keys.Back:
@@ -72,7 +73,7 @@ namespace mpvnet
                 case WF.Keys.Insert:
                     text = "INS"; break;
                 case WF.Keys.Home:
-                    text = "HOME"; break;
+                    text = "Home"; break;
                 case WF.Keys.End:
                     text = "END"; break;
                 case WF.Keys.PageUp:
@@ -82,56 +83,56 @@ namespace mpvnet
                 case WF.Keys.Escape:
                     text = "ESC"; break;
                 case WF.Keys.PrintScreen:
-                    text = "PRINT"; break;
+                    text = "Print"; break;
                 case WF.Keys.Play:
-                    text = "PLAY"; break;
+                    text = "Play"; break;
                 case WF.Keys.Pause:
-                    text = "PAUSE"; break;
+                    text = "Pause"; break;
                 case WF.Keys.MediaPlayPause:
-                    text = "PLAYPAUSE"; break;
+                    text = "PlayPause"; break;
                 case WF.Keys.MediaStop:
-                    text = "STOP"; break;
+                    text = "Stop"; break;
                 case WF.Keys.MediaNextTrack:
-                    text = "NEXT"; break;
+                    text = "Next"; break;
                 case WF.Keys.MediaPreviousTrack:
-                    text = "PREV"; break;
+                    text = "Prev"; break;
                 case WF.Keys.VolumeUp:
-                    text = "VOLUME_UP"; break;
+                    text = "Volume_Up"; break;
                 case WF.Keys.VolumeDown:
-                    text = "VOLUME_DOWN"; break;
+                    text = "Volume_Down"; break;
                 case WF.Keys.VolumeMute:
-                    text = "MUTE"; break;
+                    text = "Mute"; break;
                 case WF.Keys.BrowserHome:
-                    text = "HOMEPAGE"; break;
+                    text = "Homepage"; break;
                 case WF.Keys.LaunchMail:
-                    text = "MAIL"; break;
+                    text = "Mail"; break;
                 case WF.Keys.BrowserFavorites:
-                    text = "FAVORITES"; break;
+                    text = "Favorites"; break;
                 case WF.Keys.BrowserSearch:
-                    text = "SEARCH"; break;
+                    text = "Search"; break;
                 case WF.Keys.Sleep:
-                    text = "SLEEP"; break;
+                    text = "Sleep"; break;
                 case WF.Keys.Cancel:
-                    text = "CANCEL"; break;
+                    text = "Cancel"; break;
             }
 
-            bool shiftWasHandled = false;
+            bool wasModified = false;
 
             bool isAlt   = GetKeyState(18) < (short)0;
             bool isShift = GetKeyState(16) < (short)0;
             bool isCtrl  = GetKeyState(17) < (short)0;
 
-            if (text.Length == 1 && isShift && text[0] != GetModifiedKey(text[0]))
+            if (text.Length == 1 && KeyChar != text)
             {
-                text = GetModifiedKey(text[0]).ToString();
+                text = KeyChar;
-                shiftWasHandled = true;
+                wasModified = true;
             }
 
-            if (text == "#") text = "Sharp";
+            if (text == "#") text = "SHARP";
 
-            if (isAlt) text = "Alt+" + text;
+            if (isAlt   && !wasModified) text = "ALT+" + text;
-            if (isShift && !shiftWasHandled) text = "Shift+" + text;
+            if (isShift && !wasModified) text = "SHIFT+" + text;
-            if (isCtrl) text = "Ctrl+" + text;
+            if (isCtrl  && !wasModified) text = "CTRL+" + text;
 
             if (!string.IsNullOrEmpty(text))
                 SetKey(text);
@@ -163,24 +164,6 @@ namespace mpvnet
             }
         }
 
-        public static char GetModifiedKey(char c)
-        {
-            short vkKeyScanResult = VkKeyScan(c);
-
-            if (vkKeyScanResult == -1)
-                return c;
-
-            uint code = (uint)vkKeyScanResult & 0xff;
-            byte[] b = new byte[256];
-            b[0x10] = 0x80;
-            uint r;
-
-            if (1 != ToAscii(code, code, b, out r, 0))
-                return c;
-
-            return (char)r;
-        }
-
         void ProcessKeyEventArgs(ref WF.Message m)
         {
             int WM_KEYUP = 0x0101, WM_SYSKEYUP = 0x0105, WM_APPCOMMAND = 0x0319;
@@ -382,5 +365,10 @@ namespace mpvnet
                 BlockMBTN_LEFT = true;
             }
         }
+
+        private void Window_TextInput(object sender, TextCompositionEventArgs e)
+        {
+            KeyChar = e.Text;
+        }
     }
 }

mpv.net/WPF/SetupWindow.xaml

@@ -0,0 +1,19 @@
+<Window x:Class="mpvnet.SetupWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        mc:Ignorable="d"
+        Title="mpv.net OS Setup" SizeToContent="WidthAndHeight" WindowStartupLocation="CenterOwner">
+    <Grid>
+        <StackPanel>
+            <Button Name="RegisterVideo" Margin="5" Click="RegisterVideo_Click">Register video file extensions (requires elevated privileges)</Button>
+            <Button Name="RegisterAudio" Margin="5" Click="RegisterAudio_Click">Register audio file extensions (requires elevated privileges)</Button>
+            <Button Name="RegisterImage" Margin="5" Click="RegisterImage_Click">Register image file extensions (requires elevated privileges)</Button>
+            <Button Name="AddToPathEnvVar" Margin="5" Click="AddToPathEnvVar_Click">Add mpv.net to Path environment variable</Button>
+            <Button Name="ManageDefaultApps" Margin="5" Click="ManageDefaultApps_Click">Manage Default Apps (Win 10 or higher)</Button>
+            <Button Name="UnregisterFileAssociations" Margin="5,20,5,5" Click="UnregisterFileAssociations_Click">Unregister file extensions (requires elevated privileges)</Button>
+            <Button Name="RemoveFromPathEnvVar" Margin="5" Click="RemoveFromPathEnvVar_Click">Remove mpv.net from Path environment variable</Button>
+        </StackPanel>
+    </Grid>
+</Window>

mpv.net/WPF/SetupWindow.xaml.cs

@@ -0,0 +1,57 @@
+using System;
+using System.Diagnostics;
+using System.Windows;
+using WF = System.Windows.Forms;
+
+namespace mpvnet
+{
+    public partial class SetupWindow : Window
+    {
+        public SetupWindow() => InitializeComponent();
+
+        void RegisterFileAssociations(string value)
+        {
+            using (var proc = new Process())
+            {
+                proc.StartInfo.FileName = System.Windows.Forms.Application.ExecutablePath;
+                proc.StartInfo.Arguments = "--reg-file-assoc " + value;
+                proc.StartInfo.Verb = "runas";
+                try { proc.Start(); } catch { }
+            }
+        }
+
+        private void RegisterVideo_Click(object sender, RoutedEventArgs e) => RegisterFileAssociations("video");
+        private void RegisterAudio_Click(object sender, RoutedEventArgs e) => RegisterFileAssociations("audio");
+        private void RegisterImage_Click(object sender, RoutedEventArgs e) => RegisterFileAssociations("image");
+        private void UnregisterFileAssociations_Click(object sender, RoutedEventArgs e) => RegisterFileAssociations("unreg");
+        private void ManageDefaultApps_Click(object sender, RoutedEventArgs e) => Process.Start("ms-settings:defaultapps");
+
+        private void AddToPathEnvVar_Click(object sender, RoutedEventArgs e)
+        {
+            string var = WF.Application.StartupPath + ";";
+            string path = Environment.GetEnvironmentVariable("Path", EnvironmentVariableTarget.User);
+
+            if (path.Contains(var))
+                Msg.ShowWarning("Path was already containing mpv.net.");
+            else
+            {
+                Environment.SetEnvironmentVariable("Path", var + path, EnvironmentVariableTarget.User);
+                Msg.Show("mpv.net was successfully added to Path.", (var + path).Replace(";","\n"));
+            }
+        }
+
+        private void RemoveFromPathEnvVar_Click(object sender, RoutedEventArgs e)
+        {
+            string var = WF.Application.StartupPath + ";";
+            string path = Environment.GetEnvironmentVariable("Path", EnvironmentVariableTarget.User);
+
+            if (path.Contains(var))
+            {
+                Environment.SetEnvironmentVariable("Path", path.Replace(var, ""), EnvironmentVariableTarget.User);
+                Msg.Show("mpv.net was successfully removed from Path.");
+            }
+            else
+                Msg.ShowWarning("Path was not containing mpv.net.");
+        }
+    }
+}

mpv.net/WinForms/MainForm.cs

@@ -2,7 +2,6 @@
 using System.Drawing;
 using System.IO;
 using System.Runtime.InteropServices;
-using System.Threading;
 using System.Windows.Forms;
 using System.Linq;
 using System.Collections.Generic;
@@ -50,8 +49,6 @@ namespace mpvnet
                 ContextMenu.Opened += ContextMenu_Opened;
                 ContextMenu.Opening += ContextMenu_Opening;
 
-                App.ProcessCommandLineEarly();
-
                 if (mp.Screen == -1) mp.Screen = Array.IndexOf(Screen.AllScreens, Screen.PrimaryScreen);
                 int targetIndex = mp.Screen;
                 Screen[] screens = Screen.AllScreens;
@@ -75,8 +72,7 @@ namespace mpvnet
                 mp.VideoSizeChanged += VideoSizeChanged;
                 mp.FileLoaded += FileLoaded;
                 mp.Idle += Idle;
-                mp.VideoSizeAutoResetEvent.WaitOne(App.StartThreshold);
+
-                if (Height < FontHeight * 4) SetFormPosAndSize();
                 mp.observe_property_bool("fullscreen", PropChangeFullscreen);
                 mp.observe_property_bool("ontop", PropChangeOnTop);
                 mp.observe_property_bool("border", PropChangeBorder);
@@ -84,6 +80,9 @@ namespace mpvnet
                 mp.observe_property_string("aid", PropChangeAid);
                 mp.observe_property_string("vid", PropChangeVid);
                 mp.observe_property_int("edition", PropChangeEdition);
+
+                if (mp.GPUAPI != "vulkan") mp.VideoSizeAutoResetEvent.WaitOne(App.StartThreshold);
+                if (Height < FontHeight * 4) SetFormPosAndSize();
             }
             catch (Exception ex)
             {
@@ -239,7 +238,7 @@ namespace mpvnet
             int autoFitHeight = Convert.ToInt32(screen.WorkingArea.Height * mp.Autofit);
 
             if (mp.VideoSize.Height == 0 || mp.VideoSize.Width == 0 ||
-                mp.VideoSize.Width / (float)mp.VideoSize.Height < 1.3)
+                mp.VideoSize.Width / (float)mp.VideoSize.Height < App.MinimumAspectRatio)
 
                 mp.VideoSize = new Size((int)(autoFitHeight * (16 / 9.0)), autoFitHeight);
 
@@ -310,8 +309,11 @@ namespace mpvnet
 
             if (enabled)
             {
-                if (WindowState != FormWindowState.Maximized)
+                if (WindowState != FormWindowState.Maximized || FormBorderStyle != FormBorderStyle.None)
                 {
+                    if (WindowState == FormWindowState.Maximized)
+                        WindowState = FormWindowState.Minimized;
+
                     FormBorderStyle = FormBorderStyle.None;
                     WindowState = FormWindowState.Maximized;
                 }
@@ -367,7 +369,7 @@ namespace mpvnet
             string path = mp.get_property_string("path");
             BeginInvoke(new Action(() => {
                 if (File.Exists(path) || path.Contains("://"))
-                    Text = PathHelp.GetFileName(path) + " - mpv.net " + Application.ProductVersion;
+                    Text = path.FileName() + " - mpv.net " + Application.ProductVersion;
                 else
                     Text = "mpv.net " + Application.ProductVersion;
             }));
@@ -467,22 +469,6 @@ namespace mpvnet
             base.WndProc(ref m);
         }
 
-        protected override void OnDragEnter(DragEventArgs e)
-        {
-            base.OnDragEnter(e);
-            if (e.Data.GetDataPresent(DataFormats.FileDrop) || e.Data.GetDataPresent(DataFormats.Text))
-                e.Effect = DragDropEffects.Copy;
-        }
-
-        protected override void OnDragDrop(DragEventArgs e)
-        {
-            base.OnDragDrop(e);
-            if (e.Data.GetDataPresent(DataFormats.FileDrop))
-                mp.Load(e.Data.GetData(DataFormats.FileDrop) as String[], true, Control.ModifierKeys.HasFlag(Keys.Control));
-            if (e.Data.GetDataPresent(DataFormats.Text))
-                mp.Load(new[] { e.Data.GetData(DataFormats.Text).ToString() }, true, Control.ModifierKeys.HasFlag(Keys.Control));
-        }
-
         void Timer_Tick(object sender, EventArgs e)
         {
             if (CursorHelp.IsPosDifferent(LastCursorPosChanged))
@@ -521,12 +507,19 @@ namespace mpvnet
             }));
         }
 
+        protected override void OnLoad(EventArgs e)
+        {
+            base.OnLoad(e);
+            if (mp.get_property_int("playlist-count") == 0) mp.ShowLogo();
+        }
+
         protected override void OnShown(EventArgs e)
         {
             base.OnShown(e);
+            if (mp.GPUAPI == "vulkan") mp.ProcessCommandLine(false);
             var wpfColor = WPF.WPF.ThemeColor;
             Color color = Color.FromArgb(wpfColor.A, wpfColor.R, wpfColor.G, wpfColor.B);
-            ToolStripRendererEx.InitColors(color, App.IsDarkMode);
+            ToolStripRendererEx.InitColors(color, App.IsDarkMode, App.ThemedMenu);
             BuildMenu();
             ContextMenuStrip = ContextMenu;
             WPF.WPF.Init();
@@ -588,6 +581,22 @@ namespace mpvnet
                 mp.commandv("quit");
         }
 
+        protected override void OnDragEnter(DragEventArgs e)
+        {
+            base.OnDragEnter(e);
+            if (e.Data.GetDataPresent(DataFormats.FileDrop) || e.Data.GetDataPresent(DataFormats.Text))
+                e.Effect = DragDropEffects.Copy;
+        }
+
+        protected override void OnDragDrop(DragEventArgs e)
+        {
+            base.OnDragDrop(e);
+            if (e.Data.GetDataPresent(DataFormats.FileDrop))
+                mp.Load(e.Data.GetData(DataFormats.FileDrop) as String[], true, Control.ModifierKeys.HasFlag(Keys.Control));
+            if (e.Data.GetDataPresent(DataFormats.Text))
+                mp.Load(new[] { e.Data.GetData(DataFormats.Text).ToString() }, true, Control.ModifierKeys.HasFlag(Keys.Control));
+        }
+
         protected override void OnLostFocus(EventArgs e)
         {
             base.OnLostFocus(e);

mpv.net/WinForms/Menu.cs

@@ -131,8 +131,6 @@ public class MenuItem : ToolStripMenuItem
 
 public class ToolStripRendererEx : ToolStripSystemRenderer
 {
-    public static bool IsDarkMode { get; set; }
-
     public static Color ColorForeground { get; set; } = Color.Black;
     public static Color ColorTheme { get; set; }
     public static Color ColorChecked { get; set; }
@@ -141,34 +139,33 @@ public class ToolStripRendererEx : ToolStripSystemRenderer
     public static Color ColorSelection { get; set; }
     public static Color ColorBackground { get; set; }
 
-    public static Color ColorToolStrip1 { get; set; }
-    public static Color ColorToolStrip2 { get; set; }
-    public static Color ColorToolStrip3 { get; set; }
-    public static Color ColorToolStrip4 { get; set; }
-
     int TextOffset;
 
-    public static void InitColors(Color c, bool darkMode)
+    public static void InitColors(Color themeColor, bool darkMode, bool themed)
     {
-        ColorBorder = HSLColor.Convert(c).ToColorSetLuminosity(100);
-        ColorChecked = HSLColor.Convert(c).ToColorSetLuminosity(160);
-        ColorSelection = HSLColor.Convert(c).ToColorSetLuminosity(180);
-        ColorBackground = HSLColor.Convert(c).ToColorSetLuminosity(210);
-        ColorTop = HSLColor.Convert(c).ToColorSetLuminosity(240);
-
         if (darkMode)
         {
             ColorBorder = Color.White;
             ColorBackground = Color.FromArgb(50, 50, 50);
             ColorSelection = Color.FromArgb(80, 80, 80);
+
+            if (themed)
+                ColorForeground = themeColor;
+            else
                 ColorForeground = Color.White;
+
             ColorChecked = Color.FromArgb(90, 90, 90);
         }
+        else
+        {
+            if (!themed) themeColor = Color.FromArgb(238, 238, 238);
 
-        ColorToolStrip1 = ControlPaint.LightLight(ControlPaint.LightLight(ControlPaint.Light(ColorBorder, 1)));
+            ColorBorder = HSLColor.Convert(themeColor).ToColorSetLuminosity(100);
-        ColorToolStrip2 = ControlPaint.LightLight(ControlPaint.LightLight(ControlPaint.Light(ColorBorder, 0.7f)));
+            ColorChecked = HSLColor.Convert(themeColor).ToColorSetLuminosity(160);
-        ColorToolStrip3 = ControlPaint.LightLight(ControlPaint.LightLight(ControlPaint.Light(ColorBorder, 0.1f)));
+            ColorSelection = HSLColor.Convert(themeColor).ToColorSetLuminosity(180);
-        ColorToolStrip4 = ControlPaint.LightLight(ControlPaint.LightLight(ControlPaint.Light(ColorBorder, 0.4f)));
+            ColorBackground = HSLColor.Convert(themeColor).ToColorSetLuminosity(210);
+            ColorTop = HSLColor.Convert(themeColor).ToColorSetLuminosity(240);
+        }
     }
 
     protected override void OnRenderToolStripBorder(ToolStripRenderEventArgs e)
@@ -200,17 +197,6 @@ public class ToolStripRendererEx : ToolStripSystemRenderer
         base.OnRenderItemText(e);
     }
 
-    protected override void OnRenderToolStripBackground(ToolStripRenderEventArgs e)
-    {
-        if (!(e.ToolStrip is ToolStripDropDownMenu) && !(e.ToolStrip.LayoutStyle == ToolStripLayoutStyle.VerticalStackWithOverflow))
-        {
-            Rectangle r = new Rectangle(-1, -1, e.AffectedBounds.Width, e.AffectedBounds.Height);
-
-            using (SolidBrush b = new SolidBrush(ColorToolStrip2))
-                e.Graphics.FillRectangle(b, r);
-        }
-    }
-
     protected override void OnRenderMenuItemBackground(ToolStripItemRenderEventArgs e)
     {
         Rectangle rect = new Rectangle(Point.Empty, e.Item.Size);

mpv.net/mpv.net.csproj

@@ -114,11 +114,16 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Misc\App.cs" />
     <Compile Include="Misc\Extension.cs" />
     <Page Include="Controls\SearchTextBoxUserControl.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="WPF\SetupWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="WPF\AboutWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -146,6 +151,7 @@
       <DependentUpon>StringSettingControl.xaml</DependentUpon>
     </Compile>
     <Compile Include="DynamicGUI\Tommy.cs" />
+    <Compile Include="Misc\ExtensionMethods.cs" />
     <Compile Include="Native\MediaInfo.cs" />
     <Compile Include="WinForms\Menu.cs">
       <SubType>Component</SubType>
@@ -172,6 +178,9 @@
     <Compile Include="Misc\Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Native\TaskDialog.cs" />
+    <Compile Include="WPF\SetupWindow.xaml.cs">
+      <DependentUpon>SetupWindow.xaml</DependentUpon>
+    </Compile>
     <Compile Include="WPF\EverythingWindow.xaml.cs">
       <DependentUpon>EverythingWindow.xaml</DependentUpon>
     </Compile>

mpv.net/mpv/mp.cs

@@ -54,27 +54,31 @@ namespace mpvnet
         public static event Action QueueOverflow;             //                    MPV_EVENT_QUEUE_OVERFLOW
         public static event Action Hook;                      //                    MPV_EVENT_HOOK
 
-        public static IntPtr Handle { get; set; }
+        public static event Action Initialized;
-        public static IntPtr WindowHandle { get; set; }
+
-        public static Extension Extension { get; set; }
-        public static bool IsLogoVisible { set; get; }
-        public static bool IsQuitNeeded { set; get; } = true;
         public static List<KeyValuePair<string, Action<bool>>> BoolPropChangeActions { get; set; } = new List<KeyValuePair<string, Action<bool>>>();
         public static List<KeyValuePair<string, Action<int>>> IntPropChangeActions { get; set; } = new List<KeyValuePair<string, Action<int>>>();
         public static List<KeyValuePair<string, Action<string>>> StringPropChangeActions { get; set; } = new List<KeyValuePair<string, Action<string>>>();
-        public static Size VideoSize { get; set; }
-        public static List<PythonScript> PythonScripts { get; set; } = new List<PythonScript>();
-        public static AutoResetEvent ShutdownAutoResetEvent { get; set; } = new AutoResetEvent(false);
-        public static AutoResetEvent VideoSizeAutoResetEvent { get; set; } = new AutoResetEvent(false);
         public static List<MediaTrack> MediaTracks { get; set; } = new List<MediaTrack>();
         public static List<KeyValuePair<string, double>> Chapters { get; set; } = new List<KeyValuePair<string, double>>();
 
+        public static IntPtr Handle { get; set; }
+        public static IntPtr WindowHandle { get; set; }
+        public static Extension Extension { get; set; }
+        public static List<PythonScript> PythonScripts { get; set; } = new List<PythonScript>();
+        public static Size VideoSize { get; set; }
+        public static AutoResetEvent ShutdownAutoResetEvent { get; set; } = new AutoResetEvent(false);
+        public static AutoResetEvent VideoSizeAutoResetEvent { get; set; } = new AutoResetEvent(false);
+
         public static string InputConfPath { get; } = ConfigFolder + "\\input.conf";
         public static string ConfPath      { get; } = ConfigFolder + "\\mpv.conf";
         public static string Sid { get; set; } = "";
         public static string Aid { get; set; } = "";
         public static string Vid { get; set; } = "";
+        public static string GPUAPI { get; set; } = "auto";
 
+        public static bool IsLogoVisible { set; get; }
+        public static bool IsQuitNeeded { set; get; } = true;
         public static bool Fullscreen { get; set; }
         public static bool Border { get; set; } = true;
         
@@ -89,27 +93,33 @@ namespace mpvnet
         {
             LoadLibrary("mpv-1.dll");
             Handle = mpv_create();
+            Task.Run(() => { EventLoop(); });
 
             if (App.IsStartedFromTerminal)
             {
                 set_property_string("terminal", "yes");
+                set_property_string("input-terminal", "yes");
                 set_property_string("msg-level", "osd/libass=fatal");
             }
 
-            set_property_string("config-dir", ConfigFolder);
-            set_property_string("osc", "yes");
-            set_property_string("config", "yes");
             set_property_string("wid", MainForm.Hwnd.ToString());
+            set_property_string("osc", "yes");
             set_property_string("force-window", "yes");
             set_property_string("input-media-keys", "yes");
+            set_property_string("config-dir", ConfigFolder);
+            set_property_string("config", "yes");
+
+            ProcessCommandLine(true);
             mpv_initialize(Handle);
-            ShowLogo();
+            Initialized?.Invoke();
-            ProcessCommandLine();
+            LoadMpvScripts();
-            Task.Run(() => { EventLoop(); });
+            if (GPUAPI != "vulkan") ProcessCommandLine(false);
         }
 
         public static void ProcessProperty(string name, string value)
         {
+            if (name.Any(char.IsUpper)) Msg.ShowError("Uppercase char detected: " + name, "mpv properties using the command line and the mpv.conf config file are required to be lowercase.");
+
             switch (name)
             {
                 case "autofit":
@@ -128,6 +138,7 @@ namespace mpvnet
                 case "fullscreen": Fullscreen = value == "yes"; break;
                 case "border": Border = value == "yes"; break;
                 case "screen": Screen = Convert.ToInt32(value); break;
+                case "gpu-api": GPUAPI = value; break;
             }
         }
 
@@ -137,17 +148,16 @@ namespace mpvnet
             get {
                 if (_ConfigFolder == null)
                 {
-                    _ConfigFolder = Application.StartupPath + "\\portable_config\\";
+                    string portableFolder = PathHelp.StartupPath + "portable_config\\";
+                    _ConfigFolder = portableFolder;
 
                     if (!Directory.Exists(_ConfigFolder))
                         _ConfigFolder = RegHelp.GetString(App.RegPath, "ConfigFolder");
 
                     if (!Directory.Exists(_ConfigFolder))
                     {
-                        string portableFolder = Application.StartupPath + "\\portable_config\\";
                         string appdataFolder = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\mpv.net\\";
                         string appdataFolderMpv = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\mpv\\";
-                        string startupFolder = Application.StartupPath + "\\";
 
                         using (TaskDialog<string> td = new TaskDialog<string>())
                         {
@@ -155,17 +165,22 @@ namespace mpvnet
                             td.AddCommandLink(@"AppData\Roaming\mpv.net", appdataFolder, appdataFolder);
                             td.AddCommandLink(@"AppData\Roaming\mpv", appdataFolderMpv, appdataFolderMpv);
                             td.AddCommandLink("<startup>\\portable_config", portableFolder, portableFolder);
-                            td.AddCommandLink("<startup>", startupFolder, startupFolder);
                             td.AddCommandLink("Choose custom folder", "custom");
-                            td.AllowCancel = false;
                             _ConfigFolder = td.Show();
                         }
 
+                        if (_ConfigFolder == null)
+                        {
+                            _ConfigFolder = "";
+                            return "";
+                        }
+
                         if (_ConfigFolder == "custom")
                         {
                             using (var d = new WinForms.FolderBrowserDialog())
                             {
                                 d.Description = "Choose a folder.";
+
                                 if (d.ShowDialog() == WinForms.DialogResult.OK)
                                     _ConfigFolder = d.SelectedPath + "\\";
                                 else
@@ -174,6 +189,12 @@ namespace mpvnet
                         }
                     }
 
+                    if (PathHelp.StartupPath == _ConfigFolder)
+                    {
+                        Msg.ShowError("Startup folder and config folder cannot be identical, using portable_config instead.");
+                        _ConfigFolder = portableFolder;
+                    }
+
                     if (!Directory.Exists(_ConfigFolder))
                         Directory.CreateDirectory(_ConfigFolder);
 
@@ -203,41 +224,53 @@ namespace mpvnet
 
                     if (File.Exists(ConfPath))
                         foreach (var i in File.ReadAllLines(ConfPath))
-                            if (i.Contains("=") && ! i.StartsWith("#"))
+                            if (i.Contains("=") && !i.TrimStart().StartsWith("#"))
                                 _Conf[i.Substring(0, i.IndexOf("=")).Trim()] = i.Substring(i.IndexOf("=") + 1).Trim();
 
-                    foreach (var i in Conf)
+                    foreach (var i in _Conf)
                         ProcessProperty(i.Key, i.Value);
                 }
                 return _Conf;
             }
         }
 
+        public static void LoadMpvScripts()
+        {
+            if (Directory.Exists(PathHelp.StartupPath + "Scripts"))
+            {
+                string[] startupScripts = Directory.GetFiles(PathHelp.StartupPath + "Scripts");
+
+                foreach (string path in startupScripts)
+                    if ((path.EndsWith(".lua") || path.EndsWith(".js")) && KnownScripts.Contains(Path.GetFileName(path)))
+                        commandv("load-script", $"{path}");
+            }
+        }
+
+        public static string[] KnownScripts { get; } = { "osc-visibility.js", "show-playlist.js", "seek-show-position.py", "repl.lua" };
+
         public static void LoadScripts()
         {
-
+            if (Directory.Exists(PathHelp.StartupPath + "Scripts"))
-            if (Directory.Exists(Application.StartupPath + "\\Scripts"))
             {
-                string[] startupScripts = Directory.GetFiles(Application.StartupPath + "\\Scripts");
+                foreach (string path in Directory.GetFiles(PathHelp.StartupPath + "Scripts"))
-
+                {
-                foreach (string scriptPath in startupScripts)
+                    if (KnownScripts.Contains(Path.GetFileName(path)))
-                    if (scriptPath.EndsWith(".lua") || scriptPath.EndsWith(".js"))
+                    {
-                        commandv("load-script", $"{scriptPath}");
+                        if (path.EndsWith(".py"))
-
+                            PythonScripts.Add(new PythonScript(File.ReadAllText(path)));
-                foreach (string scriptPath in startupScripts)
+                        else if (path.EndsWith(".ps1"))
-                    if (Path.GetExtension(scriptPath) == ".py")
+                            PowerShellScript.Init(path);
-                        PythonScripts.Add(new PythonScript(File.ReadAllText(scriptPath)));
+                    }
-
+                    else
-                foreach (string scriptPath in startupScripts)
+                        Msg.ShowError("Failed to load script", path + "\n\nOnly scripts that ship with mpv.net are allowed in <startup>\\scripts\n\nUser scripts have to use <config folder>\\scripts\n\nNever copy or install a new mpv.net version over a old mpv.net version.");
-                    if (Path.GetExtension(scriptPath) == ".ps1")
+                }
-                        PowerShellScript.Init(scriptPath);
             }
 
             if (Directory.Exists(ConfigFolder + "Scripts"))
                 foreach (string scriptPath in Directory.GetFiles(ConfigFolder + "Scripts"))
-                    if (Path.GetExtension(scriptPath) == ".py")
+                    if (scriptPath.EndsWith(".py")) 
                         PythonScripts.Add(new PythonScript(File.ReadAllText(scriptPath)));
-                    else if (Path.GetExtension(scriptPath) == ".ps1")
+                    else if (scriptPath.EndsWith(".ps1"))
                         PowerShellScript.Init(scriptPath);
         }
 
@@ -538,9 +571,51 @@ namespace mpvnet
                 StringPropChangeActions.Add(new KeyValuePair<string, Action<string>>(name, action));
         }
 
-        protected static void ProcessCommandLine()
+        public static void ProcessCommandLine(bool preInit)
         {
             var args = Environment.GetCommandLineArgs().Skip(1);
+
+            //Msg.Show(string.Join("\n", args));
+
+            string[] preInitProperties = { "input-terminal", "terminal", "input-file", "config", "config-dir", "input-conf", "load-scripts", "scripts", "player-operation-mode" };
+
+            foreach (string i in args)
+            {
+                string arg = i;
+
+                if (arg.StartsWith("--"))
+                {
+                    try
+                    {
+                        if (!arg.Contains("=")) arg += "=yes";
+
+                        string left = arg.Substring(2, arg.IndexOf("=") - 2);
+                        string right = arg.Substring(left.Length + 3);
+
+                        if (left == "script") left = "scripts";
+
+                        if (preInit && preInitProperties.Contains(left))
+                        {
+                            mp.ProcessProperty(left, right);
+                            if (!App.ProcessProperty(left, right))
+                                set_property_string(left, right, true);
+                        }
+                        else if (!preInit && !preInitProperties.Contains(left))
+                        {
+                            mp.ProcessProperty(left, right);
+                            if (!App.ProcessProperty(left, right))
+                                set_property_string(left, right, true);
+                        }
+                    }
+                    catch (Exception e)
+                    {
+                        Msg.ShowException(e);
+                    }
+                }
+            }
+
+            if (!preInit)
+            {
                 List<string> files = new List<string>();
 
                 foreach (string i in args)
@@ -552,28 +627,6 @@ namespace mpvnet
                     }
                 }
 
-            foreach (string i in args)
-            {
-                if (i.StartsWith("--"))
-                {
-                    try
-                    {
-                        if (i.Contains("="))
-                        {
-                            string left = i.Substring(2, i.IndexOf("=") - 2);
-                            string right = i.Substring(left.Length + 3);
-                            set_property_string(left, right, true);
-                        }
-                        else
-                            set_property_string(i.Substring(2), "yes", true);
-                    }
-                    catch (Exception e)
-                    {
-                        Msg.ShowException(e);
-                    }
-                }
-            }
-
                 Load(files.ToArray(), App.ProcessInstance != "queue", Control.ModifierKeys.HasFlag(Keys.Control));
 
                 if (files.Count == 0 || files[0].Contains("://"))
@@ -582,6 +635,7 @@ namespace mpvnet
                     VideoSizeChanged?.Invoke();
                 }
             }
+        }
 
         public static DateTime LastLoad;
 
@@ -596,7 +650,7 @@ namespace mpvnet
             LastLoad = DateTime.Now;
 
             for (int i = 0; i < files.Length; i++)
-                if (App.SubtitleTypes.Contains(Path.GetExtension(files[i]).TrimStart('.').ToLower()))
+                if (App.SubtitleTypes.Contains(files[i].ShortExt()))
                     commandv("sub-add", files[i]);
                 else
                     if (i == 0 && !append)
@@ -612,14 +666,15 @@ namespace mpvnet
 
         public static void LoadFolder()
         {
+            if (!App.AutoLoadFolder) return;
             Thread.Sleep(200); // user reported race condition
             string path = get_property_string("path");
             if (!File.Exists(path) || get_property_int("playlist-count") != 1) return;
             List<string> files = Directory.GetFiles(Path.GetDirectoryName(path)).ToList();
             files = files.Where((file) =>
-                App.VideoTypes.Contains(Path.GetExtension(file).TrimStart('.').ToLower()) ||
+                App.VideoTypes.Contains(file.ShortExt()) ||
-                App.AudioTypes.Contains(Path.GetExtension(file).TrimStart('.').ToLower()) ||
+                App.AudioTypes.Contains(file.ShortExt()) ||
-                App.ImageTypes.Contains(Path.GetExtension(file).TrimStart('.').ToLower())).ToList();
+                App.ImageTypes.Contains(file.ShortExt())).ToList();
             files.Sort(new StringLogicalComparer());
             int index = files.IndexOf(path);
             files.Remove(path);
@@ -628,7 +683,7 @@ namespace mpvnet
             if (index > 0) commandv("playlist-move", "0", (index + 1).ToString());
         }
 
-        static IntPtr AllocateUtf8IntPtrArrayWithSentinel(string[] arr, out IntPtr[] byteArrayPointers)
+        public static IntPtr AllocateUtf8IntPtrArrayWithSentinel(string[] arr, out IntPtr[] byteArrayPointers)
         {
             int numberOfStrings = arr.Length + 1; // add extra element for extra null pointer last (sentinel)
             byteArrayPointers = new IntPtr[numberOfStrings];
@@ -646,7 +701,7 @@ namespace mpvnet
             return rootPointer;
         }
 
-        static string[] NativeUtf8StrArray2ManagedStrArray(IntPtr unmanagedStringArray, int StringCount)
+        public static string[] NativeUtf8StrArray2ManagedStrArray(IntPtr unmanagedStringArray, int StringCount)
         {
             IntPtr[] intPtrArray = new IntPtr[StringCount];
             string[] stringArray = new string[StringCount];
@@ -658,7 +713,7 @@ namespace mpvnet
             return stringArray;
         }
 
-        static string StringFromNativeUtf8(IntPtr nativeUtf8)
+        public static string StringFromNativeUtf8(IntPtr nativeUtf8)
         {
             int len = 0;
             while (Marshal.ReadByte(nativeUtf8, len) != 0) ++len;
@@ -667,7 +722,7 @@ namespace mpvnet
             return Encoding.UTF8.GetString(buffer);
         }
 
-        static byte[] GetUtf8Bytes(string s) => Encoding.UTF8.GetBytes(s + "\0");
+        public static byte[] GetUtf8Bytes(string s) => Encoding.UTF8.GetBytes(s + "\0");
 
         static string LastHistoryPath;
         static DateTime LastHistoryStartDateTime;