5.4.7.0

Changelog.md

@@ -1,10 +1,19 @@
 
-5.4.5.2 Beta  (not yet released)
+5.4.7.1 Beta  (not yet released)
 ============
 
 
 
 
+5.4.7.0
+=======
+
+- log error fix
+- workaround to support AviSynth portable (ffmpeg blocks loading AviSynth from path env var)
+- attempt to fix not reproducible volume input issue
+- attempt to fix exception caused by powershell being not available on Win 7
+
+
 5.4.6.0
 =======
 

Manual.md

@@ -174,9 +174,9 @@ Support
 
 Before making a support request, please try a newer [beta version](#beta) first.
 
-[Support thread in VideoHelp forum](https://forum.videohelp.com/threads/392514-mpv-net-a-extendable-media-player-for-windows)
+Bugs and feature requests can be made on the github [issue tracker](https://github.com/stax76/mpv.net/issues), feel free to use for anything mpv.net related.
 
-[Issue tracker](https://github.com/stax76/mpv.net/issues), feel free to use for anything mpv.net related.
+Or use the [support thread](https://forum.videohelp.com/threads/392514-mpv-net-a-extendable-media-player-for-windows) in the VideoHelp forum.
 
 
 Settings

mpv.net/Misc/App.cs

@@ -89,13 +89,6 @@ namespace mpvnet
 
             core.Shutdown += Shutdown;
             core.Initialized += Initialized;
-            core.LogMessage += ShowFatalError;
-        }
-
-        static void ShowFatalError(mpv_log_level level, string msg)
-        {
-            if (!App.IsStartedFromTerminal && level == mpv_log_level.MPV_LOG_LEVEL_FATAL)
-                Msg.ShowError(msg);
         }
 
         public static void RunAction(Action action)

mpv.net/Misc/PowerShell.cs

@@ -233,6 +233,12 @@ namespace mpvnet
             var error = sender as PSDataCollection<ErrorRecord>;
             ConsoleHelp.WriteError(error[e.Index], Module);
         }
+
+        public static void Shutdown()
+        {
+            foreach (PowerShell ps in Instances)
+                ps.Runspace.Dispose();
+        }
     }
 
     public class PowerShellException : Exception

mpv.net/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("5.4.6.0")]
+[assembly: AssemblyVersion("5.4.7.0")]
-[assembly: AssemblyFileVersion("5.4.6.0")]
+[assembly: AssemblyFileVersion("5.4.7.0")]

mpv.net/WinForms/MainForm.cs

@@ -520,6 +520,9 @@ namespace mpvnet
                 case 0x319: // WM_APPCOMMAND
                     if (core.WindowHandle != IntPtr.Zero)
                         m.Result = WinAPI.SendMessage(core.WindowHandle, m.Msg, m.WParam, m.LParam);
+
+                    if (m.Msg == 0x319) // WM_APPCOMMAND
+                        return;
                     break;
                 case 0x0200: // WM_MOUSEMOVE
                     if (Environment.TickCount - LastCycleFullscreen > 500)
@@ -793,10 +796,7 @@ namespace mpvnet
             if (!core.ShutdownAutoResetEvent.WaitOne(10000))
                 Msg.ShowError("Shutdown thread failed to complete within 10 seconds.");
 
-            try { // PowerShell 5.1 might not be available
+            PowerShell.Shutdown();
-                foreach (PowerShell ps in PowerShell.Instances)
-                    ps.Runspace.Dispose();
-            } catch {}
         }
 
         protected override void OnMouseDown(MouseEventArgs e)

mpv.net/mpv/Core.cs

@@ -396,10 +396,18 @@ namespace mpvnet
                         case mpv_event_id.MPV_EVENT_LOG_MESSAGE:
                             {
                                 var data = (mpv_event_log_message)Marshal.PtrToStructure(evt.data, typeof(mpv_event_log_message));
-                                mpv_log_level level = data.log_level;
+
-                                string msg = $"[{ConvertFromUtf8(data.prefix)}] {ConvertFromUtf8(data.text)}";
+                                if (LogMessage != null || LogMessageAsync != null ||
-                                InvokeAsync<mpv_log_level, string>(LogMessageAsync, level, msg);
+                                    data.log_level == mpv_log_level.MPV_LOG_LEVEL_FATAL)
-                                LogMessage?.Invoke(level, msg);
+                                {
+                                    string msg = $"[{ConvertFromUtf8(data.prefix)}] {ConvertFromUtf8(data.text)}";
+
+                                    if (data.log_level == mpv_log_level.MPV_LOG_LEVEL_FATAL)
+                                        App.RunAction(() => App.ShowError("Fatal Error", msg));
+
+                                    InvokeAsync<mpv_log_level, string>(LogMessageAsync, data.log_level, msg);
+                                    LogMessage?.Invoke(data.log_level, msg);
+                                }
                             }
                             break;
                         case mpv_event_id.MPV_EVENT_CLIENT_MESSAGE:
@@ -966,6 +974,7 @@ namespace mpvnet
             for (int i = 0; i < files.Length; i++)
             {
                 string file = files[i];
+                LoadLibrary(file.ShortExt());
 
                 if (App.SubtitleTypes.Contains(file.ShortExt()))
                     commandv("sub-add", file);
@@ -1012,6 +1021,17 @@ namespace mpvnet
                 commandv("playlist-move", "0", (index + 1).ToString());
         }
 
+        bool wasAviSynthLoaded;
+
+        void LoadLibrary(string ext)
+        {
+            if (!wasAviSynthLoaded && ext == "avs")
+            {
+                WinAPI.LoadLibrary("AviSynth.dll");
+                wasAviSynthLoaded = true;
+            }
+        }
+
         string LastHistoryPath;
         DateTime LastHistoryStartDateTime;