fix severe termination bug

docs/Changelog.md

@@ -6,8 +6,10 @@
 - New history-filter option added to define paths to be excluded from the history log feature.
 - New command to move the Window to the screen edge (Alt+Arrow) or center (Alt+BS).
 - Smaller OSD media info font size and more duplicated and obvious info removed from titles.
-- Improved mouse cursor hide behavior.
+- Improved mouse cursor auto hide behavior.
-- libmpv shinchiro 2022-08-11
+- Fix severe bug causing termination before scripts having a chance reacting to shutdown event.
+- libmpv shinchiro 2022-10-02, fixes a severe bug causing hangs:
+  https://github.com/mpv-player/mpv/pull/10569
 
 input.conf changes:
 

docs/Universal Remote/layout.xml

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout>
-    <row>
-        <button text="PLAY" ontap="play" />
-        <button text="PREV" ontap="prev" />
-        <button text="NEXT" ontap="next" />
-        <button text="Enter" ontap="enter" />
-    </row>
-    <row>
-        <button text="LEFT"  ontap="left" />
-        <button text="RIGHT" ontap="right" />
-        <button text="UP"    ontap="up" />
-        <button text="DOWN"  ontap="down" />
-    </row>
-    <row>
-        <button text="VOL-" ontap="vol_minus" />
-        <button text="VOL+" ontap="vol_plus" />
-        <button text="MUTE" ontap="mute" />
-        <button text="INFO" ontap="info" />
-    </row>
-    <row>
-        <button text="KP0" ontap="KP0" />
-        <button text="KP1" ontap="KP1" />
-        <button text="KP2" ontap="KP2" />
-        <button text="KP3" ontap="KP3" />
-        <button text="KP4" ontap="KP4" />
-    </row>
-    <row>
-        <button text="KP5" ontap="KP5" />
-        <button text="KP6" ontap="KP6" />
-        <button text="KP7" ontap="KP7" />
-        <button text="KP8" ontap="KP8" />
-        <button text="KP9" ontap="KP9" />
-    </row>
-    <row>
-        <button text="Cycle Audio"    ontap="KP7" />
-        <button text="Cycle Subtitle" ontap="KP8" />
-        <button text="AB LOOP" ontap="ab_loop" />
-    </row>
-    <row>
-        <button text="ZOOM IN"  ontap="zoom_in" />
-        <button text="ZOOM OUT" ontap="zoom_out" />
-    </row>
-</layout>

docs/Universal Remote/meta.prop

@@ -1,5 +0,0 @@
-
-meta.name: custom keys
-meta.author: stax76
-meta.description: custom keys
-meta.tags: mpv

docs/Universal Remote/remote.lua

@@ -1,106 +0,0 @@
-
--- https://github.com/unifiedremote/Docs/blob/master/libs/keyboard.md
-
--- https://github.com/unifiedremote/Docs/blob/master/res/keys.md
-
-local kb = libs.keyboard;
-
-actions.play = function ()
-	kb.stroke("space");
-end
-
-actions.next = function ()
-	kb.stroke("F12");
-end
-
-actions.prev = function ()
-	kb.stroke("F11");
-end
-
-actions.enter = function ()
-	kb.stroke("enter");
-end
-
-actions.left = function ()
-	kb.stroke("left");
-end
-
-actions.right = function ()
-	kb.stroke("right");
-end
-
-actions.up = function ()
-	kb.stroke("up");
-end
-
-actions.down = function ()
-	kb.stroke("down");
-end
-
-actions.vol_minus = function ()
-	kb.text("-");
-end
-
-actions.vol_plus = function ()
-	kb.text("+");
-end
-
-actions.mute = function ()
-	kb.stroke("m");
-end
-
-actions.info = function ()
-	kb.stroke("i");
-end
-
-actions.KP0 = function ()
-	kb.stroke("num0");
-end
-
-actions.KP1 = function ()
-	kb.stroke("num1");
-end
-
-actions.KP2 = function ()
-	kb.stroke("num2");
-end
-
-actions.KP3 = function ()
-	kb.stroke("num3");
-end
-
-actions.KP4 = function ()
-	kb.stroke("num4");
-end
-
-actions.KP5 = function ()
-	kb.stroke("num5");
-end
-
-actions.KP6 = function ()
-	kb.stroke("num6");
-end
-
-actions.KP7 = function ()
-	kb.stroke("num7");
-end
-
-actions.KP8 = function ()
-	kb.stroke("num8");
-end
-
-actions.KP9 = function ()
-	kb.stroke("num9");
-end
-
-actions.ab_loop = function ()
-	kb.stroke("l");
-end
-
-actions.zoom_in = function ()
-    kb.stroke("ctrl", "oem_plus");
-end
-
-actions.zoom_out = function ()
-    kb.stroke("ctrl", "oem_minus");
-end

src/Misc/Player.cs

@@ -222,6 +222,12 @@ namespace mpvnet
             InvokeAsync(InitializedAsync);
         }
 
+        public void Destroy()
+        {
+            mpv_destroy(Handle);
+            mpv_destroy(NamedHandle);
+        }
+
         void ApplyShowMenuFix()
         {
             if (App.Settings.ShowMenuFixApplied)
@@ -1732,6 +1738,9 @@ namespace mpvnet
 
                         if (title.TrimEx() == format)
                             title = null;
+
+                        if (!string.IsNullOrEmpty(title))
+                            title = title.Trim(" _-".ToCharArray());
                     }
 
                     track = new MediaTrack();
@@ -1815,6 +1824,9 @@ namespace mpvnet
 
                         if (title.ContainsEx("[]"))
                             title = title.Replace("[]", "");
+
+                        if (!string.IsNullOrEmpty(title))
+                            title = title.Trim(" _-".ToCharArray());
                     }
 
                     track = new MediaTrack();

src/Native/libmpv.cs

@@ -14,6 +14,9 @@ public class libmpv
     [DllImport("mpv-2.dll", CallingConvention = CallingConvention.Cdecl)]
     public static extern mpv_error mpv_initialize(IntPtr mpvHandle);
 
+    [DllImport("mpv-2.dll", CallingConvention = CallingConvention.Cdecl)]
+    public static extern void mpv_destroy(IntPtr mpvHandle);
+
     [DllImport("mpv-2.dll", CallingConvention = CallingConvention.Cdecl)]
     public static extern mpv_error mpv_command(IntPtr mpvHandle, IntPtr strings);
 

src/WinForms/MainForm.cs

@@ -1235,6 +1235,8 @@ namespace mpvnet
 
             if (!Core.ShutdownAutoResetEvent.WaitOne(10000))
                 Msg.ShowError("Shutdown thread failed to complete within 10 seconds.");
+
+            Core.Destroy();
         }
 
         protected override void OnMouseDown(MouseEventArgs e)