-

Changelog.md

@@ -1,9 +1,17 @@
-### 4.2 Letting Go
+### 4.3.1
+
+- there was a old bug setting the screen property
+
+### 4.3
+
+- there was new bug in file association feature
+
+### 4.2
 
 - the help and layout in the config editor was improved
 - clipboard monitoring for URLs can be disabled in the settings
 - the context menu has a new feature: Open > Add files to playlist,
-  it appends files to the playlist [(Default binding)](https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/inputConf.txt#L34)
+  it appends files to the playlist [(Default binding)](https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/inputConf.txt#L33)
 - a setting was added to force using a single mpv.net process instance
 
 ### 4.1

mpv.net/Misc/Misc.cs

@@ -3,6 +3,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
+using System.Diagnostics;
 using System.Drawing;
 using System.IO;
 using System.Linq;
@@ -12,6 +13,7 @@ using System.Runtime.Serialization;
 using System.Windows.Forms;
 
 using Microsoft.Win32;
+using VB = Microsoft.VisualBasic;
 
 namespace mpvnet
 {
@@ -28,6 +30,8 @@ namespace mpvnet
         public static string DarkMode { get; set; } = "always";
         public static string ProcessInstance { get; set; } = "single";
 
+        public static bool DebugMode { get; set; } = false;
+
         public static bool IsDarkMode { 
             get => (DarkMode == "system" && Sys.IsDarkTheme) || DarkMode == "always";
         }
@@ -36,6 +40,28 @@ namespace mpvnet
         {
             foreach (var i in Conf)
                 ProcessProperty(i.Key, i.Value);
+
+            if (App.DebugMode)
+            {
+                try
+                {
+                    string filePath = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory) + "\\mpvnet-debug.log";
+                    if (File.Exists(filePath)) File.Delete(filePath);
+                    Trace.Listeners.Clear();
+                    Trace.Listeners.Add(new TextWriterTraceListener(filePath));
+                    foreach (Screen screen in Screen.AllScreens)
+                        Trace.WriteLine(screen);
+                }
+                catch (Exception e)
+                {
+                    Msg.ShowException(e);
+                }
+            }
+        }
+
+        public static void Exit()
+        {
+            if (Trace.Listeners.Count > 0) Trace.Listeners[0].Close();
         }
 
         static Dictionary<string, string> _Conf;
@@ -62,6 +88,7 @@ namespace mpvnet
                 case "clipboard-monitoring": ClipboardMonitoring = value; break;
                 case "process-instance": ProcessInstance = value; break;
                 case "dark-mode": DarkMode = value; break;
+                case "debug-mode": DebugMode = value == "yes"; break;
             }
         }
 
@@ -212,14 +239,18 @@ namespace mpvnet
 
         public static void RemoveKey(string path)
         {
-            GetRootKey(path).DeleteSubKeyTree(path.Substring(5), false);
+            try {
+                GetRootKey(path).DeleteSubKeyTree(path.Substring(5), false);
+            } catch { }
         }
 
         public static void RemoveValue(string path, string name)
         {
-            using (RegistryKey rk = GetRootKey(path).OpenSubKey(path.Substring(5), true))
-                if (!(rk is null))
-                    rk.DeleteValue(name, false);
+            try {
+                using (RegistryKey rk = GetRootKey(path).OpenSubKey(path.Substring(5), true))
+                    if (!(rk is null))
+                        rk.DeleteValue(name, false);
+            } catch {}
         }
 
         static RegistryKey GetRootKey(string path)

mpv.net/Misc/Program.cs

@@ -13,8 +13,6 @@ namespace mpvnet
         [STAThread]
         static void Main()
         {
-            Mutex mutex = new Mutex(true, "mpvnetProcessInstance", out bool isFirst);
-
             try
             {
                 string[] args = Environment.GetCommandLineArgs().Skip(1).ToArray();
@@ -28,6 +26,7 @@ namespace mpvnet
                 }
 
                 App.Init();
+                Mutex mutex = new Mutex(true, "mpvnetProcessInstance", out bool isFirst);
 
                 if ((App.ProcessInstance == "single" || App.ProcessInstance == "queue") && !isFirst)
                 {
@@ -50,21 +49,19 @@ namespace mpvnet
                         } catch {}
                     }
 
+                    mutex.Dispose();
                     return;
                 }
 
                 Application.EnableVisualStyles();
                 Application.SetCompatibleTextRenderingDefault(false);
                 Application.Run(new MainForm());
+                mutex.Dispose();
             }
             catch (Exception ex)
             {
                 Msg.ShowException(ex);
             }
-            finally
-            {
-                mutex.Dispose();
-            }
         }
     }
 }

mpv.net/Native/Native.cs

@@ -27,6 +27,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("user32.dll")]
+        public static extern bool EnableWindow(IntPtr hWnd, bool bEnable);
+
         [DllImport("user32.dll", EntryPoint = "GetWindowLong")]
         private static extern IntPtr GetWindowLong32(IntPtr hWnd, int nIndex);
 

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("4.2.0.0")]
-[assembly: AssemblyFileVersion("4.2.0.0")]
+[assembly: AssemblyVersion("4.3.1.0")]
+[assembly: AssemblyFileVersion("4.3.1.0")]

mpv.net/Resources/mpvConfToml.txt

@@ -214,7 +214,7 @@ help = "See sub-color. Color used for sub text background. You can use sub-shado
 name = "screen"
 default = ""
 filter = "Screen"
-help = "In multi-monitor configurations (i.e. a single desktop that spans across multiple displays), this option tells mpv which screen to display the video on."
+help = "<0-32> In multi-monitor configurations (i.e. a single desktop that spans across multiple displays), this option tells mpv which screen to display the video on."
 
 [[settings]]
 name = "osd-playing-msg"

mpv.net/Resources/mpvNetConfToml.txt

@@ -23,3 +23,11 @@ help = "Defines if more then one mpv.net process is allowed."
 options = [{ name = "multi",  help = "Create a new process everytime the shell starts mpv.net" },
            { name = "single", help = "Force a single process everytime the shell starts mpv.net" },
 		   { name = "queue",  help = "Force a single process and add files to playlist" }]
+
+[[settings]]
+name = "debug-mode"
+default = "no"
+filter = "mpv.net"
+help = "Writes debug info to a file located on the desktop."
+options = [{ name = "yes" },
+           { name = "no" }]

mpv.net/WinForms/MainForm.cs

@@ -49,10 +49,8 @@ namespace mpvnet
 
                 var dummy = mp.Conf;
                 App.ProcessCommandLineEarly();
-
                 if (mp.Screen == -1) mp.Screen = Array.IndexOf(Screen.AllScreens, Screen.PrimaryScreen);
                 SetScreen(mp.Screen);
-
                 ChangeFullscreen(mp.Fullscreen);
             }
             catch (Exception ex)
@@ -224,9 +222,6 @@ namespace mpvnet
             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 */);
         }
 
@@ -343,13 +338,17 @@ namespace mpvnet
                     if (mp.WindowHandle != IntPtr.Zero)
                         Native.SendMessage(mp.WindowHandle, m.Msg, m.WParam, m.LParam);
                     break;
+                case 0x0200: // WM_MOUSEMOVE
+                    Point pos = PointToClient(Cursor.Position);
+                    mp.command_string($"mouse {pos.X} {pos.Y}");
+                    if (CursorHelp.IsPosDifferent(LastCursorPosChanged)) CursorHelp.Show();
+                    break;
                 case 0x319: // WM_APPCOMMAND
                     if (mp.WindowHandle != IntPtr.Zero)
                         Native.PostMessage(mp.WindowHandle, m.Msg, m.WParam, m.LParam);
                     break;
                 case 0x203: // Native.WM.LBUTTONDBLCLK
-                    if (!IsMouseInOSC())
-                        mp.command_string("cycle fullscreen");
+                    if (!IsMouseInOSC()) mp.command_string("cycle fullscreen");
                     break;
                 case 0x02E0: // WM_DPICHANGED
                     if (IgnoreDpiChanged) break;
@@ -389,8 +388,7 @@ namespace mpvnet
                             break;
                         case "queue":
                             foreach (string file in files)
-                                if (File.Exists(file))
-                                    mp.commandv("loadfile", file, "append");
+                                mp.commandv("loadfile", file, "append");
                             break;
                     }
                 }
@@ -436,15 +434,6 @@ namespace mpvnet
                 mp.commandv("quit");
         }
 
-        protected override void OnMouseMove(MouseEventArgs e)
-        {
-            base.OnMouseMove(e);
-            mp.command_string($"mouse {e.X} {e.Y}");
-
-            if (CursorHelp.IsPosDifferent(LastCursorPosChanged))
-                CursorHelp.Show();
-        }
-
         bool IsMouseInOSC() => PointToClient(Control.MousePosition).Y > ClientSize.Height * 0.9;
 
         void Timer_Tick(object sender, EventArgs e)
@@ -511,6 +500,7 @@ namespace mpvnet
         {
             base.OnFormClosed(e);
             RegistryHelp.SetObject(App.RegPath, "Recent", RecentFiles.ToArray());
+            App.Exit();
             mp.commandv("quit");
             mp.AutoResetEvent.WaitOne(3000);
         }

mpv.net/mpv/mp.cs

@@ -193,7 +193,10 @@ namespace mpvnet
                 mpv_event evt = (mpv_event)Marshal.PtrToStructure(ptr, typeof(mpv_event));
 
                 if (WindowHandle == IntPtr.Zero)
+                {
                     WindowHandle = FindWindowEx(MainForm.Hwnd, IntPtr.Zero, "mpv", null);
+                    //Native.EnableWindow(WindowHandle, true);
+                }
 
                 //Debug.WriteLine(evt.event_id.ToString());
 
@@ -561,47 +564,34 @@ namespace mpvnet
         {
             if (files is null || files.Length == 0) return;
             HideLogo();
-            List<string> fileList = files.ToList();
 
-            foreach (string file in files) {
-                string ext = Path.GetExtension(file).TrimStart('.').ToLower();
-                if (App.SubtitleTypes.Contains(ext)) {
-                    mp.commandv("sub-add", file);
-                    fileList.Remove(file);
-                }
-            }
+            for (int i = 0; i < files.Length; i++)
+                if (App.SubtitleTypes.Contains(Path.GetExtension(files[i]).TrimStart('.').ToLower()))
+                    mp.commandv("sub-add", files[i]);
+                else
+                    if (i == 0)
+                        mp.commandv("loadfile", files[i]);
+                    else
+                        mp.commandv("loadfile", files[i], "append");
 
-            if (fileList.Count == 0) return;
-            files = fileList.ToArray();
-            int count = mp.get_property_int("playlist-count");
-
-            foreach (string file in files)
-                mp.commandv("loadfile", file, "append");
-
-            mp.set_property_int("playlist-pos", count);
-
-            for (int i = 0; i < count; i++)
-                mp.commandv("playlist-remove", "0");
-
-            mp.LoadFolder(files[0]);
+            Task.Run(() => LoadFolder()); // user reported race condition
         }
 
-        static void LoadFolder(string path)
+        static void LoadFolder()
         {
-            if (get_property_int("playlist-count") == 1)
-            {
-                if (!File.Exists(path)) return;
-                List<string> files = Directory.GetFiles(Path.GetDirectoryName(path)).ToList();
-                files = files.Where((file) => App.VideoTypes.Contains(Path.GetExtension(file).TrimStart('.').ToLower()) ||
-                                              App.AudioTypes.Contains(Path.GetExtension(file).TrimStart('.').ToLower())).ToList();
-                files.Sort(new StringLogicalComparer());
-                int index = files.IndexOf(path);
-                files.Remove(path);
-                foreach (string i in files)
-                    commandv("loadfile", i, "append");
-                if (index > 0)
-                    commandv("playlist-move", "0", (index + 1).ToString());
-            }
+            Thread.Sleep(50); // user reported race condition
+            string path = mp.get_property_string("path");
+            if (!File.Exists(path) || get_property_int("playlist-count") != 1) return;
+            List<string> files = Directory.GetFiles(Path.GetDirectoryName(path)).ToList();
+            files = files.Where((file) =>
+                App.VideoTypes.Contains(Path.GetExtension(file).TrimStart('.').ToLower()) ||
+                App.AudioTypes.Contains(Path.GetExtension(file).TrimStart('.').ToLower())).ToList();
+            files.Sort(new StringLogicalComparer());
+            int index = files.IndexOf(path);
+            files.Remove(path);
+            foreach (string i in files)
+                commandv("loadfile", i, "append");
+            if (index > 0) commandv("playlist-move", "0", (index + 1).ToString());
         }
 
         static IntPtr AllocateUtf8IntPtrArrayWithSentinel(string[] arr, out IntPtr[] byteArrayPointers)