-

CSScriptAddon/CSScriptAddon.vb

@@ -11,7 +11,7 @@ Public Class CSScriptAddon
     Implements IAddon
 
     Sub New()
-        Dim scriptDir = mpv.mpvConfFolderPath + "scripts"
+        Dim scriptDir = mp.mpvConfFolderPath + "scripts"
         If Not Directory.Exists(scriptDir) Then Return
         Dim csFiles = Directory.GetFiles(scriptDir, "*.cs")
         If csFiles.Count = 0 Then Return

CSScriptAddon/CSScriptAddon.vbproj

@@ -52,11 +52,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>.\CSScriptLibrary.dll</HintPath>
     </Reference>
-    <Reference Include="mpvnet, Version=0.2.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\mpv.net\bin\Debug\mpvnet.exe</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Data" />
@@ -117,5 +112,12 @@
   <ItemGroup>
     <Content Include="CSScriptLibrary.dll" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\mpv.net\mpv.net.csproj">
+      <Project>{1751f378-8edf-4b62-be6d-304c7c287089}</Project>
+      <Name>mpv.net</Name>
+      <Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
 </Project>

CSScriptAddon/My Project/AssemblyInfo.vb

@@ -8,11 +8,11 @@ Imports System.Runtime.InteropServices
 
 ' Review the values of the assembly attributes
 
-<Assembly: AssemblyTitle("PowerShellAddon")>
+<Assembly: AssemblyTitle("CSScriptAddon")>
 <Assembly: AssemblyDescription("")>
 <Assembly: AssemblyCompany("")>
-<Assembly: AssemblyProduct("PowerShellAddon")>
-<Assembly: AssemblyCopyright("Copyright ©  2017")>
+<Assembly: AssemblyProduct("CSScriptAddon")>
+<Assembly: AssemblyCopyright("Copyright ©  2019")>
 <Assembly: AssemblyTrademark("")>
 
 <Assembly: ComVisible(False)>

README.md

@@ -8,12 +8,13 @@ mpv manual: https://mpv.io/manual/master/
 
 ### Features
 
-- mpv's OSC, IPC, Lua/JS, conf files and more
 - Customizable context menu defined in the same file as the keybindings
-- Addons support for using .NET languages
-- C# scripts implemented with CS-Script
+- Addon API for .NET languages
+- 5 different scripting languages are supported, Python scripting implemented with IronPython, C# implemented with CS-Script, Lua and JavaScript implemented in libmpv and PowerShell
+- C# scripting implemented with CS-Script
+- mpv's OSC, IPC, Lua/JS, conf files and more
 
-![](https://github.com/stax76/mpv.net/blob/master/mpv.net/screenshot.jpg)
+![](https://raw.githubusercontent.com/stax76/mpv.net/master/screenshot.png)
 
 ### Context Menu
 
@@ -27,7 +28,13 @@ https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/input_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\Frank\AppData\Roaming\mpv\scripts\test.cs
+
+or
+
+startup\scripts\test.cs
 
 ```
 using mpvnet;
@@ -48,8 +55,79 @@ class Script
 }
 ```
 
+### Python Scripting
+
+A simple Python script located at:
+
+C:\Users\user\AppData\Roaming\mpv\scripts
+
+or
+
+startup\scripts
+
+```
+# 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
+
+or
+
+startup\scripts
+
+Please note that PowerShell don't allow assigning to events and mpv.net uses as workaround the script filename.
+
+```
+$position = [mp]::get_property_number("time-pos");
+[mp]::commandv("show-text", $position.ToString() + " seconds")
+```
+
 ### Changes
 
+### 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
+- show tracks and show playlist didn't work because the duration wasn't defined in the key bindings
+
 ### 1.0
 
 - much more feature packed context menu

RatingAddon/RatingAddon.cs

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

RatingAddon/RatingAddon.csproj

@@ -67,10 +67,6 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="mpvnet">
-      <HintPath>..\mpv.net\bin\Debug\mpvnet.exe</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Core" />
@@ -85,5 +81,12 @@
     <Compile Include="RatingAddon.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\mpv.net\mpv.net.csproj">
+      <Project>{1751f378-8edf-4b62-be6d-304c7c287089}</Project>
+      <Name>mpv.net</Name>
+      <Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

Scripts/seek-show-position.js

@@ -1,31 +0,0 @@
-// when seeking displays position and
-// duration like so: 00:00 / 120:00
-// this is different from MPC which
-// uses 00:00:00 / 02:00:00
-
-function add_zero(val)
-{
-    val = Math.round(val);
-    return val > 9 ? "" + val : "0" + val;
-}
-
-function format(val)
-{
-    var sec = Math.round(val);
-
-    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);
-}
-
-function on_seek(_)
-{
-    mp.commandv("show-text",
-                format(mp.get_property_number("time-pos")) + " / " +
-                format(mp.get_property_number("duration")));
-}
-
-mp.register_event("seek", on_seek);

mpv.net.sln

@@ -4,10 +4,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 VisualStudioVersion = 15.0.26730.8
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mpv.net", "mpv.net\mpv.net.csproj", "{1751F378-8EDF-4B62-BE6D-304C7C287089}"
-	ProjectSection(ProjectDependencies) = postProject
-		{55C88710-539D-4402-84C8-31694841C731} = {55C88710-539D-4402-84C8-31694841C731}
-		{71808A87-8B1C-4DF8-957C-D79C3B164CCA} = {71808A87-8B1C-4DF8-957C-D79C3B164CCA}
-	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RatingAddon", "RatingAddon\RatingAddon.csproj", "{55C88710-539D-4402-84C8-31694841C731}"
 EndProject

mpv.net/Addon.cs

@@ -28,7 +28,7 @@ namespace mpvnet
                     foreach (string i in Directory.GetDirectories(dir))
                         catalog.Catalogs.Add(new DirectoryCatalog(i, "*Addon.dll"));
 
-                dir = mpv.mpvConfFolderPath + "\\Addons";
+                dir = mp.mpvConfFolderPath + "\\Addons";
 
                 if (Directory.Exists(dir))
                     foreach (string i in Directory.GetDirectories(dir))

mpv.net/Command.cs

@@ -50,41 +50,41 @@ namespace mpvnet
                     d.Filter = Misc.GetFilter(Misc.FileTypes);
 
                     if (d.ShowDialog() == DialogResult.OK)
-                        mpv.LoadFiles(d.FileNames);
+                        mp.LoadFiles(d.FileNames);
                 }
             }));
         }
 
         public static void open_config_folder(string[] args)
         {
-            Process.Start(mpv.mpvConfFolderPath);
+            Process.Start(mp.mpvConfFolderPath);
         }
 
         public static void show_keys(string[] args)
         {
-            Process.Start(mpv.InputConfPath);
+            Process.Start(mp.InputConfPath);
         }
 
         private static void CreateMpvConf()
         {
-            if (!File.Exists(mpv.mpvConfPath))
+            if (!File.Exists(mp.mpvConfPath))
             {
-                if (!Directory.Exists(mpv.mpvConfFolderPath))
-                    Directory.CreateDirectory(mpv.mpvConfFolderPath);
+                if (!Directory.Exists(mp.mpvConfFolderPath))
+                    Directory.CreateDirectory(mp.mpvConfFolderPath);
 
-                File.WriteAllText(mpv.mpvConfPath, "# https://mpv.io/manual/master/#configuration-files");
+                File.WriteAllText(mp.mpvConfPath, "# https://mpv.io/manual/master/#configuration-files");
             }
         }
 
         public static void show_prefs(string[] args)
         {
             CreateMpvConf();
-            Process.Start(mpv.mpvConfPath);
+            Process.Start(mp.mpvConfPath);
         }
 
         public static void history(string[] args)
         {
-            var fp = mpv.mpvConfFolderPath + "history.txt";
+            var fp = mp.mpvConfFolderPath + "history.txt";
 
             if (File.Exists(fp))
                 Process.Start(fp);
@@ -103,7 +103,7 @@ namespace mpvnet
             CreateMpvConf();
 
             bool changed = false;
-            string fp = mpv.mpvConfPath;
+            string fp = mp.mpvConfPath;
             var confLines = File.ReadAllLines(fp);
 
             for (int i = 0; i < confLines.Length; i++)
@@ -130,21 +130,21 @@ namespace mpvnet
 
         public static void show_info(string[] args)
         {
-            var fi = new FileInfo(mpv.GetStringProp("path"));
+            var fi = new FileInfo(mp.GetStringProp("path"));
 
             using (var mi = new MediaInfo(fi.FullName))
             {
                 var w = mi.GetInfo(MediaInfoStreamKind.Video, "Width");
                 var h = mi.GetInfo(MediaInfoStreamKind.Video, "Height");
-                var pos = TimeSpan.FromSeconds(mpv.GetIntProp("time-pos"));
-                var dur = TimeSpan.FromSeconds(mpv.GetIntProp("duration"));
+                var pos = TimeSpan.FromSeconds(mp.GetIntProp("time-pos"));
+                var dur = TimeSpan.FromSeconds(mp.GetIntProp("duration"));
                 string mibr = mi.GetInfo(MediaInfoStreamKind.Video, "BitRate");
 
                 if (mibr == "")
                     mibr = "0";
 
                 var br = Convert.ToInt32(mibr) / 1000.0 / 1000.0;
-                var vf = mpv.GetStringProp("video-format").ToUpper();
+                var vf = mp.GetStringProp("video-format").ToUpper();
                 var fn = fi.Name;
 
                 if (fn.Length > 60)
@@ -158,7 +158,7 @@ namespace mpvnet
                     ((int)(fi.Length / 1024 / 1024)).ToString() +
                     $" MB - {w} x {h}\n{vf} - {br.ToString("f1")} Mb/s" + "\n" + fn;
 
-                mpv.Command("show-text", info, "5000");
+                mp.Command("show-text", info, "5000");
 
                 string FormatTime(double value) => ((int)(Math.Floor(value))).ToString("00");
             }

mpv.net/MainForm.Designer.cs

@@ -52,7 +52,6 @@
             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,7 +4,7 @@ using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading;
 using System.Windows.Forms;
-
+using System.Diagnostics;
 using static mpvnet.StaticUsing;
 
 namespace mpvnet
@@ -16,7 +16,7 @@ namespace mpvnet
 
         private Point LastCursorPosChanged;
         private int LastCursorChangedTickCount;
-        private bool IsCloseRequired = true;
+        private bool IsClosed;
 
         public ContextMenuStripEx CMS;
 
@@ -30,11 +30,7 @@ namespace mpvnet
                 SetFormPosSize();
                 Instance = this;
                 Hwnd = Handle;
-                ChangeFullscreen((mpv.mpvConv.ContainsKey("fullscreen") && mpv.mpvConv["fullscreen"] == "yes") || (mpv.mpvConv.ContainsKey("fs") && mpv.mpvConv["fs"] == "yes"));
-                CMS = new ContextMenuStripEx(components);
-                CMS.Opened += CMS_Opened;
-                ContextMenuStrip = CMS;
-                BuildMenu();
+                ChangeFullscreen((mp.mpvConv.ContainsKey("fullscreen") && mp.mpvConv["fullscreen"] == "yes") || (mp.mpvConv.ContainsKey("fs") && mp.mpvConv["fs"] == "yes"));
             }
             catch (Exception ex)
             {
@@ -44,15 +40,7 @@ namespace mpvnet
 
         public void BuildMenu()
         {
-            if (!File.Exists(mpv.InputConfPath))
-            {
-                if (!Directory.Exists(mpv.mpvConfFolderPath))
-                    Directory.CreateDirectory(mpv.mpvConfFolderPath);
-
-                File.WriteAllText(mpv.InputConfPath, Properties.Resources.input_conf);
-            }
-
-            foreach (var i in File.ReadAllText(mpv.InputConfPath).SplitLinesNoEmpty())
+            foreach (var i in File.ReadAllText(mp.InputConfPath).SplitLinesNoEmpty())
             {
                 if (!i.Contains("#menu:"))
                     continue;
@@ -73,7 +61,7 @@ namespace mpvnet
                 var menuItem = CMS.Add(path, () => {
                     try
                     {
-                        mpv.CommandString(cmd, false);
+                        mp.CommandString(cmd, false);
                     }
                     catch (Exception e)
                     {
@@ -93,11 +81,11 @@ namespace mpvnet
 
         private string LastHistory;
 
-        private void mpv_PlaybackRestart()
+        private void mp_PlaybackRestart()
         {
-            var fn = mpv.GetStringProp("filename");
+            var fn = mp.GetStringProp("filename");
             BeginInvoke(new Action(() => { Text = fn + " - mpv.net " + Application.ProductVersion; }));
-            var fp = mpv.mpvConfFolderPath + "history.txt";
+            var fp = mp.mpvConfFolderPath + "history.txt";
 
             if (LastHistory != fn && File.Exists(fp))
             {
@@ -121,15 +109,15 @@ namespace mpvnet
             MsgError(e.ToString());
         }
 
-        private void Mpv_VideoSizeChanged()
+        private void mp_VideoSizeChanged()
         {
             BeginInvoke(new Action(() => SetFormPosSize()));
         }
 
-        private void Mpv_AfterShutdown()
+        private void mp_Shutdown()
         {
-            if (IsCloseRequired)
-                Invoke(new Action(() => Close()));
+            if (!IsClosed)
+                BeginInvoke(new Action(() => Close()));
         }
 
         public bool IsFullscreen
@@ -137,7 +125,7 @@ namespace mpvnet
             get => WindowState == FormWindowState.Maximized;
         }
 
-        void MpvChangeFullscreen(bool value)
+        void mp_ChangeFullscreen(bool value)
         {
             BeginInvoke(new Action(() => ChangeFullscreen(value)));
         }
@@ -166,19 +154,19 @@ namespace mpvnet
                 case 0x0100: // WM_KEYDOWN
                 case 0x0101: // WM_KEYUP
                 case 0x020A: // WM_MOUSEWHEEL
-                    if (mpv.MpvWindowHandle != IntPtr.Zero)
-                        Native.SendMessage(mpv.MpvWindowHandle, m.Msg, m.WParam, m.LParam);
+                    if (mp.MpvWindowHandle != IntPtr.Zero)
+                        Native.SendMessage(mp.MpvWindowHandle, m.Msg, m.WParam, m.LParam);
                     break;
                 case 0x203: // Native.WM.LBUTTONDBLCLK
                     if (!IsMouseInOSC())
-                        mpv.CommandString("cycle fullscreen");
+                        mp.CommandString("cycle fullscreen");
                     break;
                 case 0x0214: // WM_SIZING
                     var rc = Marshal.PtrToStructure<Native.RECT>(m.LParam);
                     var r = rc;
                     NativeHelp.SubtractWindowBorders(Handle, ref r);
                     int c_w = r.Right - r.Left, c_h = r.Bottom - r.Top;
-                    float aspect = mpv.VideoSize.Width / (float)mpv.VideoSize.Height;
+                    float aspect = mp.VideoSize.Width / (float)mp.VideoSize.Height;
                     int d_w = (int)(c_h * aspect - c_w);
                     int d_h = (int)(c_w / aspect - c_h);
                     int[] d_corners = { d_w, d_h, -d_w, -d_h };
@@ -198,10 +186,10 @@ namespace mpvnet
 
         void SetFormPosSize()
         {
-            if (IsFullscreen || mpv.VideoSize.Width == 0) return;
+            if (IsFullscreen || mp.VideoSize.Width == 0) return;
             var wa = Screen.GetWorkingArea(this);
             int h = (int)(wa.Height * 0.6);
-            int w = (int)(h * mpv.VideoSize.Width / (float)mpv.VideoSize.Height);
+            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);
@@ -227,7 +215,7 @@ namespace mpvnet
             base.OnDragDrop(e);
 
             if (e.Data.GetDataPresent(DataFormats.FileDrop))
-                mpv.LoadFiles(e.Data.GetData(DataFormats.FileDrop) as String[]);
+                mp.LoadFiles(e.Data.GetData(DataFormats.FileDrop) as String[]);
         }
 
         protected override void OnMouseDown(MouseEventArgs e)
@@ -249,7 +237,7 @@ namespace mpvnet
             var p2 = PointToScreen(e.Location);
 
             if (Math.Abs(p1.X - p2.X) < 10 && Math.Abs(p1.Y - p2.Y) < 10)
-                mpv.Command("quit");
+                mp.Command("quit");
         }
 
         protected override void OnMouseMove(MouseEventArgs e)
@@ -257,19 +245,12 @@ namespace mpvnet
             base.OnMouseMove(e);
 
             // send mouse command to make OSC show
-            mpv.CommandString($"mouse {e.X} {e.Y}");
+            mp.CommandString($"mouse {e.X} {e.Y}");
 
             if (CursorHelp.IsPosDifferent(LastCursorPosChanged))
                 CursorHelp.Show();
         }
 
-        protected override void OnFormClosed(FormClosedEventArgs e)
-        {
-            base.OnFormClosed(e);
-            IsCloseRequired = false;
-            mpv.Command("quit");
-        }
-
         bool IsMouseInOSC()
         {
             return PointToClient(Control.MousePosition).Y > ClientSize.Height * 0.9;
@@ -290,13 +271,36 @@ namespace mpvnet
             }
         }
 
-        private void MainForm_Load(object sender, EventArgs ea)
+        protected override void OnLoad(EventArgs e)
         {
-            mpv.Init();
-            mpv.ObserveBoolProp("fullscreen", MpvChangeFullscreen);
-            mpv.AfterShutdown += Mpv_AfterShutdown;
-            mpv.VideoSizeChanged += Mpv_VideoSizeChanged;
-            mpv.PlaybackRestart += mpv_PlaybackRestart;
+            base.OnLoad(e);
+            mp.Init();
+            mp.ObserveBoolProp("fullscreen", mp_ChangeFullscreen);
+            mp.Shutdown += mp_Shutdown;
+            mp.VideoSizeChanged += mp_VideoSizeChanged;
+            mp.PlaybackRestart += mp_PlaybackRestart;
+        }
+
+        protected override void OnShown(EventArgs e)
+        {
+            base.OnShown(e);
+            CMS = new ContextMenuStripEx(components);
+            CMS.Opened += CMS_Opened;
+            ContextMenuStrip = CMS;
+            BuildMenu();
+        }
+
+        protected override void OnFormClosed(FormClosedEventArgs e)
+        {
+            base.OnFormClosed(e);
+            IsClosed = true;
+            mp.Command("quit");
+
+            for (int i = 0; i < 99; i++)
+            {
+                if (mp.IsShutdownComplete) break;
+                Thread.Sleep(100);
+            }
         }
     }
 }

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

@@ -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.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.3.0.0")]
+[assembly: AssemblyFileVersion("1.3.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/PythonScript.cs

@@ -0,0 +1,33 @@
+using System;
+
+using IronPython.Hosting;
+using Microsoft.Scripting.Hosting;
+
+using static mpvnet.StaticUsing;
+
+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());
+            }
+        }
+    }
+}

mpv.net/Resources/input.conf.txt

@@ -38,7 +38,7 @@
  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
+ Shift+BS    set video-zoom 0 ; set video-pan-x 0 ; set video-pan-y 0 #menu: Shift+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 > -
@@ -113,8 +112,8 @@
  L cycle-values loop-file "inf" "no"                #menu: Shift+L ; Tools > Toggle Infinite Looping
  DEL script-binding osc/visibility                  #menu: Delete  ; Tools > Toggle OSC Visibility
  Ctrl+H cycle-values hwdec "auto" "no"              #menu: Ctrl+H  ; Tools > Cycle Hardware Decoding
- F8 show_text ${playlist}                           #menu: F8      ; Tools > Show Playlist
- F9 show_text ${track-list}                         #menu: F9      ; Tools > Show Audio/Video/Subtitle List
+ 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://github.com/mpv-player/mpv/blob/master/etc/input.conf #menu: _ ; Tools > Web > Show mpv default keys

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/libmpv.cs

@@ -29,6 +29,9 @@ namespace mpvnet
         [DllImport("mpv-1.dll", CallingConvention = CallingConvention.Cdecl)]
         public static extern int mpv_get_property(IntPtr mpvHandle, byte[] name, mpv_format format, ref IntPtr data);
 
+        [DllImport("mpv-1.dll", CallingConvention = CallingConvention.Cdecl)]
+        public static extern int mpv_get_property(IntPtr mpvHandle, byte[] name, mpv_format format, ref double data);
+
         [DllImport("mpv-1.dll", CallingConvention = CallingConvention.Cdecl)]
         public static extern int mpv_set_property(IntPtr mpvHandle, byte[] name, mpv_format format, ref byte[] data);
 
@@ -102,7 +105,8 @@ namespace mpvnet
             MPV_EVENT_PLAYBACK_RESTART = 21,
             MPV_EVENT_PROPERTY_CHANGE = 22,
             MPV_EVENT_CHAPTER_CHANGE = 23,
-            MPV_EVENT_QUEUE_OVERFLOW = 24
+            MPV_EVENT_QUEUE_OVERFLOW = 24,
+            MPV_EVENT_HOOK = 25
         }
 
         public enum mpv_format
@@ -131,6 +135,15 @@ namespace mpvnet
             MPV_LOG_LEVEL_TRACE = 70,
         }
 
+        public enum mpv_end_file_reason
+        {
+            MPV_END_FILE_REASON_EOF = 0,
+            MPV_END_FILE_REASON_STOP = 2,
+            MPV_END_FILE_REASON_QUIT = 3,
+            MPV_END_FILE_REASON_ERROR = 4,
+            MPV_END_FILE_REASON_REDIRECT = 5
+        }
+
             [StructLayout(LayoutKind.Sequential)]
         public struct mpv_event_log_message
         {
@@ -159,9 +172,16 @@ namespace mpvnet
         [StructLayout(LayoutKind.Sequential)]
         public struct mpv_event_property
         {
-            [MarshalAs(UnmanagedType.LPUTF8Str)] public string name;
+            public string name;
             public mpv_format format;
             public IntPtr data;
         }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct mpv_event_end_file
+        {
+            public int reason;
+            public int error;
+        }
     }
 }

mpv.net/mp.cs

@@ -0,0 +1,563 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+using static mpvnet.libmpv;
+using static mpvnet.Native;
+using static mpvnet.StaticUsing;
+
+using PyRT = IronPython.Runtime;
+
+namespace mpvnet
+{
+    public delegate void MpvBoolPropChangeHandler(string propName, bool value);
+
+    public class mp
+    {
+        public static event Action VideoSizeChanged;
+                                                              // Lua/JS evens       libmpv events
+
+                                                              //                    MPV_EVENT_NONE
+        public static event Action Shutdown;                  // shutdown           MPV_EVENT_SHUTDOWN
+        public static event Action LogMessage;                // log-message        MPV_EVENT_LOG_MESSAGE
+        public static event Action GetPropertyReply;          // get-property-reply MPV_EVENT_GET_PROPERTY_REPLY
+        public static event Action SetPropertyReply;          // set-property-reply MPV_EVENT_SET_PROPERTY_REPLY
+        public static event Action CommandReply;              // command-reply      MPV_EVENT_COMMAND_REPLY
+        public static event Action StartFile;                 // start-file         MPV_EVENT_START_FILE
+        public static event Action<EndFileEventMode> EndFile; // end-file           MPV_EVENT_END_FILE
+        public static event Action FileLoaded;                // file-loaded        MPV_EVENT_FILE_LOADED
+        public static event Action TracksChanged;             //                    MPV_EVENT_TRACKS_CHANGED
+        public static event Action TrackSwitched;             //                    MPV_EVENT_TRACK_SWITCHED
+        public static event Action Idle;                      // idle               MPV_EVENT_IDLE
+        public static event Action Pause;                     //                    MPV_EVENT_PAUSE
+        public static event Action Unpause;                   //                    MPV_EVENT_UNPAUSE
+        public static event Action Tick;                      // tick               MPV_EVENT_TICK
+        public static event Action ScriptInputDispatch;       //                    MPV_EVENT_SCRIPT_INPUT_DISPATCH
+        public static event Action<string[]> ClientMessage;   // client-message     MPV_EVENT_CLIENT_MESSAGE
+        public static event Action VideoReconfig;             // video-reconfig     MPV_EVENT_VIDEO_RECONFIG
+        public static event Action AudioReconfig;             // audio-reconfig     MPV_EVENT_AUDIO_RECONFIG
+        public static event Action MetadataUpdate;            //                    MPV_EVENT_METADATA_UPDATE
+        public static event Action Seek;                      // seek               MPV_EVENT_SEEK
+        public static event Action PlaybackRestart;           // playback-restart   MPV_EVENT_PLAYBACK_RESTART
+                                                              //                    MPV_EVENT_PROPERTY_CHANGE
+        public static event Action ChapterChange;             //                    MPV_EVENT_CHAPTER_CHANGE
+        public static event Action QueueOverflow;             //                    MPV_EVENT_QUEUE_OVERFLOW
+        public static event Action Hook;                      //                    MPV_EVENT_HOOK
+
+        public static IntPtr MpvHandle;
+        public static IntPtr MpvWindowHandle;
+        public static Addon Addon;
+        public static List<KeyValuePair<string, Action<bool>>> BoolPropChangeActions = new List<KeyValuePair<string, Action<bool>>>();
+        public static Size VideoSize = new Size(1920, 1080);
+        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<PythonScript> PythonScripts { get; } = new List<PythonScript>();
+        public static bool IsShutdownComplete { get; set; }
+
+        private static Dictionary<string, string> _mpvConv;
+
+        public static Dictionary<string, string> mpvConv {
+            get {
+                if (_mpvConv == null)
+                {
+                    _mpvConv = new Dictionary<string, string>();
+
+                    if (File.Exists(mpvConfPath))
+                    {
+                        foreach (var i in File.ReadAllLines(mpvConfPath))
+                        {
+                            if (i.Contains("=") && ! i.StartsWith("#"))
+                            {
+                                _mpvConv[i.Left("=").Trim()] = i.Right("=").Trim();
+                            }
+                        }
+                    }
+                }
+                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();
+            SetStringProp("input-default-bindings", "yes");
+            SetStringProp("osc", "yes");
+            SetStringProp("config", "yes");
+            SetStringProp("wid", MainForm.Hwnd.ToString());
+            SetStringProp("force-window", "yes");
+            mpv_initialize(MpvHandle);
+            ProcessCommandLine();
+            Task.Run(() => { LoadScripts(); });
+            Task.Run(() => { Addon = new Addon(); });
+            Task.Run(() => { EventLoop(); });
+        }
+
+        public static void LoadScripts()
+        {
+            string[] jsLua = { ".lua", ".js" };
+            string[] startupScripts = Directory.GetFiles(Application.StartupPath + "\\Scripts");
+
+            foreach (var scriptPath in startupScripts)
+                if (jsLua.Contains(Path.GetExtension(scriptPath).ToLower()))
+                    mp.Command("load-script", $"{scriptPath}");
+
+            foreach (var scriptPath in startupScripts)
+                if (Path.GetExtension(scriptPath) == ".py")
+                    PythonScripts.Add(new PythonScript(File.ReadAllText(scriptPath)));
+
+            foreach (var scriptPath in startupScripts)
+                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()
+        {
+            while (true)
+            {
+                IntPtr ptr = mpv_wait_event(MpvHandle, -1);
+                mpv_event evt = (mpv_event)Marshal.PtrToStructure(ptr, typeof(mpv_event));
+
+                if (MpvWindowHandle == IntPtr.Zero)
+                    MpvWindowHandle = FindWindowEx(MainForm.Hwnd, IntPtr.Zero, "mpv", null);
+
+                switch (evt.event_id)
+                {
+                    case mpv_event_id.MPV_EVENT_SHUTDOWN:
+                        Shutdown?.Invoke();
+                        IsShutdownComplete = true;
+                        return;
+                    case mpv_event_id.MPV_EVENT_LOG_MESSAGE:
+                        LogMessage?.Invoke();
+                        break;
+                    case mpv_event_id.MPV_EVENT_GET_PROPERTY_REPLY:
+                        GetPropertyReply?.Invoke();
+                        break;
+                    case mpv_event_id.MPV_EVENT_SET_PROPERTY_REPLY:
+                        SetPropertyReply?.Invoke();
+                        break;
+                    case mpv_event_id.MPV_EVENT_COMMAND_REPLY:
+                        CommandReply?.Invoke();
+                        break;
+                    case mpv_event_id.MPV_EVENT_START_FILE:
+                        StartFile?.Invoke();
+                        break;
+                    case mpv_event_id.MPV_EVENT_END_FILE:
+                        var end_fileData = (mpv_event_end_file)Marshal.PtrToStructure(evt.data, typeof(mpv_event_end_file));
+                        EndFile?.Invoke((EndFileEventMode)end_fileData.reason);
+                        break;
+                    case mpv_event_id.MPV_EVENT_FILE_LOADED:
+                        FileLoaded?.Invoke();
+                        LoadFolder();
+                        break;
+                    case mpv_event_id.MPV_EVENT_TRACKS_CHANGED:
+                        TracksChanged?.Invoke();
+                        break;
+                    case mpv_event_id.MPV_EVENT_TRACK_SWITCHED:
+                        TrackSwitched?.Invoke();
+                        break;
+                    case mpv_event_id.MPV_EVENT_IDLE:
+                        Idle?.Invoke();
+                        break;
+                    case mpv_event_id.MPV_EVENT_PAUSE:
+                        Pause?.Invoke();
+                        break;
+                    case mpv_event_id.MPV_EVENT_UNPAUSE:
+                        Unpause?.Invoke();
+                        break;
+                    case mpv_event_id.MPV_EVENT_TICK:
+                        Tick?.Invoke();
+                        break;
+                    case mpv_event_id.MPV_EVENT_SCRIPT_INPUT_DISPATCH:
+                        ScriptInputDispatch?.Invoke();
+                        break;
+                    case mpv_event_id.MPV_EVENT_CLIENT_MESSAGE:
+                        if (ClientMessage != null)
+                        {
+                            var client_messageData = (mpv_event_client_message)Marshal.PtrToStructure(evt.data, typeof(mpv_event_client_message));
+                            var args = NativeUtf8StrArray2ManagedStrArray(client_messageData.args, client_messageData.num_args);
+
+                            if (args != null && args.Length > 1 && args[0] == "mpv.net")
+                                foreach (var i in mpvnet.Command.Commands)
+                                    if (args[1] == i.Name)
+                                        try
+                                        {
+                                            i.Action(args.Skip(2).ToArray());
+                                        }
+                                        catch (Exception ex)
+                                        {
+                                            MsgError(ex.GetType().Name + "\r\n\r\n" + ex.ToString());
+                                        }
+                            ClientMessage?.Invoke(args);
+                        }
+                        break;
+                    case mpv_event_id.MPV_EVENT_VIDEO_RECONFIG:
+                        VideoReconfig?.Invoke();
+                        break;
+                    case mpv_event_id.MPV_EVENT_AUDIO_RECONFIG:
+                        AudioReconfig?.Invoke();
+                        break;
+                    case mpv_event_id.MPV_EVENT_METADATA_UPDATE:
+                        MetadataUpdate?.Invoke();
+                        break;
+                    case mpv_event_id.MPV_EVENT_SEEK:
+                        Seek?.Invoke();
+                        break;
+                    case mpv_event_id.MPV_EVENT_PROPERTY_CHANGE:
+                        var event_propertyData = (mpv_event_property)Marshal.PtrToStructure(evt.data, typeof(mpv_event_property));
+
+                        if (event_propertyData.format == mpv_format.MPV_FORMAT_FLAG)
+                            foreach (var i in BoolPropChangeActions)
+                                if (i.Key== event_propertyData.name)
+                                    i.Value.Invoke(Marshal.PtrToStructure<int>(event_propertyData.data) == 1);
+                        break;
+                    case mpv_event_id.MPV_EVENT_PLAYBACK_RESTART:
+                        PlaybackRestart?.Invoke();
+                        Size s = new Size(GetIntProp("dwidth", false), GetIntProp("dheight", false));
+
+                        if (VideoSize != s && s != Size.Empty)
+                        {
+                            VideoSize = s;
+                            VideoSizeChanged?.Invoke();
+                        }
+                        break;
+                    case mpv_event_id.MPV_EVENT_CHAPTER_CHANGE:
+                        ChapterChange?.Invoke();
+                        break;
+                    case mpv_event_id.MPV_EVENT_QUEUE_OVERFLOW:
+                        QueueOverflow?.Invoke();
+                        break;
+                    case mpv_event_id.MPV_EVENT_HOOK:
+                        Hook?.Invoke();
+                        break;
+                }
+            }
+        }
+
+        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 });
+            }
+        }
+
+        private static List<PythonEventObject> PythonEventObjects = new List<PythonEventObject>();
+
+        public static void register_event(string name, PyRT.PythonFunction pyFunc)
+        {
+            foreach (var eventInfo in typeof(mp).GetEvents())
+            {
+                if (eventInfo.Name.ToLower() == name.Replace("-", ""))
+                {
+                    PythonEventObject eventObject = new PythonEventObject();
+                    PythonEventObjects.Add(eventObject);
+                    eventObject.PythonFunction = pyFunc;
+                    MethodInfo mi;
+
+                    if (eventInfo.EventHandlerType == typeof(Action))
+                    {
+                        mi = eventObject.GetType().GetMethod(nameof(PythonEventObject.Invoke));
+                    }
+                    else if (eventInfo.EventHandlerType == typeof(Action<EndFileEventMode>))
+                    {
+                        mi = eventObject.GetType().GetMethod(nameof(PythonEventObject.InvokeEndFileEventMode));
+                    }
+                    else if (eventInfo.EventHandlerType == typeof(Action<string[]>))
+                    {
+                        mi = eventObject.GetType().GetMethod(nameof(PythonEventObject.InvokeStrings));
+                    }
+                    else
+                        throw new Exception();
+
+                    eventObject.EventInfo = eventInfo;
+                    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 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;
+
+            IntPtr[] byteArrayPointers;
+            var mainPtr = AllocateUtf8IntPtrArrayWithSentinel(args, out byteArrayPointers);
+            int err = mpv_command(MpvHandle, mainPtr);
+
+            if (err < 0)
+                throw new Exception($"{(mpv_error)err}");
+
+            foreach (var ptr in byteArrayPointers)
+                Marshal.FreeHGlobal(ptr);
+
+            Marshal.FreeHGlobal(mainPtr);
+        }
+
+        public static void CommandString(string command, bool throwException = true)
+        {
+            if (MpvHandle == IntPtr.Zero)
+                return;
+
+            int err = mpv_command_string(MpvHandle, command);
+
+            if (err < 0 && throwException)
+                throw new Exception($"{(mpv_error)err}\r\n\r\n" + command);
+        }
+
+        public static void SetStringProp(string name, string value, bool throwException = true)
+        {
+            var bytes = GetUtf8Bytes(value);
+            int err = mpv_set_property(MpvHandle, GetUtf8Bytes(name), mpv_format.MPV_FORMAT_STRING, ref bytes);
+
+            if (err < 0 && throwException)
+                throw new Exception($"{name}: {(mpv_error)err}");
+        }
+
+        public static string GetStringProp(string name)
+        {
+            var lpBuffer = IntPtr.Zero;
+            int err = mpv_get_property(MpvHandle, GetUtf8Bytes(name), mpv_format.MPV_FORMAT_STRING, ref lpBuffer);
+
+            if (err < 0)
+                throw new Exception($"{name}: {(mpv_error)err}");
+
+            var ret = StringFromNativeUtf8(lpBuffer);
+            mpv_free(lpBuffer);
+
+            return ret;
+        }
+
+        public static int GetIntProp(string name, bool throwException = true)
+        {
+            var lpBuffer = IntPtr.Zero;
+            int err = mpv_get_property(MpvHandle, GetUtf8Bytes(name), mpv_format.MPV_FORMAT_INT64, ref lpBuffer);
+
+            if (err < 0 && throwException)
+                throw new Exception($"{name}: {(mpv_error)err}");
+            else
+                return lpBuffer.ToInt32();
+        }
+
+        public static double get_property_number(string name)
+        {
+            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)
+                throw new Exception($"{name}: {(mpv_error)err}");
+            else
+                return val;
+        }
+
+        public static void SetIntProp(string name, int value)
+        {
+            Int64 val = value;
+            int err = mpv_set_property(MpvHandle, GetUtf8Bytes(name), mpv_format.MPV_FORMAT_INT64, ref val);
+
+            if (err < 0)
+                throw new Exception($"{name}: {(mpv_error)err}");
+        }
+
+        public static void ObserveBoolProp(string name, Action<bool> action)
+        {
+            int err = mpv_observe_property(MpvHandle, (ulong)action.GetHashCode(), name, mpv_format.MPV_FORMAT_FLAG);
+
+            if (err < 0)
+                throw new Exception($"{name}: {(mpv_error)err}");
+            else
+                BoolPropChangeActions.Add(new KeyValuePair<string, Action<bool>>(name, action));
+        }
+
+        public static void UnobserveBoolProp(string name, Action<bool> action)
+        {
+            foreach (var i in BoolPropChangeActions.ToArray())
+                if (i.Value == action)
+                    BoolPropChangeActions.Remove(i);
+
+            int err = mpv_unobserve_property(MpvHandle, (ulong)action.GetHashCode());
+
+            if (err < 0)
+                throw new Exception($"{name}: {(mpv_error)err}");
+        }
+
+        public 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.SetStringProp("playlist-pos", "0", false);
+
+            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.SetStringProp(left, right);
+                    }
+                    else
+                        mp.SetStringProp(i.Substring(2), "yes");
+                }
+            }
+        }
+
+        public static void LoadFiles(string[] files)
+        {
+            int count = mp.GetIntProp("playlist-count");
+
+            foreach (string file in files)
+                mp.Command("loadfile", file, "append");
+
+            mp.SetIntProp("playlist-pos", count);
+
+            for (int i = 0; i < count; i++)
+                mp.Command("playlist-remove", "0");
+
+            mp.LoadFolder();
+        }
+
+        private static bool WasFolderLoaded;
+
+        public static void LoadFolder()
+        {
+            if (WasFolderLoaded)
+                return;
+
+            if (GetIntProp("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");
+                List<string> files = Directory.GetFiles(Path.GetDirectoryName(path)).ToList();
+                files = files.Where((file) => types.Contains(file.Ext())).ToList();
+                files.Sort(new StringLogicalComparer());
+                int index = files.IndexOf(path);
+                files.Remove(path);
+
+                foreach (string i in files)
+                    Command("loadfile", i, "append");
+
+                if (index > 0)
+                    Command("playlist-move", "0", (index + 1).ToString());
+            }
+
+            WasFolderLoaded = true;
+        }
+
+        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];
+            IntPtr rootPointer = Marshal.AllocCoTaskMem(IntPtr.Size * numberOfStrings);
+
+            for (int index = 0; index < arr.Length; index++)
+            {
+                var bytes = GetUtf8Bytes(arr[index]);
+                IntPtr unmanagedPointer = Marshal.AllocHGlobal(bytes.Length);
+                Marshal.Copy(bytes, 0, unmanagedPointer, bytes.Length);
+                byteArrayPointers[index] = unmanagedPointer;
+            }
+
+            Marshal.Copy(byteArrayPointers, 0, rootPointer, numberOfStrings);
+            return rootPointer;
+        }
+
+        public static string[] NativeUtf8StrArray2ManagedStrArray(IntPtr pUnmanagedStringArray, int StringCount)
+        {
+            IntPtr[] pIntPtrArray = new IntPtr[StringCount];
+            string[] ManagedStringArray = new string[StringCount];
+            Marshal.Copy(pUnmanagedStringArray, pIntPtrArray, 0, StringCount);
+
+            for (int i = 0; i < StringCount; i++)
+                ManagedStringArray[i] = StringFromNativeUtf8(pIntPtrArray[i]);
+
+            return ManagedStringArray;
+        }
+
+        public static string StringFromNativeUtf8(IntPtr nativeUtf8)
+        {
+            int len = 0;
+            while (Marshal.ReadByte(nativeUtf8, len) != 0) ++len;
+            byte[] buffer = new byte[len];
+            Marshal.Copy(nativeUtf8, buffer, 0, buffer.Length);
+            return Encoding.UTF8.GetString(buffer);
+        }
+
+        public static byte[] GetUtf8Bytes(string s) => Encoding.UTF8.GetBytes(s + "\0");
+    }
+
+    public enum EndFileEventMode
+    {
+        Eof,
+        Stop,
+        Quit,
+        Error,
+        Redirect,
+        Unknown
+    }
+}

mpv.net/mpv.cs

@@ -1,347 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Drawing;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
-
-using static mpvnet.libmpv;
-using static mpvnet.Native;
-using static mpvnet.StaticUsing;
-
-namespace mpvnet
-{
-    public delegate void MpvBoolPropChangeHandler(string propName, bool value);
-
-    public class mpv
-    {
-        public static event Action<string[]> ClientMessage;
-        public static event Action Shutdown;
-        public static event Action AfterShutdown;
-        public static event Action PlaybackRestart;
-        public static event Action VideoSizeChanged;
-
-        public static IntPtr MpvHandle;
-        public static IntPtr MpvWindowHandle;
-        public static Addon Addon;
-        public static List<Action<bool>> BoolPropChangeActions = new List<Action<bool>>();
-        public static Size VideoSize = new Size(1920, 1080);
-        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";
-
-        private static Dictionary<string, string> _mpvConv;
-
-        public static Dictionary<string, string> mpvConv {
-            get {
-                if (_mpvConv == null)
-                {
-                    _mpvConv = new Dictionary<string, string>();
-
-                    if (File.Exists(mpvConfPath))
-                    {
-                        foreach (var i in File.ReadAllLines(mpvConfPath))
-                        {
-                            if (i.Contains("=") && ! i.StartsWith("#"))
-                            {
-                                _mpvConv[i.Left("=").Trim()] = i.Right("=").Trim();
-                            }
-                        }
-                    }
-                }
-                return _mpvConv;
-            }
-        }
-
-        public static void Init()
-        {
-            LoadLibrary("mpv-1.dll");
-            MpvHandle = mpv_create();
-            SetIntProp("input-ar-delay", 500);
-            SetIntProp("input-ar-rate", 20);
-            SetIntProp("volume", 50);
-            SetStringProp("hwdec", "yes");
-            SetStringProp("vo", "direct3d");
-            SetStringProp("input-default-bindings", "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(() => { Addon = new Addon(); });
-            Task.Run(() => { EventLoop(); });
-        }
-
-        public static void EventLoop()
-        {
-            while (true)
-            {
-                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);
-
-                switch (evt.event_id)
-                {
-                    case mpv_event_id.MPV_EVENT_SHUTDOWN:
-                        Shutdown?.Invoke();
-                        AfterShutdown?.Invoke();
-                        return;
-                    case mpv_event_id.MPV_EVENT_FILE_LOADED:
-                        LoadFolder();
-                        break;
-                    case mpv_event_id.MPV_EVENT_PLAYBACK_RESTART:
-                        PlaybackRestart?.Invoke();
-
-                        Size s = new Size(GetIntProp("dwidth", false), GetIntProp("dheight", false));
-
-                        if (VideoSize != s && s != Size.Empty)
-                        {
-                            VideoSize = s;
-                            VideoSizeChanged?.Invoke();
-                        }
-
-                        break;
-                    case mpv_event_id.MPV_EVENT_CLIENT_MESSAGE:
-                        if (ClientMessage != null)
-                        {
-                            var client_messageData = (mpv_event_client_message)Marshal.PtrToStructure(evt.data, typeof(mpv_event_client_message));
-                            var args = NativeUtf8StrArray2ManagedStrArray(client_messageData.args, client_messageData.num_args);
-
-                            if (args != null && args.Length > 1 && args[0] == "mpv.net")
-                                foreach (var i in mpvnet.Command.Commands)
-                                    if (args[1] == i.Name)
-                                        try
-                                        {
-                                            i.Action(args.Skip(2).ToArray());
-                                        }
-                                        catch (Exception ex)
-                                        {
-                                            MsgError(ex.GetType().Name + "\r\n\r\n" + ex.ToString());
-                                        }
-
-                            ClientMessage?.Invoke(args);
-                        }
-
-                        break;
-                    case mpv_event_id.MPV_EVENT_PROPERTY_CHANGE:
-                        var eventData = (mpv_event_property)Marshal.PtrToStructure(evt.data, typeof(mpv_event_property));
-
-                        if (eventData.format == mpv_format.MPV_FORMAT_FLAG)
-                            foreach (var action in BoolPropChangeActions)
-                                action.Invoke(Marshal.PtrToStructure<int>(eventData.data) == 1);
-                        break;
-                }
-            }
-        }
-
-        public static void Command(params string[] args)
-        {
-            if (MpvHandle == IntPtr.Zero)
-                return;
-
-            IntPtr[] byteArrayPointers;
-            var mainPtr = AllocateUtf8IntPtrArrayWithSentinel(args, out byteArrayPointers);
-            int err = mpv_command(MpvHandle, mainPtr);
-
-            if (err < 0)
-                throw new Exception($"{(mpv_error)err}");
-
-            foreach (var ptr in byteArrayPointers)
-                Marshal.FreeHGlobal(ptr);
-
-            Marshal.FreeHGlobal(mainPtr);
-        }
-
-        public static void CommandString(string command, bool throwException = true)
-        {
-            if (MpvHandle == IntPtr.Zero)
-                return;
-
-            int err = mpv_command_string(MpvHandle, command);
-
-            if (err < 0 && throwException)
-                throw new Exception($"{(mpv_error)err}\r\n\r\n" + command);
-        }
-
-        public static void SetStringProp(string name, string value, bool throwException = true)
-        {
-            var bytes = GetUtf8Bytes(value);
-            int err = mpv_set_property(MpvHandle, GetUtf8Bytes(name), mpv_format.MPV_FORMAT_STRING, ref bytes);
-
-            if (err < 0 && throwException)
-                throw new Exception($"{name}: {(mpv_error)err}");
-        }
-
-        public static string GetStringProp(string name)
-        {
-            var lpBuffer = IntPtr.Zero;
-            int err = mpv_get_property(MpvHandle, GetUtf8Bytes(name), mpv_format.MPV_FORMAT_STRING, ref lpBuffer);
-
-            if (err < 0)
-                throw new Exception($"{name}: {(mpv_error)err}");
-
-            var ret = StringFromNativeUtf8(lpBuffer);
-            mpv_free(lpBuffer);
-
-            return ret;
-        }
-
-        public static int GetIntProp(string name, bool throwException = true)
-        {
-            var lpBuffer = IntPtr.Zero;
-            int err = mpv_get_property(MpvHandle, GetUtf8Bytes(name), mpv_format.MPV_FORMAT_INT64, ref lpBuffer);
-
-            if (err < 0 && throwException)
-                throw new Exception($"{name}: {(mpv_error)err}");
-            else
-                return lpBuffer.ToInt32();
-        }
-
-        public static void SetIntProp(string name, int value)
-        {
-            Int64 val = value;
-            int err = mpv_set_property(MpvHandle, GetUtf8Bytes(name), mpv_format.MPV_FORMAT_INT64, ref val);
-
-            if (err < 0)
-                throw new Exception($"{name}: {(mpv_error)err}");
-        }
-
-        public static void ObserveBoolProp(string name, Action<bool> action)
-        {
-            BoolPropChangeActions.Add(action);
-            int err = mpv_observe_property(MpvHandle, (ulong)action.GetHashCode(), name, mpv_format.MPV_FORMAT_FLAG);
-
-            if (err < 0)
-                throw new Exception($"{name}: {(mpv_error)err}");
-        }
-
-        public static void UnobserveBoolProp(string name, Action<bool> action)
-        {
-            BoolPropChangeActions.Remove(action);
-            int err = mpv_unobserve_property(MpvHandle, (ulong)action.GetHashCode());
-
-            if (err < 0)
-                throw new Exception($"{name}: {(mpv_error)err}");
-        }
-
-        public static void ProcessCommandLine()
-        {
-            var args = Environment.GetCommandLineArgs().Skip(1);
-
-            foreach (string i in args)
-                if (!i.StartsWith("--") && File.Exists(i))
-                    mpv.Command("loadfile", i, "append");
-
-            mpv.SetStringProp("playlist-pos", "0", false);
-
-            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);
-                        mpv.SetStringProp(left, right);
-                    }
-                    else
-                        mpv.SetStringProp(i.Substring(2), "yes");
-                }
-            }
-        }
-
-        public static void LoadFiles(string[] files)
-        {
-            int count = mpv.GetIntProp("playlist-count");
-
-            foreach (string file in files)
-                mpv.Command("loadfile", file, "append");
-
-            mpv.SetIntProp("playlist-pos", count);
-
-            for (int i = 0; i < count; i++)
-                mpv.Command("playlist-remove", "0");
-
-            mpv.LoadFolder();
-        }
-
-        private static bool WasFolderLoaded;
-
-        public static void LoadFolder()
-        {
-            if (WasFolderLoaded)
-                return;
-
-            if (GetIntProp("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");
-                List<string> files = Directory.GetFiles(Path.GetDirectoryName(path)).ToList();
-                files = files.Where((file) => types.Contains(file.Ext())).ToList();
-                files.Sort(new StringLogicalComparer());
-                int index = files.IndexOf(path);
-                files.Remove(path);
-
-                foreach (string i in files)
-                    Command("loadfile", i, "append");
-
-                if (index > 0)
-                    Command("playlist-move", "0", (index + 1).ToString());
-            }
-
-            WasFolderLoaded = true;
-        }
-
-        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];
-            IntPtr rootPointer = Marshal.AllocCoTaskMem(IntPtr.Size * numberOfStrings);
-
-            for (int index = 0; index < arr.Length; index++)
-            {
-                var bytes = GetUtf8Bytes(arr[index]);
-                IntPtr unmanagedPointer = Marshal.AllocHGlobal(bytes.Length);
-                Marshal.Copy(bytes, 0, unmanagedPointer, bytes.Length);
-                byteArrayPointers[index] = unmanagedPointer;
-            }
-
-            Marshal.Copy(byteArrayPointers, 0, rootPointer, numberOfStrings);
-            return rootPointer;
-        }
-
-        public static string[] NativeUtf8StrArray2ManagedStrArray(IntPtr pUnmanagedStringArray, int StringCount)
-        {
-            IntPtr[] pIntPtrArray = new IntPtr[StringCount];
-            string[] ManagedStringArray = new string[StringCount];
-            Marshal.Copy(pUnmanagedStringArray, pIntPtrArray, 0, StringCount);
-
-            for (int i = 0; i < StringCount; i++)
-                ManagedStringArray[i] = StringFromNativeUtf8(pIntPtrArray[i]);
-
-            return ManagedStringArray;
-        }
-
-        public static string StringFromNativeUtf8(IntPtr nativeUtf8)
-        {
-            int len = 0;
-            while (Marshal.ReadByte(nativeUtf8, len) != 0) ++len;
-            byte[] buffer = new byte[len];
-            Marshal.Copy(nativeUtf8, buffer, 0, buffer.Length);
-            return Encoding.UTF8.GetString(buffer);
-        }
-
-        public static byte[] GetUtf8Bytes(string s) => Encoding.UTF8.GetBytes(s + "\0");
-    }
-}

mpv.net/mpv.net.csproj

@@ -94,11 +94,37 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="IKVM.Reflection, Version=7.2.4630.5, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>IronPython\IKVM.Reflection.dll</HintPath>
+    </Reference>
+    <Reference Include="IronPython, Version=2.7.9.0, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>IronPython\IronPython.dll</HintPath>
+    </Reference>
+    <Reference Include="IronPython.Modules, Version=2.7.9.0, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>IronPython\IronPython.Modules.dll</HintPath>
+    </Reference>
+    <Reference Include="IronPythonAddon">
+      <HintPath>IronPython\IronPythonAddon.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Dynamic, Version=1.2.2.0, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>IronPython\Microsoft.Dynamic.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Scripting, Version=1.2.2.0, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>IronPython\Microsoft.Scripting.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
     <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>
@@ -109,6 +135,13 @@
     <Compile Include="Menu.cs">
       <SubType>Component</SubType>
     </Compile>
+    <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">
@@ -118,7 +151,7 @@
       <DependentUpon>MainForm.cs</DependentUpon>
     </Compile>
     <Compile Include="Misc.cs" />
-    <Compile Include="mpv.cs" />
+    <Compile Include="mp.cs" />
     <Compile Include="Command.cs" />
     <Compile Include="Native.cs" />
     <Compile Include="NativeHelp.cs" />
@@ -127,18 +160,15 @@
     <Compile Include="UI.cs" />
     <EmbeddedResource Include="MainForm.resx">
       <DependentUpon>MainForm.cs</DependentUpon>
+      <SubType>Designer</SubType>
     </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>
@@ -148,6 +178,7 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
+    <Content Include="Resources\mpv.conf.txt" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
@@ -155,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"
-Remove-Item $addonDir -Recurse -Include *mpvnet.exe, *mpvnet.exe.config, *mpvnet.pdb
+copy-item $scriptDir\README.md $targetDir\README.md
 $7zPath = "C:\Program Files\7-Zip\7z.exe"
 $args = "a -t7z -mx9 $targetDir.7z -r $targetDir\*"
 Start-Process -FilePath $7zPath -ArgumentList $args