-

CSScriptAddon/CSScriptAddon.vb

@@ -1,5 +1,6 @@
 Imports System.ComponentModel.Composition
 Imports System.IO
+Imports System.Windows.Forms
 
 Imports mpvnet
 Imports mpvnet.StaticUsing
@@ -13,7 +14,8 @@ Public Class CSScriptAddon
     Sub New()
         Dim scriptDir = mp.mpvConfFolderPath + "scripts"
         If Not Directory.Exists(scriptDir) Then Return
-        Dim csFiles = Directory.GetFiles(scriptDir, "*.cs")
+        Dim csFiles = Directory.GetFiles(scriptDir, "*.cs").ToList
+        csFiles.AddRange(Directory.GetFiles(Application.StartupPath + "\\Scripts", "*.cs"))
         If csFiles.Count = 0 Then Return
         CSScriptLibrary.CSScript.EvaluatorConfig.Engine = EvaluatorEngine.CodeDom
 

CSScriptAddon/CSScriptAddon.vbproj

@@ -55,6 +55,7 @@
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />

README.md

@@ -9,26 +9,42 @@ mpv manual: https://mpv.io/manual/master/
 ### Features
 
 - Customizable context menu defined in the same file as the keybindings
-- Addons support for using .NET languages
+- Addon API for .NET languages
-- C# scripts implemented with CS-Script
+- 5 different scripting languages are supported, Python scripting implemented with IronPython, C# implemented with CS-Script, Lua and JavaScript implemented in libmpv and PowerShell
-- mpv's OSC, IPC, Lua/JS, conf files and more
+- mpv's OSC, IPC, conf files and more
 
 ![](https://raw.githubusercontent.com/stax76/mpv.net/master/screenshot.png)
 
 ### Context Menu
 
 The context menu can be customized via input.conf file located at:
+```
+C:\Users\username\AppData\Roaming\mpv\input.conf
+```
+if it's missing mpv.net generates it with the following defaults:
 
-C:\Users\Frank\AppData\Roaming\mpv\input.conf
+https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/input.conf.txt
 
-if it misses mpv.net generates it with the following defaults:
+### Settings
 
-https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/input_conf.txt
+mpv.net shares the settings with mpv, settings have to be edited in a config file called mpv.conf located at:
+```
+C:\Users\username\AppData\Roaming\mpv\mpv.conf
+```
+if it's missing mpv.net generates it with the following defaults:
+
+https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/mpv.conf.txt
 
 ### C# Scripting
 
-A simple C# script located at: C:\Users\Frank\AppData\Roaming\mpv\scripts\test.cs
+A simple C# script located at:
-
+```
+C:\Users\username\AppData\Roaming\mpv\scripts\fullscreen.cs
+```
+or
+```
+startup\scripts\fullscreen.cs
+```
 ```
 using mpvnet;
 
@@ -36,20 +52,109 @@ class Script
 {
     public Script()
     {
-        var fs = mpv.GetStringProp("fullscreen");
+        var fs = mp.get_property_string("fullscreen");
-        mpv.Command("show-text", "fullscreen: " + fs);
+        mp.commandv("show-text", "fullscreen: " + fs);
-        mpv.ObserveBoolProp("fullscreen", FullscreenChange);
+        mp.observe_property_bool("fullscreen", FullscreenChange);
     }
 
     void FullscreenChange(bool val)
     {
-        mpv.Command("show-text", "fullscreen: " + val.ToString());
+        mp.commandv("show-text", "fullscreen: " + val.ToString());
     }
 }
 ```
 
+### Python Scripting
+
+A simple Python script located at:
+```
+C:\Users\user\AppData\Roaming\mpv\scripts\seek-show-position.py
+```
+or
+```
+startup\scripts\seek-show-position.py
+```
+```
+# when seeking displays position and
+# duration like so: 70:00 / 80:00
+# which is different from mpv which
+# uses 01:10:00 / 01:20:00
+
+import math
+
+def seek():
+    mp.commandv('show-text',
+        format(mp.get_property_number("time-pos")) + " / " + format(mp.get_property_number("duration")))
+
+def format(f):
+    sec = round(f)
+    
+    if sec < 0:
+        sec = 0
+    
+    pos_min_floor = math.floor(sec / 60)
+    sec_rest = sec - pos_min_floor * 60
+    return add_zero(pos_min_floor) + ":" + add_zero(sec_rest)
+
+def add_zero(val):
+    val = round(val)
+    return "" + str(int(val)) if (val > 9) else "0" + str(int(val))
+
+mp.register_event("seek", seek) # or use: mp.Seek += seek
+```
+
+### PowerShell Scripting
+
+A simple PowerShell script located at:
+```
+C:\Users\user\AppData\Roaming\mpv\scripts\seek.ps1
+```
+or
+```
+startup\scripts\seek.ps1
+```
+```
+$position = [mp]::get_property_number("time-pos");
+[mp]::commandv("show-text", $position.ToString() + " seconds")
+```
+Please note that PowerShell don't allow assigning to events and mpv.net uses as workaround a matching script filename, a list of available events can be found in the mpv manual or in the file mp.cs in the mpv.net source code.
+
 ### Changes
 
+### 1.7
+
+- showing the conf files mpv.net uses now the app that is registered for txt files, before it just shell executed the conf file which only worked if conf files were associated with an application
+- leaving fullscreen mode the previous window size and position wasn't restored
+- when the source video aspect ratio changes the height is kept and the width is adjusted and a check is performed to assure the window is within screen bounds
+
+### 1.6
+
+- a crash caused by WM_APPCOMMAND (multimedia keyboards) commands was fixed
+- support for the 'screen' property was added, it should work both from mpv.conf (screen = 1) and from command line (--screen=1)
+- per monitor DPI awareness and better multi monitor support was added
+
+### 1.5
+
+- the info command supports now info for music files instead of showing an exception on music files
+- added support for WM_APPCOMMAND API to support media keyboards
+- fixed Alt key input not working
+- mpv.net API methods renamed to match the names used in the Lua/JS API
+
+### 1.4
+
+- the last thread sync fix wasn't working well, the delayed shutdown should be gone for good now
+- libmpv updated
+
+### 1.3
+
+- besides Lua/JavaScript/C#/Python there is now PowerShell supported as fifth scripting language
+
+- in case there isn't yet a mpv.conf file mpv.net creates the file with certain default settings that were previously set on every mpv.net start. This was changed to provide transparency on which settings mpv.net uses. These default settings can be seen here: https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/mpv.conf.txt
+
+### 1.2
+
+- a thread synchonisation bug which caused the shutdown to be delayed or frozen was fixed, it also caused the Shutdown event not to fire which caused the rating plugin not to work
+
 ### 1.1
 
 - added support for Python scripting via IronPython
@@ -58,29 +163,3 @@ class Script
 ### 1.0
 
 - much more feature packed context menu
-
-### 0.2.5
-
-- mpv lib updated to 2019-02-24
-- UI glitch fixed the appeared when started in fullscreen mode
-- fixed default video output mode which caused video playback to fail
-
-### 0.2.4
-
-- changed minimum runtime to .NET 4.7.2
-- fixed mpv.net not working with new mpv lib
-- the track name in the title bar was sometimes wrong
-- mpv lib updated to 2018-12-16
-- quit-watch-later added to context menu (Shift+Q) to exit and resume at the last position
-- ab loop added to menu
-- added the possibility to modify mpv.conf settings using the context menu
-- added link to the manual and default keys to the menu
-
-### 0.2.2
-
-- history feature added
-- mpv lib updated
-
-### 0.2.1
-
-- right-click in fullscreen in the right-left corner closes the app

RatingAddon/RatingAddon.cs

@@ -51,8 +51,8 @@ namespace RatingAddon
             if (args?.Length != 2 || args[0] != "rate-file" || ! int.TryParse(args[1], out rating))
                 return;
 
-            Dic[mp.GetStringProp("path")] = rating;
+            Dic[mp.get_property_string("path")] = rating;
-            mp.Command("show-text", $"Rating: {rating}");
+            mp.commandv("show-text", $"Rating: {rating}");
         }
     }
 }

mpv.net/Command.cs

@@ -62,24 +62,12 @@ namespace mpvnet
 
         public static void show_keys(string[] args)
         {
-            Process.Start(mp.InputConfPath);
+            Process.Start(NativeHelp.GetAssociatedApplication(".txt"), mp.InputConfPath);
-        }
-
-        private static void CreateMpvConf()
-        {
-            if (!File.Exists(mp.mpvConfPath))
-            {
-                if (!Directory.Exists(mp.mpvConfFolderPath))
-                    Directory.CreateDirectory(mp.mpvConfFolderPath);
-
-                File.WriteAllText(mp.mpvConfPath, "# https://mpv.io/manual/master/#configuration-files");
-            }
         }
 
         public static void show_prefs(string[] args)
         {
-            CreateMpvConf();
+            Process.Start(NativeHelp.GetAssociatedApplication(".txt"), mp.mpvConfPath);
-            Process.Start(mp.mpvConfPath);
         }
 
         public static void history(string[] args)
@@ -89,7 +77,7 @@ namespace mpvnet
             if (File.Exists(fp))
                 Process.Start(fp);
             else
-                if (MsgQuestion("Create history.txt file in config folder?\r\n\r\nmpv.net will write the date, time and filename of opened files to it.") == DialogResult.OK)
+                if (MsgQuestion("Create history.txt file in config folder?\n\nmpv.net will write the date, time and filename of opened files to it.") == DialogResult.OK)
                     File.WriteAllText(fp, "");
         }
 
@@ -100,8 +88,6 @@ namespace mpvnet
 
         public static void set_setting(string[] args)
         {
-            CreateMpvConf();
-
             bool changed = false;
             string fp = mp.mpvConfPath;
             var confLines = File.ReadAllLines(fp);
@@ -116,51 +102,67 @@ namespace mpvnet
             }
 
             if (changed)
-            {
                 File.WriteAllText(fp, String.Join(Environment.NewLine, confLines));
-            }
             else
-            {
+                File.WriteAllText(fp, File.ReadAllText(fp) + Environment.NewLine + args[0] + "=" + args[1]);
-                File.WriteAllText(fp,
-                    File.ReadAllText(fp) + Environment.NewLine + args[0] + "=" + args[1]);
-            }
 
             MsgInfo("Please restart mpv.net");
         }
 
         public static void show_info(string[] args)
         {
-            var fi = new FileInfo(mp.GetStringProp("path"));
+            var fileInfo = new FileInfo(mp.get_property_string("path"));
 
-            using (var mi = new MediaInfo(fi.FullName))
+            using (var mediaInfo = new MediaInfo(fileInfo.FullName))
             {
-                var w = mi.GetInfo(MediaInfoStreamKind.Video, "Width");
+                string width = mediaInfo.GetInfo(MediaInfoStreamKind.Video, "Width");
-                var h = mi.GetInfo(MediaInfoStreamKind.Video, "Height");
-                var pos = TimeSpan.FromSeconds(mp.GetIntProp("time-pos"));
-                var dur = TimeSpan.FromSeconds(mp.GetIntProp("duration"));
-                string mibr = mi.GetInfo(MediaInfoStreamKind.Video, "BitRate");
 
-                if (mibr == "")
+                if (width == "")
-                    mibr = "0";
+                {
+                    string performer = mediaInfo.GetInfo(MediaInfoStreamKind.General, "Performer");
+                    string title = mediaInfo.GetInfo(MediaInfoStreamKind.General, "Title");
+                    string album = mediaInfo.GetInfo(MediaInfoStreamKind.General, "Album");
+                    string genre = mediaInfo.GetInfo(MediaInfoStreamKind.General, "Genre");
+                    string date = mediaInfo.GetInfo(MediaInfoStreamKind.General, "Recorded_Date");
+                    string duration = mediaInfo.GetInfo(MediaInfoStreamKind.Audio, "Duration/String");
 
-                var br = Convert.ToInt32(mibr) / 1000.0 / 1000.0;
+                    string text = "";
-                var vf = mp.GetStringProp("video-format").ToUpper();
-                var fn = fi.Name;
 
-                if (fn.Length > 60)
+                    if (performer != "") text += "Artist: " + performer + "\n";
-                    fn = fn.Insert(59, "\r\n");
+                    if (title != "") text += "Title: " + title + "\n";
+                    if (album != "") text += "Album: " + album + "\n";
+                    if (genre != "") text += "Genre: " + genre + "\n";
+                    if (date != "") text += "Year: " + date + "\n";
+                    if (duration != "") text += "Length: " + duration + "\n";
 
-                var info =
+                    mp.commandv("show-text", text, "5000");
-                    FormatTime(pos.TotalMinutes) + ":" +
+                }
-                    FormatTime(pos.Seconds) + " / " +
+                else
-                    FormatTime(dur.TotalMinutes) + ":" +
+                {
-                    FormatTime(dur.Seconds) + "\n" +
+                    string height = mediaInfo.GetInfo(MediaInfoStreamKind.Video, "Height");
-                    ((int)(fi.Length / 1024 / 1024)).ToString() +
+                    TimeSpan position = TimeSpan.FromSeconds(mp.get_property_number("time-pos"));
-                    $" MB - {w} x {h}\n{vf} - {br.ToString("f1")} Mb/s" + "\n" + fn;
+                    TimeSpan duration = TimeSpan.FromSeconds(mp.get_property_number("duration"));
+                    string bitrate = mediaInfo.GetInfo(MediaInfoStreamKind.Video, "BitRate");
 
-                mp.Command("show-text", info, "5000");
+                    if (bitrate == "")
+                        bitrate = "0";
 
-                string FormatTime(double value) => ((int)(Math.Floor(value))).ToString("00");
+                    var bitrate2 = Convert.ToDouble(bitrate) / 1000.0 / 1000.0;
+                    var videoCodec = mp.get_property_string("video-format").ToUpper();
+                    var filename = fileInfo.Name;
+
+                    var text =
+                        FormatTime(position.TotalMinutes) + ":" +
+                        FormatTime(position.Seconds) + " / " +
+                        FormatTime(duration.TotalMinutes) + ":" +
+                        FormatTime(duration.Seconds) + "\n" +
+                        Convert.ToInt32(fileInfo.Length / 1024 / 1024).ToString() +
+                        $" MB - {width} x {height}\n{videoCodec} - {bitrate2.ToString("f1")} Mb/s" + "\n" + filename;
+
+                    mp.commandv("show-text", text, "5000");
+                }
+
+                string FormatTime(double value) => ((int)value).ToString("00");
             }
         }
     }

mpv.net/MainForm.Designer.cs

@@ -42,17 +42,16 @@
             // MainForm
             // 
             this.AllowDrop = true;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(288F, 288F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
             this.BackColor = System.Drawing.Color.Black;
-            this.ClientSize = new System.Drawing.Size(1553, 1000);
+            this.ClientSize = new System.Drawing.Size(1012, 615);
             this.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.Name = "MainForm";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "mpv.net";
-            this.Load += new System.EventHandler(this.MainForm_Load);
             this.ResumeLayout(false);
 
         }

mpv.net/MainForm.cs

@@ -4,8 +4,10 @@ using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading;
 using System.Windows.Forms;
-
+using System.Diagnostics;
 using static mpvnet.StaticUsing;
+using System.Linq;
+using System.Collections.Generic;
 
 namespace mpvnet
 {
@@ -16,7 +18,7 @@ namespace mpvnet
 
         private Point LastCursorPosChanged;
         private int LastCursorChangedTickCount;
-        private bool IsCloseRequired = true;
+        private bool IgnoreDpiChanged = true;
 
         public ContextMenuStripEx CMS;
 
@@ -27,31 +29,115 @@ namespace mpvnet
             try
             {
                 Application.ThreadException += Application_ThreadException;
-                SetFormPosSize();
                 Instance = this;
                 Hwnd = Handle;
-                ChangeFullscreen((mp.mpvConv.ContainsKey("fullscreen") && mp.mpvConv["fullscreen"] == "yes") || (mp.mpvConv.ContainsKey("fs") && mp.mpvConv["fs"] == "yes"));
+                Text += " " + Application.ProductVersion;
-                CMS = new ContextMenuStripEx(components);
+
-                CMS.Opened += CMS_Opened;
+                if (mp.mpvConf.ContainsKey("screen"))
-                ContextMenuStrip = CMS;
+                    SetScreen(Convert.ToInt32(mp.mpvConf["screen"]));
-                BuildMenu();
+                else
+                    SetScreen(Screen.PrimaryScreen);
+
+                ChangeFullscreen((mp.mpvConf.ContainsKey("fullscreen") && mp.mpvConf["fullscreen"] == "yes") ||
+                                 (mp.mpvConf.ContainsKey("fs") && mp.mpvConf["fs"] == "yes"));
+
+                ProcessCommandLineEarly();
             }
-            catch (Exception ex)
+            catch (Exception e)
             {
-                HandleException(ex);
+                MsgError(e.ToString());
+            }
+        }
+
+        protected void SetScreen(int targetIndex)
+        {
+            Screen[] screens = Screen.AllScreens;
+            if (targetIndex < 0 || targetIndex > screens.Length - 1) return;
+            SetScreen(screens[Array.IndexOf(screens, screens[targetIndex])]);
+        }
+
+        protected void SetScreen(Screen screen)
+        {
+            Rectangle target = screen.Bounds;
+            Left = target.X + Convert.ToInt32((target.Width - Width) / 2.0);
+            Top = target.Y + Convert.ToInt32((target.Height - Height) / 2.0);
+            SetStartFormPositionAndSize();
+        }
+
+        void SetStartFormPositionAndSize()
+        {
+            if (IsFullscreen || mp.VideoSize.Width == 0) return;
+            Screen screen = Screen.FromControl(this);
+            int height = Convert.ToInt32(screen.Bounds.Height * 0.6);
+            int width = Convert.ToInt32(height * mp.VideoSize.Width / (double)mp.VideoSize.Height);
+            Point middlePos = new Point(Left + Width / 2, Top + Height / 2);
+            var rect = new Native.RECT(new Rectangle(screen.Bounds.X, screen.Bounds.Y, width, height));
+            NativeHelp.AddWindowBorders(Handle, ref rect);
+            int left = middlePos.X - rect.Width / 2;
+            int top = middlePos.Y - rect.Height / 2;
+            Native.SetWindowPos(Handle, IntPtr.Zero /* HWND_TOP */, left, top, rect.Width, rect.Height, 4 /* SWP_NOZORDER */);
+        }
+
+        void SetFormPositionAndSizeKeepHeight()
+        {
+            if (IsFullscreen || mp.VideoSize.Width == 0) return;
+            Screen screen = Screen.FromControl(this);
+            int height = ClientSize.Height;
+            int width = Convert.ToInt32(height * mp.VideoSize.Width / (double)mp.VideoSize.Height);
+            Point middlePos = new Point(Left + Width / 2, Top + Height / 2);
+            var rect = new Native.RECT(new Rectangle(screen.Bounds.X, screen.Bounds.Y, width, height));
+            NativeHelp.AddWindowBorders(Handle, ref rect);
+            int left = middlePos.X - rect.Width / 2;
+            int top = middlePos.Y - rect.Height / 2;
+            Screen[] screens = Screen.AllScreens;
+
+            if (left < screens[0].Bounds.Left)
+                left = screens[0].Bounds.Left;
+
+            int maxLeft = screens[0].Bounds.Left + screens.Select((sc) => sc.Bounds.Width).Sum() - rect.Width - SystemInformation.CaptionHeight;
+
+            if (left > maxLeft)
+                left = maxLeft;
+
+            Native.SetWindowPos(Handle, IntPtr.Zero /* HWND_TOP */, left, top, rect.Width, rect.Height, 4 /* SWP_NOZORDER */);
+        }
+
+        protected 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);
+                        
+                        if (left == "screen")
+                            SetScreen(Convert.ToInt32(right));
+
+                        ChangeFullscreen((left == "fs" || left == "fullscreen") && right == "yes");
+                    }
+                    else
+                    {
+                        string switchName = i.Substring(2);
+
+                        switch (switchName)
+                        {
+                            case "fs":
+                            case "fullscreen":
+                                ChangeFullscreen(true);
+                                break;
+                        }
+                    }
+                }
             }
         }
 
         public void BuildMenu()
         {
-            if (!File.Exists(mp.InputConfPath))
-            {
-                if (!Directory.Exists(mp.mpvConfFolderPath))
-                    Directory.CreateDirectory(mp.mpvConfFolderPath);
-
-                File.WriteAllText(mp.InputConfPath, Properties.Resources.input_conf);
-            }
-
             foreach (var i in File.ReadAllText(mp.InputConfPath).SplitLinesNoEmpty())
             {
                 if (!i.Contains("#menu:"))
@@ -73,7 +159,7 @@ namespace mpvnet
                 var menuItem = CMS.Add(path, () => {
                     try
                     {
-                        mp.CommandString(cmd, false);
+                        mp.command_string(cmd);
                     }
                     catch (Exception e)
                     {
@@ -93,19 +179,25 @@ namespace mpvnet
 
         private string LastHistory;
 
-        private void mpv_PlaybackRestart()
+        private void mp_PlaybackRestart()
         {
-            var fn = mp.GetStringProp("filename");
+            var filename = mp.get_property_string("filename");
-            BeginInvoke(new Action(() => { Text = fn + " - mpv.net " + Application.ProductVersion; }));
+            BeginInvoke(new Action(() => { Text = filename + " - mpv.net " + Application.ProductVersion; }));
-            var fp = mp.mpvConfFolderPath + "history.txt";
+            var historyFilepath = mp.mpvConfFolderPath + "history.txt";
 
-            if (LastHistory != fn && File.Exists(fp))
+            if (LastHistory != filename && File.Exists(historyFilepath))
             {
-                File.AppendAllText(fp, DateTime.Now.ToString() + " " + Path.GetFileNameWithoutExtension(fn) + "\r\n");
+                File.AppendAllText(historyFilepath, DateTime.Now.ToString() + " " +
-                LastHistory = fn;
+                    Path.GetFileNameWithoutExtension(filename) + "\r\n");
+                LastHistory = filename;
             }
         }
 
+        private void Mp_Idle()
+        {
+            BeginInvoke(new Action(() => { Text = "mpv.net " + Application.ProductVersion; }));
+        }
+
         private void CM_Popup(object sender, EventArgs e)
         {
             CursorHelp.Show();
@@ -113,23 +205,17 @@ namespace mpvnet
 
         private void Application_ThreadException(object sender, ThreadExceptionEventArgs e)
         {
-            HandleException(e.Exception);
+            MsgError(e.Exception.ToString());
         }
 
-        void HandleException(Exception e)
+        private void mp_VideoSizeChanged()
         {
-            MsgError(e.ToString());
+            BeginInvoke(new Action(() => SetFormPositionAndSizeKeepHeight()));
         }
 
-        private void Mpv_VideoSizeChanged()
+        private void mp_Shutdown()
         {
-            BeginInvoke(new Action(() => SetFormPosSize()));
+            BeginInvoke(new Action(() => Close()));  
-        }
-
-        private void Mpv_AfterShutdown()
-        {
-            if (IsCloseRequired)
-                Invoke(new Action(() => Close()));
         }
 
         public bool IsFullscreen 
@@ -137,7 +223,7 @@ namespace mpvnet
             get => WindowState == FormWindowState.Maximized;
         }
 
-        void MpvChangeFullscreen(bool value)
+        void mp_ChangeFullscreen(bool value)
         {
             BeginInvoke(new Action(() => ChangeFullscreen(value)));
         }
@@ -145,15 +231,18 @@ namespace mpvnet
         void ChangeFullscreen(bool value)
         {
             if (value)
+            {
+                if (FormBorderStyle != FormBorderStyle.None)
                 {
                     FormBorderStyle = FormBorderStyle.None;
                     WindowState = FormWindowState.Maximized;
                 }
+            }
             else
             {
                 WindowState = FormWindowState.Normal;
                 FormBorderStyle = FormBorderStyle.Sizable;
-                SetFormPosSize();
+                SetFormPositionAndSizeKeepHeight();
             }
         }
 
@@ -169,9 +258,26 @@ namespace mpvnet
                     if (mp.MpvWindowHandle != IntPtr.Zero)
                         Native.SendMessage(mp.MpvWindowHandle, m.Msg, m.WParam, m.LParam);
                     break;
+                case 0x319: // WM_APPCOMMAND
+                    if (mp.MpvWindowHandle != IntPtr.Zero)
+                        Native.PostMessage(mp.MpvWindowHandle, m.Msg, m.WParam, m.LParam);
+                    break;
+                case 0x0104: // WM_SYSKEYDOWN:
+                    if (mp.MpvWindowHandle != IntPtr.Zero)
+                        Native.SendMessage(mp.MpvWindowHandle, m.Msg, m.WParam, m.LParam);
+                    break;
+                case 0x0105: // WM_SYSKEYUP:
+                    if (mp.MpvWindowHandle != IntPtr.Zero)
+                        Native.SendMessage(mp.MpvWindowHandle, m.Msg, m.WParam, m.LParam);
+                    break;
                 case 0x203: // Native.WM.LBUTTONDBLCLK
                     if (!IsMouseInOSC())
-                        mp.CommandString("cycle fullscreen");
+                        mp.command_string("cycle fullscreen");
+                    break;
+                case 0x02E0: // WM_DPICHANGED
+                    if (IgnoreDpiChanged) break;
+                    var r2 = Marshal.PtrToStructure<Native.RECT>(m.LParam);
+                    Native.SetWindowPos(Handle, IntPtr.Zero, r2.Left, r2.Top, r2.Width, r2.Height, 0);
                     break;
                 case 0x0214: // WM_SIZING
                     var rc = Marshal.PtrToStructure<Native.RECT>(m.LParam);
@@ -179,8 +285,8 @@ namespace mpvnet
                     NativeHelp.SubtractWindowBorders(Handle, ref r);
                     int c_w = r.Right - r.Left, c_h = r.Bottom - r.Top;
                     float aspect = mp.VideoSize.Width / (float)mp.VideoSize.Height;
-                    int d_w = (int)(c_h * aspect - c_w);
+                    int d_w = Convert.ToInt32(c_h * aspect - c_w);
-                    int d_h = (int)(c_w / aspect - c_h);
+                    int d_h = Convert.ToInt32(c_w / aspect - c_h);
                     int[] d_corners = { d_w, d_h, -d_w, -d_h };
                     int[] corners = { rc.Left, rc.Top, rc.Right, rc.Bottom };
                     int corner = NativeHelp.GetResizeBorder(m.WParam.ToInt32());
@@ -196,24 +302,6 @@ namespace mpvnet
             base.WndProc(ref m);
         }
 
-        void SetFormPosSize()
-        {
-            if (IsFullscreen || mp.VideoSize.Width == 0) return;
-            var wa = Screen.GetWorkingArea(this);
-            int h = (int)(wa.Height * 0.6);
-            int w = (int)(h * mp.VideoSize.Width / (float)mp.VideoSize.Height);
-            Point middlePos = new Point(Left + Width / 2, Top + Height / 2);
-            var r = new Native.RECT(new Rectangle(0, 0, w, h));
-            NativeHelp.AddWindowBorders(Handle, ref r);
-            int l = middlePos.X - r.Width / 2;
-            int t = middlePos.Y - r.Height / 2;
-            if (l < 0) l = 0;
-            if (t < 0) t = 0;
-            if (l + r.Width > wa.Width ) l = wa.Width - r.Width;
-            if (t + r.Height > wa.Height ) t = wa.Height - r.Height;
-            Native.SetWindowPos(Handle, IntPtr.Zero /* HWND_TOP */, l, t, r.Width, r.Height, 4 /* SWP_NOZORDER */);
-        }
-
         protected override void OnDragEnter(DragEventArgs e)
         {
             base.OnDragEnter(e);
@@ -234,7 +322,6 @@ namespace mpvnet
         {
             base.OnMouseDown(e);
 
-            // window-dragging
             if (WindowState == FormWindowState.Normal &&
                 e.Button == MouseButtons.Left &&
                 e.Y < ClientSize.Height * 0.9)
@@ -249,27 +336,18 @@ namespace mpvnet
             var p2 = PointToScreen(e.Location);
 
             if (Math.Abs(p1.X - p2.X) < 10 && Math.Abs(p1.Y - p2.Y) < 10)
-                mp.Command("quit");
+                mp.commandv("quit");
         }
 
         protected override void OnMouseMove(MouseEventArgs e)
         {
             base.OnMouseMove(e);
-
+            mp.command_string($"mouse {e.X} {e.Y}");
-            // send mouse command to make OSC show
-            mp.CommandString($"mouse {e.X} {e.Y}");
 
             if (CursorHelp.IsPosDifferent(LastCursorPosChanged))
                 CursorHelp.Show();
         }
 
-        protected override void OnFormClosed(FormClosedEventArgs e)
-        {
-            base.OnFormClosed(e);
-            IsCloseRequired = false;
-            mp.Command("quit");
-        }
-
         bool IsMouseInOSC()
         {
             return PointToClient(Control.MousePosition).Y > ClientSize.Height * 0.9;
@@ -290,13 +368,32 @@ namespace mpvnet
             }
         }
 
-        private void MainForm_Load(object sender, EventArgs ea)
+        protected override void OnLoad(EventArgs e)
         {
+            base.OnLoad(e);
             mp.Init();
-            mp.ObserveBoolProp("fullscreen", MpvChangeFullscreen);
+            mp.observe_property_bool("fullscreen", mp_ChangeFullscreen);
-            mp.Shutdown += Mpv_AfterShutdown;
+            mp.Shutdown += mp_Shutdown;
-            mp.VideoSizeChanged += Mpv_VideoSizeChanged;
+            mp.VideoSizeChanged += mp_VideoSizeChanged;
-            mp.PlaybackRestart += mpv_PlaybackRestart;
+            mp.PlaybackRestart += mp_PlaybackRestart;
+            mp.Idle += Mp_Idle;
+        }
+
+        protected override void OnShown(EventArgs e)
+        {
+            base.OnShown(e);
+            CMS = new ContextMenuStripEx(components);
+            CMS.Opened += CMS_Opened;
+            ContextMenuStrip = CMS;
+            BuildMenu();
+            IgnoreDpiChanged = false;
+        }
+
+        protected override void OnFormClosed(FormClosedEventArgs e)
+        {
+            base.OnFormClosed(e);
+            mp.commandv("quit");
+            mp.AutoResetEvent.WaitOne(3000); 
         }
     }
 }

mpv.net/Misc.cs

@@ -1,4 +1,5 @@
-using System.Collections;
+using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
@@ -43,4 +44,17 @@ namespace mpvnet
             return MessageBox.Show(message, Application.ProductName, MessageBoxButtons.OKCancel, MessageBoxIcon.Question);
         }
     }
+
+    //public class OSVersion
+    //{
+    //    public static float Windows7 { get; set; } = 6.1f;
+    //    public static float Windows8 { get; set; } = 6.2f;
+    //    public static float Windows81 { get; set; } = 6.3f;
+    //    public static float Windows10 { get; set; } = 10f;
+
+    //    public static float Current
+    //    {
+    //        get => Environment.OSVersion.Version.Major + Environment.OSVersion.Version.Minor / 10f;
+    //    }
+    //}
 }

mpv.net/Native.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Drawing;
+using System.IO;
 using System.Runtime.InteropServices;
+using System.Text;
 
 namespace mpvnet
 {
@@ -30,6 +32,9 @@ namespace mpvnet
         [DllImport("user32.dll", SetLastError = true)]
         public static extern bool SetWindowPos(IntPtr hWnd, IntPtr hWndInsertAfter, int X, int Y, int cx, int cy, int uFlags);
 
+        [DllImport("Shlwapi.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+        public static extern uint AssocQueryString(uint flags, uint str, string pszAssoc, string pszExtra, StringBuilder pszOut, ref uint pcchOut);
+
         [StructLayout(LayoutKind.Sequential)]
         public struct RECT
         {

mpv.net/NativeHelp.cs

@@ -1,4 +1,6 @@
 using System;
+using System.IO;
+using System.Text;
 
 namespace mpvnet
 {
@@ -34,5 +36,25 @@ namespace mpvnet
         {
             Native.AdjustWindowRect(ref rc, (uint)Native.GetWindowLongPtrW(hwnd, -16 /* GWL_STYLE */), false);
         }
+
+        public static string GetAssociatedApplication(string ext)
+        {
+            uint returnValue = 0U;
+            // ASSOCF_VERIFY, ASSOCSTR_EXECUTABLE
+            if (1 == Native.AssocQueryString(0x40, 2, ext, null, null, ref returnValue))
+            {
+                if (returnValue > 0)
+                {
+                    StringBuilder sb = new StringBuilder(Convert.ToInt32(returnValue));
+                    // ASSOCF_VERIFY, ASSOCSTR_EXECUTABLE
+                    if (0 == Native.AssocQueryString(0x40, 2, ext, null, sb, ref returnValue))
+                    {
+                        var ret = sb.ToString();
+                        if (File.Exists(ret)) return ret;
+                    }
+                }
+            }
+            return "";
+        }
     }
 }

mpv.net/PowerShellScript.cs

@@ -0,0 +1,129 @@
+using System;
+using System.IO;
+using System.Threading;
+using System.Management.Automation.Runspaces;
+
+using static mpvnet.StaticUsing;
+using System.Reflection;
+using System.Threading.Tasks;
+
+namespace mpvnet
+{
+    public class PowerShellScript
+    {
+        public static object Execute(string code, string[] parameters)
+        {
+            using (Runspace runspace = RunspaceFactory.CreateRunspace())
+            {
+                runspace.ApartmentState = ApartmentState.STA;
+                runspace.ThreadOptions = PSThreadOptions.UseCurrentThread;
+                runspace.Open();
+
+                using (Pipeline pipeline = runspace.CreatePipeline())
+                {
+                    pipeline.Commands.AddScript(
+@"Using namespace mpvnet;
+Using namespace System;
+[System.Reflection.Assembly]::LoadWithPartialName(""mpvnet"")");
+
+                    pipeline.Commands.AddScript(code);
+
+                    try
+                    {
+                        var ret = pipeline.Invoke(parameters);
+
+                        if (ret.Count > 0)
+                            return ret[0];
+                    }
+                    catch (Exception ex)
+                    {
+                        try
+                        {
+                            using (Pipeline pipeline2 = runspace.CreatePipeline())
+                            {
+                                pipeline2.Commands.AddScript("$PSVersionTable.PSVersion.Major * 10 +" +
+                                    "$PSVersionTable.PSVersion.Minor");
+
+                                if (Convert.ToInt32(pipeline2.Invoke()[0].ToString()) < 51)
+                                    throw new Exception();
+                            }
+                        }
+                        catch
+                        {
+                            MsgError("PowerShell Setup Problem\r\n\r\nEnsure you have at least PowerShell 5.1 installed.");
+                            return null;
+                        }
+                        MsgError(ex.ToString());
+                    }
+                }
+            }
+            return null;
+        }
+
+        public static void Init(string filePath)
+        {
+            foreach (var eventInfo in typeof(mp).GetEvents())
+            {
+                if (eventInfo.Name.ToLower() ==
+                    Path.GetFileNameWithoutExtension(filePath).ToLower().Replace("-", ""))
+                {
+                    PowerShellEventObject eventObject = new PowerShellEventObject();
+                    MethodInfo mi;
+                    eventObject.FilePath = filePath;
+
+                    if (eventInfo.EventHandlerType == typeof(Action))
+                    {
+                        mi = eventObject.GetType().GetMethod(nameof(PowerShellEventObject.Invoke));
+                    }
+                    else if (eventInfo.EventHandlerType == typeof(Action<EndFileEventMode>))
+                    {
+                        mi = eventObject.GetType().GetMethod(nameof(PowerShellEventObject.InvokeEndFileEventMode));
+                    }
+                    else if (eventInfo.EventHandlerType == typeof(Action<string[]>))
+                    {
+                        mi = eventObject.GetType().GetMethod(nameof(PowerShellEventObject.InvokeStrings));
+                    }
+                    else
+                        throw new Exception();
+
+                    eventObject.EventInfo = eventInfo;
+                    Delegate handler = Delegate.CreateDelegate(eventInfo.EventHandlerType, eventObject, mi);
+                    eventObject.Delegate = handler;
+                    eventInfo.AddEventHandler(eventObject, handler);
+                    return;
+                }
+            }
+            Task.Run(() =>
+            {
+                PowerShellScript.Execute(File.ReadAllText(filePath), new string[] {});
+            });
+        }
+    }
+
+    public class PowerShellEventObject
+    {
+        public EventInfo EventInfo { get; set; }
+        public Delegate Delegate { get; set; }
+        public string FilePath { get; set; }
+
+        public void Invoke()
+        {
+            Task.Run(() => { PowerShellScript.Execute(File.ReadAllText(FilePath), new string[] { }); });
+        }
+
+        public void InvokeEndFileEventMode(EndFileEventMode arg)
+        {
+            Task.Run(() =>
+            {
+                PowerShellScript.Execute(File.ReadAllText(FilePath), new string[] { arg.ToString() });
+            });
+        }
+
+        public void InvokeStrings(string[] args)
+        {
+            Task.Run(() => {
+                PowerShellScript.Execute(File.ReadAllText(FilePath), args);
+            });
+        }
+    }
+}

mpv.net/Properties/AssemblyInfo.cs

@@ -6,7 +6,7 @@ using System.Runtime.InteropServices;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("mpv.net")]
-[assembly: AssemblyDescription("mpv/libmpv based player with pure mpv experience")]
+[assembly: AssemblyDescription("libmpv based player with pure mpv experience")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("mpv.net")]
@@ -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("1.1.0.0")]
+[assembly: AssemblyVersion("1.7.0.0")]
-[assembly: AssemblyFileVersion("1.1.0.0")]
+[assembly: AssemblyFileVersion("1.7.0.0")]

mpv.net/Properties/Resources.Designer.cs

@@ -19,7 +19,7 @@ namespace mpvnet.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -61,11 +61,37 @@ namespace mpvnet.Properties {
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to  # mpv.net key bindings, mouse bindings and context menu configuration
+        /// 
+        /// o           script-message mpv.net open-files #menu: O  ; Open Files...
+        /// _           ignore                 #menu: _             ; -
+        /// Space       cycle pause            #menu: Space, Enter  ; Play/Pause
+        /// Enter       cycle pause
+        /// s           stop                   #menu: S             ; Stop
+        /// _           ignore                 #menu: _             ; -
+        /// f           cycle fullscreen       #menu: F             ; Toggle Fullscreen
        /// [rest of string was truncated]&quot;;.
         /// </summary>
         internal static string input_conf {
             get {
                 return ResourceManager.GetString("input_conf", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to input-ar-delay = 500
+        ///input-ar-rate = 20
+        ///volume = 50
+        ///hwdec = yes
+        ///vo = direct3d
+        ///keep-open = yes
+        ///keep-open-pause = no
+        ///osd-playing-msg = &apos;${filename}&apos;
+        ///screenshot-directory = ~~desktop/.
+        /// </summary>
+        internal static string mpv_conf {
+            get {
+                return ResourceManager.GetString("mpv_conf", resourceCulture);
+            }
+        }
     }
 }

mpv.net/Properties/Resources.resx

@@ -119,6 +119,9 @@
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="input_conf" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\input_conf.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+    <value>..\Resources\input.conf.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
+  <data name="mpv_conf" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\mpv.conf.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
 </root>

mpv.net/PyScript.cs

@@ -1,33 +0,0 @@
-using System;
-
-using IronPython.Hosting;
-using Microsoft.Scripting.Hosting;
-
-using static mpvnet.StaticUsing;
-
-namespace mpvnet
-{
-    public class PyScript
-    {
-        ScriptEngine engine;
-        ScriptScope scope;
-
-        public PyScript(string code)
-        {
-            try
-            {
-                engine = Python.CreateEngine();
-                scope = engine.CreateScope();
-                scope.ImportModule("clr");
-                engine.Execute("import clr", scope);
-                engine.Execute("clr.AddReference(\"mpvnet\")", scope);
-                engine.Execute("from mpvnet import *", scope);
-                engine.Execute(code, scope);
-            }
-            catch (Exception ex)
-            {
-                MsgError(ex.ToString());
-            }
-        }
-    }
-}

mpv.net/PythonScript.cs

@@ -0,0 +1,56 @@
+using System;
+using System.Reflection;
+using IronPython.Hosting;
+using Microsoft.Scripting.Hosting;
+
+using static mpvnet.StaticUsing;
+using PyRT = IronPython.Runtime;
+
+namespace mpvnet
+{
+    public class PythonScript
+    {
+        ScriptEngine engine;
+        ScriptScope scope;
+
+        public PythonScript(string code)
+        {
+            try
+            {
+                engine = Python.CreateEngine();
+                scope = engine.CreateScope();
+                scope.ImportModule("clr");
+                engine.Execute("import clr", scope);
+                engine.Execute("clr.AddReference(\"mpvnet\")", scope);
+                engine.Execute("from mpvnet import *", scope);
+                engine.Execute(code, scope);
+            }
+            catch (Exception ex)
+            {
+                MsgError(ex.ToString());
+            }
+        }
+    }
+
+    public class PythonEventObject
+    {
+        public PyRT.PythonFunction PythonFunction { get; set; }
+        public EventInfo EventInfo { get; set; }
+        public Delegate Delegate { get; set; }
+
+        public void Invoke()
+        {
+            PyRT.Operations.PythonCalls.Call(PythonFunction);
+        }
+
+        public void InvokeEndFileEventMode(EndFileEventMode arg)
+        {
+            PyRT.Operations.PythonCalls.Call(PythonFunction, new[] { arg });
+        }
+
+        public void InvokeStrings(string[] arg)
+        {
+            PyRT.Operations.PythonCalls.Call(PythonFunction, new[] { arg });
+        }
+    }
+}

mpv.net/Resources/input.conf.txt

@@ -29,16 +29,16 @@
  Ctrl++      add video-zoom  0.1    #menu: Ctrl++        ; Pan && Scan > Increase Size
  Ctrl+-      add video-zoom -0.1    #menu: Ctrl+-        ; Pan && Scan > Decrease Size
  _           ignore                 #menu: _             ; Pan && Scan > -
- Shift+Left  add video-pan-x -0.01  #menu: Shift+Left    ; Pan && Scan > Move Left
+ Ctrl+KP4    add video-pan-x -0.01  #menu: Ctrl+Numpad 4 ; Pan && Scan > Move Left
- Shift+Right add video-pan-x  0.01  #menu: Shift+Right   ; Pan && Scan > Move Right
+ Ctrl+KP6    add video-pan-x  0.01  #menu: Ctrl+Numpad 6 ; Pan && Scan > Move Right
  _           ignore                 #menu: _             ; Pan && Scan > -
- Shift+Up    add video-pan-y -0.01  #menu: Shift+Up      ; Pan && Scan > Move Up
+ Ctrl+KP8    add video-pan-y -0.01  #menu: Ctrl+Numpad 8 ; Pan && Scan > Move Up
- Shift+Down  add video-pan-y  0.01  #menu: Shift+Down    ; Pan && Scan > Move Down
+ Ctrl+KP2    add video-pan-y  0.01  #menu: Ctrl+Numpad 2 ; Pan && Scan > Move Down
  _           ignore                 #menu: _             ; Pan && Scan > -
  w           add panscan -0.1       #menu: W             ; Pan && Scan > Decrease Height
  W           add panscan +0.1       #menu: Shift+W       ; Pan && Scan > Increase Height
  _           ignore                 #menu: _             ; Pan && Scan > -
- Shift+BS    set video-zoom 0 ; set video-pan-x 0 ; set video-pan-y 0 #menu: Alt+Backspace ; Pan && Scan > Reset
+ Ctrl+BS    set video-zoom 0 ; set video-pan-x 0 ; set video-pan-y 0 #menu: Ctrl+Backspace ; Pan && Scan > Reset
  
  Ctrl+1      add contrast -1        #menu: Ctrl+1        ; Video > Decrease Contrast
  Ctrl+2      add contrast 1         #menu: Ctrl+2        ; Video > Increase Contrast
@@ -74,7 +74,6 @@
  _           ignore                 #menu: _             ; Subtitle > -
  _           add sub-scale -0.1     #menu: _             ; Subtitle > Decrease Subtitle Font Size
  _           add sub-scale +0.1     #menu: _             ; Subtitle > Increase Subtitle Font Size
- _           ignore                 #menu: _             ; Subtitle > -
 
  +           add volume  10         #menu: +             ; Volume > Up
  -           add volume -10         #menu: -             ; Volume > Down
@@ -104,7 +103,7 @@
  k script-message mpv.net show-keys             #menu: K ; Settings > Show Keys
  c script-message mpv.net open-config-folder    #menu: C ; Settings > Open Config Folder
  
- i show-progress ; script-message mpv.net show-info #menu: I       ; Tools | Info
+ i script-message mpv.net show-info                 #menu: I       ; Tools | Info
  t script-binding stats/display-stats               #menu: T       ; Tools > Show Statistics
  T script-binding stats/display-stats-toggle        #menu: Shift+T ; Tools > Toggle Statistics
  _ ignore                                           #menu: _       ; Tools > -
@@ -116,9 +115,10 @@
  F8 show-text ${playlist}   5000                    #menu: F8      ; Tools > Show Playlist
  F9 show-text ${track-list} 5000                    #menu: F9      ; Tools > Show Audio/Video/Subtitle List
 
- _ script-message mpv.net shell-execute https://mpv.io/manual/stable/ #menu: _ ; Tools > Web > Show mpv manual
+ _ 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/mpv-player/mpv/blob/master/etc/input.conf #menu: _ ; Tools > Web > Show mpv default keys
+ _ 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/mpvnet #menu: _ ; Tools > Web > Show mpv.net web site
+ _ script-message mpv.net shell-execute https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/input.conf.txt #menu: _ ; Help > Show mpv.net default keys
+ _ script-message mpv.net shell-execute https://github.com/stax76/mpvnet #menu: _ ; Help > Show mpv.net web site
  _ ignore                                       #menu: _       ; -
  Esc quit                                       #menu: Escape  ; Exit
  Q quit-watch-later                             #menu: Shift+Q ; Exit Watch Later
@@ -136,5 +136,3 @@
  VOLUME_UP add volume 2
  VOLUME_DOWN add volume -2
  MUTE cycle mute
- CLOSE_WIN quit
- CLOSE_WIN {encode} quit 4

mpv.net/Resources/mpv.conf.txt

@@ -0,0 +1,11 @@
+# https://mpv.io/manual/master/
+
+input-ar-delay = 500
+input-ar-rate = 20
+volume = 50
+hwdec = yes
+vo = direct3d
+keep-open = yes
+keep-open-pause = no
+osd-playing-msg = ${filename}
+screenshot-directory = ~~desktop/

mpv.net/app.manifest

@@ -25,7 +25,9 @@
   </compatibility>
   <application>
     <windowsSettings>
+      <longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true</longPathAware>
       <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
     </windowsSettings>
   </application>
   <dependency>

mpv.net/mp.cs

@@ -7,6 +7,7 @@ using System.Linq;
 using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
@@ -60,49 +61,45 @@ namespace mpvnet
         public static string mpvConfFolderPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\mpv\\";
         public static string InputConfPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\mpv\\input.conf";
         public static string mpvConfPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\mpv\\mpv.conf";
-        public static List<PyScript> PyScripts { get; } = new List<PyScript>();
+        public static List<PythonScript> PythonScripts { get; } = new List<PythonScript>();
+        public static AutoResetEvent AutoResetEvent = new AutoResetEvent(false);
 
-        private static Dictionary<string, string> _mpvConv;
+        private static Dictionary<string, string> _mpvConf;
 
-        public static Dictionary<string, string> mpvConv {
+        public static Dictionary<string, string> mpvConf {
             get {
-                if (_mpvConv == null)
+                if (_mpvConf == null)
                 {
-                    _mpvConv = new Dictionary<string, string>();
+                    _mpvConf = new Dictionary<string, string>();
 
                     if (File.Exists(mpvConfPath))
-                    {
                         foreach (var i in File.ReadAllLines(mpvConfPath))
-                        {
                             if (i.Contains("=") && ! i.StartsWith("#"))
-                            {
+                                _mpvConf[i.Left("=").Trim()] = i.Right("=").Trim();
-                                _mpvConv[i.Left("=").Trim()] = i.Right("=").Trim();
                 }
-                        }
+                return _mpvConf;
-                    }
-                }
-                return _mpvConv;
             }
         }
 
         public static void Init()
         {
+            if (!Directory.Exists(mp.mpvConfFolderPath))
+                Directory.CreateDirectory(mp.mpvConfFolderPath);
+
+            if (!File.Exists(mp.mpvConfPath))
+                File.WriteAllText(mp.mpvConfPath, Properties.Resources.mpv_conf);
+
+            if (!File.Exists(mp.InputConfPath))
+                File.WriteAllText(mp.InputConfPath, Properties.Resources.input_conf);
+
             LoadLibrary("mpv-1.dll");
             MpvHandle = mpv_create();
-            SetIntProp("input-ar-delay", 500);
+            set_property_string("input-default-bindings", "yes");
-            SetIntProp("input-ar-rate", 20);
+            set_property_string("osc", "yes");
-            SetIntProp("volume", 50);
+            set_property_string("config", "yes");
-            SetStringProp("hwdec", "yes");
+            set_property_string("wid", MainForm.Hwnd.ToString());
-            SetStringProp("vo", "direct3d");
+            set_property_string("force-window", "yes");
-            SetStringProp("input-default-bindings", "yes");
+            set_property_string("input-media-keys", "yes");
-            SetStringProp("osd-playing-msg", "'${filename}'");
-            SetStringProp("screenshot-directory", "~~desktop/");
-            SetStringProp("keep-open", "yes");
-            SetStringProp("keep-open-pause", "no");
-            SetStringProp("osc", "yes");
-            SetStringProp("config", "yes");
-            SetStringProp("wid", MainForm.Hwnd.ToString());
-            SetStringProp("force-window", "yes");
             mpv_initialize(MpvHandle);
             ProcessCommandLine();
             Task.Run(() => { LoadScripts(); });
@@ -117,14 +114,23 @@ namespace mpvnet
 
             foreach (var scriptPath in startupScripts)
                 if (jsLua.Contains(Path.GetExtension(scriptPath).ToLower()))
-                    mp.Command("load-script", $"{scriptPath}");
+                    mp.commandv("load-script", $"{scriptPath}");
 
             foreach (var scriptPath in startupScripts)
                 if (Path.GetExtension(scriptPath) == ".py")
-                    PyScripts.Add(new PyScript(File.ReadAllText(scriptPath)));
+                    PythonScripts.Add(new PythonScript(File.ReadAllText(scriptPath)));
 
-            foreach(var scriptPath in Directory.GetFiles(mp.mpvConfFolderPath + "scripts", "*.py"))
+            foreach (var scriptPath in startupScripts)
-                PyScripts.Add(new PyScript(File.ReadAllText(scriptPath)));
+                if (Path.GetExtension(scriptPath) == ".ps1")
+                    PowerShellScript.Init(scriptPath);
+
+            foreach (var scriptPath in Directory.GetFiles(mp.mpvConfFolderPath + "Scripts"))
+            {
+                if (Path.GetExtension(scriptPath) == ".py")
+                    PythonScripts.Add(new PythonScript(File.ReadAllText(scriptPath)));
+                else if (Path.GetExtension(scriptPath) == ".ps1")
+                    PowerShellScript.Init(scriptPath);
+            }
         }
 
         public static void EventLoop()
@@ -133,15 +139,17 @@ namespace mpvnet
             {
                 IntPtr ptr = mpv_wait_event(MpvHandle, -1);
                 mpv_event evt = (mpv_event)Marshal.PtrToStructure(ptr, typeof(mpv_event));
-                //Debug.WriteLine(evt.event_id);
 
                 if (MpvWindowHandle == IntPtr.Zero)
                     MpvWindowHandle = FindWindowEx(MainForm.Hwnd, IntPtr.Zero, "mpv", null);
 
+                //Debug.WriteLine(evt.event_id.ToString());
+
                 switch (evt.event_id)
                 {
                     case mpv_event_id.MPV_EVENT_SHUTDOWN:
                         Shutdown?.Invoke();
+                        AutoResetEvent.Set();
                         return;
                     case mpv_event_id.MPV_EVENT_LOG_MESSAGE:
                         LogMessage?.Invoke();
@@ -229,7 +237,7 @@ namespace mpvnet
                         break;
                     case mpv_event_id.MPV_EVENT_PLAYBACK_RESTART:
                         PlaybackRestart?.Invoke();
-                        Size s = new Size(GetIntProp("dwidth", false), GetIntProp("dheight", false));
+                        Size s = new Size(get_property_int("dwidth"), get_property_int("dheight"));
 
                         if (VideoSize != s && s != Size.Empty)
                         {
@@ -250,29 +258,7 @@ namespace mpvnet
             }
         }
 
-        public class EventObject
+        private static List<PythonEventObject> PythonEventObjects = new List<PythonEventObject>();
-        {
-            public PyRT.PythonFunction PythonFunction { get; set; }
-            public EventInfo EventInfo { get; set; }
-            public Delegate Delegate { get; set; }
-
-            public void Invoke()
-            {
-                PyRT.Operations.PythonCalls.Call(PythonFunction);
-            }
-
-            public void InvokeEndFileEventMode(EndFileEventMode arg)
-            {
-                PyRT.Operations.PythonCalls.Call(PythonFunction, new[] { arg });
-            }
-
-            public void InvokeStrings(string[] arg)
-            {
-                PyRT.Operations.PythonCalls.Call(PythonFunction, new[] { arg });
-            }
-        }
-
-        private static List<EventObject> EventObjects = new List<EventObject>();
 
         public static void register_event(string name, PyRT.PythonFunction pyFunc)
         {
@@ -280,22 +266,22 @@ namespace mpvnet
             {
                 if (eventInfo.Name.ToLower() == name.Replace("-", ""))
                 {
-                    EventObject eventObject = new EventObject();
+                    PythonEventObject eventObject = new PythonEventObject();
-                    EventObjects.Add(eventObject);
+                    PythonEventObjects.Add(eventObject);
                     eventObject.PythonFunction = pyFunc;
                     MethodInfo mi;
 
                     if (eventInfo.EventHandlerType == typeof(Action))
                     {
-                        mi = eventObject.GetType().GetMethod(nameof(EventObject.Invoke));
+                        mi = eventObject.GetType().GetMethod(nameof(PythonEventObject.Invoke));
                     }
                     else if (eventInfo.EventHandlerType == typeof(Action<EndFileEventMode>))
                     {
-                        mi = eventObject.GetType().GetMethod(nameof(EventObject.InvokeEndFileEventMode));
+                        mi = eventObject.GetType().GetMethod(nameof(PythonEventObject.InvokeEndFileEventMode));
                     }
                     else if (eventInfo.EventHandlerType == typeof(Action<string[]>))
                     {
-                        mi = eventObject.GetType().GetMethod(nameof(EventObject.InvokeStrings));
+                        mi = eventObject.GetType().GetMethod(nameof(PythonEventObject.InvokeStrings));
                     }
                     else
                         throw new Exception();
@@ -304,23 +290,19 @@ namespace mpvnet
                     Delegate handler = Delegate.CreateDelegate(eventInfo.EventHandlerType, eventObject, mi);
                     eventObject.Delegate = handler;
                     eventInfo.AddEventHandler(eventObject, handler);
+                    break;
                 }
             }
         }
 
         public static void unregister_event(PyRT.PythonFunction pyFunc)
         {
-            foreach (var eventObjects in EventObjects)
+            foreach (var eventObjects in PythonEventObjects)
                 if (eventObjects.PythonFunction == pyFunc)
                     eventObjects.EventInfo.RemoveEventHandler(eventObjects, eventObjects.Delegate);
         }
 
         public static void commandv(params string[] args)
-        {
-            Command(args);
-        }
-
-        public static void Command(params string[] args)
         {
             if (MpvHandle == IntPtr.Zero)
                 return;
@@ -338,7 +320,7 @@ namespace mpvnet
             Marshal.FreeHGlobal(mainPtr);
         }
 
-        public static void CommandString(string command, bool throwException = true)
+        public static void command_string(string command, bool throwException = false)
         {
             if (MpvHandle == IntPtr.Zero)
                 return;
@@ -349,21 +331,21 @@ namespace mpvnet
                 throw new Exception($"{(mpv_error)err}\r\n\r\n" + command);
         }
 
-        public static void SetStringProp(string name, string value, bool throwException = true)
+        public static void set_property_string(string name, string value, bool throwOnException = false)
         {
             var bytes = GetUtf8Bytes(value);
             int err = mpv_set_property(MpvHandle, GetUtf8Bytes(name), mpv_format.MPV_FORMAT_STRING, ref bytes);
 
-            if (err < 0 && throwException)
+            if (err < 0 && throwOnException)
                 throw new Exception($"{name}: {(mpv_error)err}");
         }
 
-        public static string GetStringProp(string name)
+        public static string get_property_string(string name, bool throwOnException = false)
         {
             var lpBuffer = IntPtr.Zero;
             int err = mpv_get_property(MpvHandle, GetUtf8Bytes(name), mpv_format.MPV_FORMAT_STRING, ref lpBuffer);
 
-            if (err < 0)
+            if (err < 0 && throwOnException)
                 throw new Exception($"{name}: {(mpv_error)err}");
 
             var ret = StringFromNativeUtf8(lpBuffer);
@@ -372,43 +354,49 @@ namespace mpvnet
             return ret;
         }
 
-        public static int GetIntProp(string name, bool throwException = true)
+        public static int get_property_int(string name, bool throwOnException = false)
         {
             var lpBuffer = IntPtr.Zero;
             int err = mpv_get_property(MpvHandle, GetUtf8Bytes(name), mpv_format.MPV_FORMAT_INT64, ref lpBuffer);
 
-            if (err < 0 && throwException)
+            if (err < 0 && throwOnException)
                 throw new Exception($"{name}: {(mpv_error)err}");
             else
                 return lpBuffer.ToInt32();
         }
 
-        public static double get_property_number(string name)
+        public static double get_property_number(string name, bool throwOnException = false)
-        {
-            return GetDoubleProp(name);
-        }
-
-        public static double GetDoubleProp(string name, bool throwException = true)
         {
             double val = 0;
             int err = mpv_get_property(MpvHandle, GetUtf8Bytes(name), mpv_format.MPV_FORMAT_DOUBLE, ref val);
 
-            if (err < 0 && throwException)
+            if (err < 0 && throwOnException)
                 throw new Exception($"{name}: {(mpv_error)err}");
             else
                 return val;
         }
 
-        public static void SetIntProp(string name, int value)
+        public static bool get_property_bool(string name, bool throwOnException = false)
+        {
+            var lpBuffer = IntPtr.Zero;
+            int err = mpv_get_property(MpvHandle, GetUtf8Bytes(name), mpv_format.MPV_FORMAT_FLAG, ref lpBuffer);
+
+            if (err < 0 && throwOnException)
+                throw new Exception($"{name}: {(mpv_error)err}");
+            else
+                return lpBuffer.ToInt32() == 1;
+        }
+
+        public static void set_property_int(string name, int value, bool throwOnException = false)
         {
             Int64 val = value;
             int err = mpv_set_property(MpvHandle, GetUtf8Bytes(name), mpv_format.MPV_FORMAT_INT64, ref val);
 
-            if (err < 0)
+            if (err < 0 && throwOnException)
                 throw new Exception($"{name}: {(mpv_error)err}");
         }
 
-        public static void ObserveBoolProp(string name, Action<bool> action)
+        public static void observe_property_bool(string name, Action<bool> action)
         {
             int err = mpv_observe_property(MpvHandle, (ulong)action.GetHashCode(), name, mpv_format.MPV_FORMAT_FLAG);
 
@@ -418,7 +406,7 @@ namespace mpvnet
                 BoolPropChangeActions.Add(new KeyValuePair<string, Action<bool>>(name, action));
         }
 
-        public static void UnobserveBoolProp(string name, Action<bool> action)
+        public static void unobserve_property_bool(string name, Action<bool> action)
         {
             foreach (var i in BoolPropChangeActions.ToArray())
                 if (i.Value == action)
@@ -430,15 +418,15 @@ namespace mpvnet
                 throw new Exception($"{name}: {(mpv_error)err}");
         }
 
-        public static void ProcessCommandLine()
+        protected static void ProcessCommandLine()
         {
             var args = Environment.GetCommandLineArgs().Skip(1);
 
             foreach (string i in args)
                 if (!i.StartsWith("--") && File.Exists(i))
-                    mp.Command("loadfile", i, "append");
+                    mp.commandv("loadfile", i, "append");
 
-            mp.SetStringProp("playlist-pos", "0", false);
+            mp.set_property_string("playlist-pos", "0");
 
             foreach (string i in args)
             {
@@ -448,25 +436,25 @@ namespace mpvnet
                     {
                         string left = i.Substring(2, i.IndexOf("=") - 2);
                         string right = i.Substring(left.Length + 3);
-                        mp.SetStringProp(left, right);
+                        mp.set_property_string(left, right);
                     }
                     else
-                        mp.SetStringProp(i.Substring(2), "yes");
+                        mp.set_property_string(i.Substring(2), "yes");
                 }
             }
         }
 
         public static void LoadFiles(string[] files)
         {
-            int count = mp.GetIntProp("playlist-count");
+            int count = mp.get_property_int("playlist-count");
 
             foreach (string file in files)
-                mp.Command("loadfile", file, "append");
+                mp.commandv("loadfile", file, "append");
 
-            mp.SetIntProp("playlist-pos", count);
+            mp.set_property_int("playlist-pos", count);
 
             for (int i = 0; i < count; i++)
-                mp.Command("playlist-remove", "0");
+                mp.commandv("playlist-remove", "0");
 
             mp.LoadFolder();
         }
@@ -478,10 +466,10 @@ namespace mpvnet
             if (WasFolderLoaded)
                 return;
 
-            if (GetIntProp("playlist-count") == 1)
+            if (get_property_int("playlist-count") == 1)
             {
                 string[] types = "264 265 3gp aac ac3 avc avi avs bmp divx dts dtshd dtshr dtsma eac3 evo flac flv h264 h265 hevc hvc jpg jpeg m2t m2ts m2v m4a m4v mka mkv mlp mov mp2 mp3 mp4 mpa mpeg mpg mpv mts ogg ogm opus pcm png pva raw rmvb thd thd+ac3 true-hd truehd ts vdr vob vpy w64 wav webm wmv y4m".Split(' ');
-                string path = GetStringProp("path");
+                string path = get_property_string("path");
                 List<string> files = Directory.GetFiles(Path.GetDirectoryName(path)).ToList();
                 files = files.Where((file) => types.Contains(file.Ext())).ToList();
                 files.Sort(new StringLogicalComparer());
@@ -489,10 +477,10 @@ namespace mpvnet
                 files.Remove(path);
 
                 foreach (string i in files)
-                    Command("loadfile", i, "append");
+                    commandv("loadfile", i, "append");
 
                 if (index > 0)
-                    Command("playlist-move", "0", (index + 1).ToString());
+                    commandv("playlist-move", "0", (index + 1).ToString());
             }
 
             WasFolderLoaded = true;

mpv.net/mpv.net.csproj

@@ -122,6 +122,9 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.PowerShell.5.ReferenceAssemblies.1.1.0\lib\net4\System.Management.Automation.dll</HintPath>
+    </Reference>
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
   </ItemGroup>
@@ -132,7 +135,13 @@
     <Compile Include="Menu.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="PyScript.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="PowerShellScript.cs" />
+    <Compile Include="PythonScript.cs" />
     <Compile Include="StringExtensions.cs" />
     <Compile Include="libmpv.cs" />
     <Compile Include="MainForm.cs">
@@ -155,15 +164,11 @@
     </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
       <SubType>Designer</SubType>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-    </Compile>
     <None Include="app.manifest" />
+    <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -173,6 +178,7 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
+    <Content Include="Resources\mpv.conf.txt" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
@@ -180,7 +186,7 @@
   <ItemGroup>
     <Content Include="mpv.ico" />
     <Content Include="screenshot.jpg" />
-    <None Include="Resources\input_conf.txt" />
+    <Content Include="Resources\input.conf.txt" />
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

mpv.net/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.PowerShell.5.ReferenceAssemblies" version="1.1.0" targetFramework="net472" />
+</packages>

release.ps1

@@ -3,10 +3,8 @@ $exePath = $scriptDir + "\mpv.net\bin\Debug\mpvnet.exe"
 $version = [Diagnostics.FileVersionInfo]::GetVersionInfo($exePath).FileVersion
 $desktopDir = [Environment]::GetFolderPath("Desktop")
 $targetDir = $desktopDir + "\mpv.net-" + $version
-if (Test-Path $targetDir) { rd $targetDir -recurse }
 Copy-Item $scriptDir\mpv.net\bin\Debug $targetDir -recurse
-$addonDir = $targetDir + "\Addons"
+copy-item $scriptDir\README.md $targetDir\README.md
-Remove-Item $addonDir -Recurse -Include *mpvnet.exe, *mpvnet.exe.config, *mpvnet.pdb
 $7zPath = "C:\Program Files\7-Zip\7z.exe"
 $args = "a -t7z -mx9 $targetDir.7z -r $targetDir\*"
 Start-Process -FilePath $7zPath -ArgumentList $args