few layout problems were fixed, autosize for instance did not work

Changelog.md

@@ -1,3 +1,25 @@
+### 4.7.1
+
+- few layout problems were fixed, autosize for instance did not work
+
+### 4.7
+
+- remember-height was replaced with start-size, when start-size is set
+  to video the main video starts directly with the native video size,
+  before it was starting with the autofit size first and was only
+  afterwards resized to the native video size
+- on exit the window location can be saved with remember-position
+- in the learn window of the input editor underscores were stripped
+  because they have a special meaning in WPF labels 
+- fix for keys/input not working for MBTN_LEFT_DBL, MBTN_BACK, MBTN_FORWARD
+- in the learn window of the input editor support was added for
+  mouse left, mouse left double, mouse mid, mouse forward, mouse back
+- libmpv was updated to shinchiro 2019-07-07
+- when border is none it wasn't possible to minimize the window from
+  the task bar because this is the WinForms default behavier. This
+  was fixed by calling Spy++ to the rescue and adding WS_MINIMIZEBOX
+  in CreateParams
+
 ### 4.6
 
 - fix for middle mouse button not working

Manual.md

@@ -102,9 +102,9 @@ mpv.net is meant to be a small single person project, it's designed to be mpv co
 
 ### Target Audience
 
-The target audience of mpv.net are Windows programmers and users that need something more advanced than common media players.
+The target audience of mpv.net are programmers, nerds and software enthusiasts that need something more advanced than typical media players.
 
-Furthermore mpv.net is well suited for Windows users who are interested to learn about the Linux operating system and portable apps, even though mpv.net self is not portable.
+Furthermore mpv.net is well suited for users who are interested to learn mpv, Linux, portable apps and the command line.
 
 ## Requirements
 

README.md

@@ -195,6 +195,10 @@ Third party components:
 
 Please click on the star at the top of the page and like mpv.net at [alternativeto.net](https://alternativeto.net/software/mpv-net/).
 
+If you like you can express your appreciation for my player by sending little beer money with paypal.
+
+<https://www.paypal.me/stax76>
+
 ### Links
 
 mpv manual: <https://mpv.io/manual/master/>

mpv.net/Misc/Misc.cs

@@ -28,6 +28,8 @@ namespace mpvnet
         public static string[] SubtitleTypes { get; } = "srt ass idx sup ttxt ssa smi".Split(' ');
         public static string[] UrlWhitelist { get; set; } = { "tube", "vimeo", "ard", "zdf" };
 
+        public static bool RememberHeight { get; set; } = true;
+        public static bool RememberPosition { get; set; }
         public static bool DebugMode { get; set; } = false;
 
         public static bool IsDarkMode { 
@@ -36,6 +38,9 @@ namespace mpvnet
 
         public static void Init()
         {
+            string dummy = mp.ConfFolder;
+            var dummy2 = mp.Conf;
+
             foreach (var i in Conf)
                 ProcessProperty(i.Key, i.Value);
 
@@ -83,6 +88,8 @@ namespace mpvnet
         {
             switch (name)
             {
+                case "remember-position": RememberPosition = value == "yes"; break;
+                case "start-size": RememberHeight = value == "previous"; break;
                 case "process-instance": ProcessInstance = value; break;
                 case "dark-mode": DarkMode = value; break;
                 case "debug-mode": DebugMode = value == "yes"; break;

mpv.net/Misc/Program.cs

@@ -5,7 +5,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Threading;
 using System.Diagnostics;
-using System.Runtime.InteropServices;
 
 namespace mpvnet
 {

mpv.net/Native/Native.cs

@@ -39,7 +39,7 @@ namespace mpvnet
         [DllImport("user32.dll", EntryPoint = "GetWindowLongPtr")]
         private static extern IntPtr GetWindowLong64(IntPtr hWnd, int nIndex);
 
-        public static IntPtr GetWindowLongPtr(IntPtr hWnd, int nIndex)
+        public static IntPtr GetWindowLong(IntPtr hWnd, int nIndex)
         {
             if (IntPtr.Size == 8)
                 return GetWindowLong64(hWnd, nIndex);

mpv.net/Native/NativeHelp.cs

@@ -32,7 +32,7 @@ namespace mpvnet
 
         public static void AddWindowBorders(IntPtr hwnd, ref Native.RECT rc)
         {
-            Native.AdjustWindowRect(ref rc, (uint)Native.GetWindowLongPtr(hwnd, -16 /* GWL_STYLE */), false);
+            Native.AdjustWindowRect(ref rc, (uint)Native.GetWindowLong(hwnd, -16 /* GWL_STYLE */), false);
         }
     }
 }

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.6.0.0")]
-[assembly: AssemblyFileVersion("4.6.0.0")]
+[assembly: AssemblyVersion("4.7.1.0")]
+[assembly: AssemblyFileVersion("4.7.1.0")]

mpv.net/Resources/inputConf.txt

@@ -24,6 +24,8 @@
 
  # mpv input keys:     https://github.com/stax76/mpv.net/wiki/mpv-input-keys
 
+ # run mpv.net in input test mode with: mpvnet --input-test
+
  o           script-message mpv.net open-files #menu: Open > Open Files...
  u           script-message mpv.net open-url   #menu: Open > Open URL or file path from clipboard
  _           ignore                            #menu: Open > -
@@ -183,3 +185,4 @@
  Ctrl+Wheel_Up   no-osd seek  7
  Ctrl+Wheel_Down no-osd seek -7
  MBTN_LEFT_DBL cycle fullscreen
+ KP_ENTER      cycle fullscreen

mpv.net/Resources/mpvConfToml.txt

@@ -254,14 +254,6 @@ default = "50%"
 filter = "Screen"
 help = "Set the initial window size in percent. Please note that this setting is only partly implemented in mpv.net, accepted are only integer values with percent sign added. Default: 50%"
 
-[[settings]]
-name = "remember-height"
-default = "yes"
-filter = "Screen"
-help = "mpv.net specific setting to remember the window height, otherwise the video's native resolution is used."
-options = [{ name = "yes" },
-           { name = "no" }]
-
 [[settings]]
 name = "keep-open-pause"
 default = "yes"
@@ -282,7 +274,7 @@ options = [{ name = "yes",    help = "Don't terminate if the current file is the
 [[settings]]
 name = "loop-file"
 filter = "Playback"
-help = "Loop a single file N times. inf means forever, no means normal playback.\n\nThe difference to loop-playlist is that this doesn't loop the playlist, just the file itself. If the playlist contains only a single file, the difference between the two option is that this option performs a seek on loop, instead of reloading the file. loop is an alias for this option."
+help = "<N|inf|no> Loop a single file N times. inf means forever, no means normal playback.\n\nThe difference to loop-playlist is that this doesn't loop the playlist, just the file itself. If the playlist contains only a single file, the difference between the two option is that this option performs a seek on loop, instead of reloading the file. loop is an alias for this option."
 
 [[settings]]
 name = "save-position-on-quit"

mpv.net/Resources/mpvNetConfToml.txt

@@ -29,3 +29,19 @@ filter = "General"
 help = "mpv.net specific setting that writes debug info to a file located on the desktop."
 options = [{ name = "yes" },
            { name = "no" }]
+
+[[settings]]
+name = "start-size"
+default = "previous"
+filter = "Screen"
+help = "mpv.net specific setting to remember the window height in the current session, otherwise the video's native resolution is used."
+options = [{ name = "video", help = "Window size is set to native video resolution" },
+           { name = "previous", help = "Window size is remembered but only from the current session" }]
+
+[[settings]]
+name = "remember-position"
+default = "no"
+filter = "Screen"
+help = "mpv.net specific setting to save the window position on exit."
+options = [{ name = "yes" },
+           { name = "no" }]

mpv.net/WPF/LearnWindow.xaml

@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d"
         Title="Learn Input" Height="200" Width="400" WindowStartupLocation="CenterOwner"
-        ResizeMode="NoResize" Loaded="Window_Loaded" Background="Black" MouseWheel="Window_MouseWheel">
+        ResizeMode="NoResize" Loaded="Window_Loaded" Background="Black" MouseWheel="Window_MouseWheel" MouseUp="Window_MouseUp" MouseDoubleClick="Window_MouseDoubleClick">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="*" />
@@ -16,8 +16,8 @@
             <ColumnDefinition Width="*" />
             <ColumnDefinition Width="*" />
         </Grid.ColumnDefinitions>
-        <Label x:Name="MenuLabel" Grid.ColumnSpan="2" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="16"></Label>
-        <Label x:Name="KeyLabel" Grid.Row="1" Grid.ColumnSpan="2" Foreground="White" VerticalAlignment="Top" HorizontalAlignment="Center" FontSize="16"></Label>
+        <TextBlock x:Name="MenuTextBlock" Grid.ColumnSpan="2" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="16"></TextBlock>
+        <TextBlock x:Name="KeyTextBlock" Grid.Row="1" Grid.ColumnSpan="2" Foreground="White" VerticalAlignment="Top" HorizontalAlignment="Center" FontSize="16"></TextBlock>
         <Button x:Name="ConfirmButton" Grid.Row="2" Click="ConfirmButton_Click">Confirm</Button>
         <Button x:Name="ClearButton" Grid.Row="2" Click="ClearButton_Click" Grid.Column="1">Clear</Button>
     </Grid>

mpv.net/WPF/LearnWindow.xaml.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Runtime.InteropServices;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Input;
 using System.Windows.Interop;
@@ -12,10 +13,7 @@ namespace mpvnet
         public CommandItem InputItem { get; set; }
         public string NewKey { get; set; } = "";
 
-        public LearnWindow()
-        {
-            InitializeComponent();
-        }
+        public LearnWindow() => InitializeComponent();
 
         private IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
         {
@@ -43,8 +41,7 @@ namespace mpvnet
             else
                 try {
                     text = Convert.ToChar(charValue).ToString().ToLower().Trim();
-                }
-                catch {}
+                } catch {}
 
             for (int i = 0; i < 13; i++)
                 if ("D" + i.ToString() == text)
@@ -144,8 +141,8 @@ namespace mpvnet
         void SetKey(string key)
         {
             NewKey = key;
-            MenuLabel.Content = InputItem.Path;
-            KeyLabel.Content = key;
+            MenuTextBlock.Text = InputItem.Path;
+            KeyTextBlock.Text = key;
         }
 
         [DllImport("user32.dll")]
@@ -295,5 +292,38 @@ namespace mpvnet
             else
                 SetKey("WHEEL_DOWN");
         }
+
+        private void Window_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            switch (e.ChangedButton)
+            {
+                case MouseButton.Left:
+                    if (BlockMBTN_LEFT)
+                        BlockMBTN_LEFT = false;
+                    else
+                        SetKey("MBTN_LEFT");
+                    break;
+                case MouseButton.Middle:
+                    SetKey("MBTN_MID");
+                    break;
+                case MouseButton.XButton1:
+                    SetKey("MBTN_BACK");
+                    break;
+                case MouseButton.XButton2:
+                    SetKey("MBTN_FORWARD");
+                    break;
+            }
+        }
+
+        bool BlockMBTN_LEFT;
+
+        private void Window_MouseDoubleClick(object sender, MouseButtonEventArgs e)
+        {
+            if (e.ChangedButton == MouseButton.Left)
+            {
+                SetKey("MBTN_LEFT_DBL");
+                BlockMBTN_LEFT = true;
+            }
+        }
     }
 }

mpv.net/WinForms/MainForm.Designer.cs

@@ -45,7 +45,7 @@
             this.AutoScaleDimensions = new System.Drawing.SizeF(288F, 288F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
             this.BackColor = System.Drawing.Color.Black;
-            this.ClientSize = new System.Drawing.Size(606, 368);
+            this.ClientSize = new System.Drawing.Size(348, 0);
             this.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);

mpv.net/WinForms/MainForm.cs

@@ -8,6 +8,7 @@ using System.Linq;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Globalization;
+using System.Threading.Tasks;
 
 namespace mpvnet
 {
@@ -36,7 +37,6 @@ namespace mpvnet
                 WPF.WPF.Init();
                 System.Windows.Application.Current.ShutdownMode = System.Windows.ShutdownMode.OnExplicitShutdown;
                 Hwnd = Handle;
-                MinimumSize = new Size(FontHeight * 16, FontHeight * 9);
                 Text += " " + Application.ProductVersion;
 
                 object recent = RegHelp.GetObject(App.RegPath, "Recent");
@@ -46,11 +46,40 @@ namespace mpvnet
                 else
                     RecentFiles = new List<string>();
 
-                var dummy = mp.Conf;
                 App.ProcessCommandLineEarly();
+
                 if (mp.Screen == -1) mp.Screen = Array.IndexOf(Screen.AllScreens, Screen.PrimaryScreen);
-                SetScreen(mp.Screen);
-                CycleFullscreen(mp.Fullscreen);
+                int targetIndex = mp.Screen;
+                Screen[] screens = Screen.AllScreens;
+                if (targetIndex < 0) targetIndex = 0;
+                if (targetIndex > screens.Length - 1) targetIndex = screens.Length - 1;
+                Screen screen = screens[Array.IndexOf(screens, screens[targetIndex])];
+                Rectangle target = screen.Bounds;
+                Left = target.X + (target.Width - Width) / 2;
+                Top = target.Y + (target.Height - Height) / 2;
+
+                int posX = RegHelp.GetInt(App.RegPath, "PosX");
+                int posY = RegHelp.GetInt(App.RegPath, "PosY");
+
+                if (posX != 0 && posY != 0 && App.RememberPosition)
+                {
+                    Left = posX - Width / 2;
+                    Top = posY - Height / 2;
+                }
+
+                mp.Shutdown += Shutdown;
+                mp.VideoSizeChanged += VideoSizeChanged;
+                mp.FileLoaded += FileLoaded;
+                mp.Idle += Idle;
+                Task.Run(() => mp.Init());
+                mp.VideoSizeAutoResetEvent.WaitOne(1000);
+                mp.observe_property_bool("fullscreen", PropChangeFullscreen);
+                mp.observe_property_bool("ontop", PropChangeOnTop);
+                mp.observe_property_bool("border", PropChangeBorder);
+                mp.observe_property_string("sid", PropChangeSid);
+                mp.observe_property_string("aid", PropChangeAid);
+                mp.observe_property_string("vid", PropChangeVid);
+                mp.observe_property_int("edition", PropChangeEdition);
             }
             catch (Exception ex)
             {
@@ -60,7 +89,7 @@ namespace mpvnet
 
         public MenuItem FindMenuItem(string text) => FindMenuItem(text, ContextMenu.Items);
 
-        void Idle() => BeginInvoke(new Action(() => { Text = "mpv.net " + Application.ProductVersion; }));
+        void Idle() => BeginInvoke(new Action(() => Text = "mpv.net " + Application.ProductVersion));
 
         void CM_Popup(object sender, EventArgs e) => CursorHelp.Show();
 
@@ -192,58 +221,41 @@ namespace mpvnet
             return null;
         }
 
-        protected void SetScreen(int targetIndex)
-        {
-            Screen[] screens = Screen.AllScreens;
-            if (targetIndex < 0) targetIndex = 0;
-            if (targetIndex > screens.Length - 1) targetIndex = screens.Length - 1;
-            SetScreen(screens[Array.IndexOf(screens, screens[targetIndex])]);
-        }
-
-        protected void SetScreen(Screen screen)
-        {
-            Rectangle target = screen.Bounds;
-            Left = target.X + Convert.ToInt32((target.Width - Width) / 2.0);
-            Top = target.Y + Convert.ToInt32((target.Height - Height) / 2.0);
-            SetStartFormPositionAndSize();
-        }
-
-        void SetStartFormPositionAndSize()
-        {
-            if (IsFullscreen || mp.VideoSize.Width == 0) return;
-            Screen screen = Screen.FromControl(this);
-            int height = Convert.ToInt32(screen.Bounds.Height * mp.Autofit);
-            int width = Convert.ToInt32(height * mp.VideoSize.Width / (double)mp.VideoSize.Height);
-            Point middlePos = new Point(Left + Width / 2, Top + Height / 2);
-            var rect = new Native.RECT(new Rectangle(screen.Bounds.X, screen.Bounds.Y, width, height));
-            NativeHelp.AddWindowBorders(Handle, ref rect);
-            int left = middlePos.X - rect.Width / 2;
-            int top = middlePos.Y - rect.Height / 2;
-            Native.SetWindowPos(Handle, IntPtr.Zero /* HWND_TOP */, left, top, rect.Width, rect.Height, 4 /* SWP_NOZORDER */);
-        }
+        bool WasInitialSizeSet;
 
         void SetFormPosAndSize()
         {
-            if (IsFullscreen)
+            if (mp.Fullscreen)
+            {
+                CycleFullscreen(true);
                 return;
+            }
+
+            Screen screen = Screen.FromControl(this);
+            int autoFitHeight = Convert.ToInt32(screen.Bounds.Height * mp.Autofit);
+
+            if (mp.VideoSize.Height == 0 || mp.VideoSize.Width == 0 ||
+                mp.VideoSize.Width / (float)mp.VideoSize.Height < 1.3)
+
+                mp.VideoSize = new Size((int)(autoFitHeight * 1.7), autoFitHeight);
 
             Size size = mp.VideoSize;
-            Screen screen = Screen.FromControl(this);
-            int fixedHeight = Convert.ToInt32(screen.Bounds.Height * mp.Autofit);
-
-            if (size.Height == 0 || size.Width == 0 || size.Width / (float)size.Height < 1.2)
-            {
-                size.Height = fixedHeight;
-                size.Width = (int)(fixedHeight * 1.8);
-            }
 
             int height = size.Height;
 
-            if (mp.RememberHeight)
-                height = ClientSize.Height;
+            if (App.RememberHeight)
+            {
+                if (WasInitialSizeSet)
+                    height = ClientSize.Height;
+                else
+                {
+                    height = autoFitHeight;
+                    WasInitialSizeSet = true;
+                }
+            }
 
             if (height > screen.Bounds.Height * 0.9)
-                height = fixedHeight;
+                height = autoFitHeight;
 
             int width = Convert.ToInt32(height * size.Width / (double)size.Height);
             Point middlePos = new Point(Left + Width / 2, Top + Height / 2);
@@ -251,10 +263,49 @@ namespace mpvnet
             NativeHelp.AddWindowBorders(Handle, ref rect);
             int left = middlePos.X - rect.Width / 2;
             int top = middlePos.Y - rect.Height / 2;
+
             Screen[] screens = Screen.AllScreens;
+            int minLeft = screens.Select(val => val.WorkingArea.X).Min();
+            int maxRight = screens.Select(val => val.WorkingArea.Right).Max();
+            int minTop = screens.Select(val => val.WorkingArea.Y).Min();
+            int maxBottom = screens.Select(val => val.WorkingArea.Bottom).Max();
+
+            if (left < minLeft) left = minLeft;
+            if (left + rect.Width > maxRight) left = maxRight - rect.Width;
+            if (top < minTop) top = minTop;
+            if (top + rect.Height > maxBottom) top = maxBottom - rect.Height;
+
             Native.SetWindowPos(Handle, IntPtr.Zero /* HWND_TOP */, left, top, rect.Width, rect.Height, 4 /* SWP_NOZORDER */);
         }
 
+        public void CycleFullscreen(bool enabled)
+        {
+            mp.Fullscreen = enabled;
+
+            if (enabled)
+            {
+                if (WindowState != FormWindowState.Maximized)
+                {
+                    FormBorderStyle = FormBorderStyle.None;
+                    WindowState = FormWindowState.Maximized;
+                }
+            }
+            else
+            {
+                if (WindowState == FormWindowState.Maximized)
+                {
+                    WindowState = FormWindowState.Normal;
+
+                    if (mp.Border)
+                        FormBorderStyle = FormBorderStyle.Sizable;
+                    else
+                        FormBorderStyle = FormBorderStyle.None;
+
+                    SetFormPosAndSize();
+                }
+            }
+        }
+
         public void BuildMenu()
         {
             string content = File.ReadAllText(mp.InputConfPath);
@@ -309,26 +360,11 @@ namespace mpvnet
            Msg.ShowError(e.ExceptionObject.ToString());
         }
 
-        public void CycleFullscreen(bool enabled)
-        {
-            if (enabled)
-            {
-                if (WindowState != FormWindowState.Maximized)
-                {
-                    FormBorderStyle = FormBorderStyle.None;
-                    WindowState = FormWindowState.Maximized;
-                }
-            }
-            else
-            {
-                WindowState = FormWindowState.Normal;
-
-                if (mp.Border)
-                    FormBorderStyle = FormBorderStyle.Sizable;
-                else
-                    FormBorderStyle = FormBorderStyle.None;
-
-                SetFormPosAndSize();
+        protected override CreateParams CreateParams {
+            get {
+                CreateParams cp = base.CreateParams;
+                cp.Style |= 0x00020000 /* WS_MINIMIZEBOX */;
+                return cp;
             }
         }
 
@@ -340,20 +376,24 @@ namespace mpvnet
             {
                 case 0x0201: // WM_LBUTTONDOWN
                 case 0x0202: // WM_LBUTTONUP
+                case 0x0207: // WM_MBUTTONDOWN
+                case 0x0208: // WM_MBUTTONUP
+                case 0x020A: // WM_MOUSEWHEEL
+                case 0x020C: // WM_XBUTTONUP
+                case 0x020B: // WM_XBUTTONDOWN
                 case 0x0100: // WM_KEYDOWN
                 case 0x0101: // WM_KEYUP
                 case 0x0104: // WM_SYSKEYDOWN
                 case 0x0105: // WM_SYSKEYUP
-                case 0x020A: // WM_MOUSEWHEEL
-                case 0x0207: // WM_MBUTTONDOWN
-                case 0x0208: // WM_MBUTTONUP
                     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();
+                    {
+                        Point pos = PointToClient(Cursor.Position);
+                        mp.command_string($"mouse {pos.X} {pos.Y}");
+                        if (CursorHelp.IsPosDifferent(LastCursorPosChanged)) CursorHelp.Show();
+                    }
                     break;
                 case 0x2a3: // WM_MOUSELEAVE
                     mp.command_string("mouse 1 1"); // osc won't always auto hide
@@ -363,7 +403,10 @@ namespace mpvnet
                         Native.PostMessage(mp.WindowHandle, m.Msg, m.WParam, m.LParam);
                     break;
                 case 0x203: // Native.WM.LBUTTONDBLCLK
-                    if (!IsMouseInOSC()) mp.command_string("cycle fullscreen");
+                    {
+                        Point pos = PointToClient(Cursor.Position);
+                        mp.command_string($"mouse {pos.X} {pos.Y} 0 double");
+                    }
                     break;
                 case 0x02E0: // WM_DPICHANGED
                     if (IgnoreDpiChanged) break;
@@ -463,23 +506,6 @@ namespace mpvnet
             }));
         }
 
-        protected override void OnLoad(EventArgs e)
-        {
-            base.OnLoad(e);
-            mp.Init();
-            mp.observe_property_bool("fullscreen", PropChangeFullscreen);
-            mp.observe_property_bool("ontop", PropChangeOnTop);
-            mp.observe_property_bool("border", PropChangeBorder);
-            mp.observe_property_string("sid", PropChangeSid);
-            mp.observe_property_string("aid", PropChangeAid);
-            mp.observe_property_string("vid", PropChangeVid);
-            mp.observe_property_int("edition", PropChangeEdition);
-            mp.Shutdown += Shutdown;
-            mp.VideoSizeChanged += VideoSizeChanged;
-            mp.FileLoaded += FileLoaded;
-            mp.Idle += Idle;
-        }
-
         protected override void OnShown(EventArgs e)
         {
             base.OnShown(e);
@@ -507,13 +533,20 @@ namespace mpvnet
             if (mp.IsLogoVisible) mp.ShowLogo();
         }
 
-        protected override void OnFormClosed(FormClosedEventArgs e)
+        protected override void OnFormClosing(FormClosingEventArgs e)
         {
-            base.OnFormClosed(e);
+            base.OnFormClosing(e);
+
+            if (WindowState == FormWindowState.Normal)
+            {
+                RegHelp.SetObject(App.RegPath, "PosX", Left + Width / 2);
+                RegHelp.SetObject(App.RegPath, "PosY", Top + Height / 2);
+            }
+
             RegHelp.SetObject(App.RegPath, "Recent", RecentFiles.ToArray());
             App.Exit();
             mp.commandv("quit");
-            mp.AutoResetEvent.WaitOne(3000);
+            mp.ShutdownAutoResetEvent.WaitOne(3000);
         }
 
         protected override void OnMouseDown(MouseEventArgs e)

mpv.net/mpv/mp.cs

@@ -58,9 +58,10 @@ namespace mpvnet
         public static List<KeyValuePair<string, Action<bool>>> BoolPropChangeActions { get; set; } = new List<KeyValuePair<string, Action<bool>>>();
         public static List<KeyValuePair<string, Action<int>>> IntPropChangeActions { get; set; } = new List<KeyValuePair<string, Action<int>>>();
         public static List<KeyValuePair<string, Action<string>>> StringPropChangeActions { get; set; } = new List<KeyValuePair<string, Action<string>>>();
-        public static Size VideoSize { get; set; } = new Size(1920, 1080);
+        public static Size VideoSize { get; set; }
         public static List<PythonScript> PythonScripts { get; set; } = new List<PythonScript>();
-        public static AutoResetEvent AutoResetEvent { get; set; } = new AutoResetEvent(false);
+        public static AutoResetEvent ShutdownAutoResetEvent { get; set; } = new AutoResetEvent(false);
+        public static AutoResetEvent VideoSizeAutoResetEvent { get; set; } = new AutoResetEvent(false);
         public static List<MediaTrack> MediaTracks { get; set; } = new List<MediaTrack>();
         public static List<KeyValuePair<string, double>> Chapters { get; set; } = new List<KeyValuePair<string, double>>();
 
@@ -72,13 +73,31 @@ namespace mpvnet
 
         public static bool Fullscreen { get; set; }
         public static bool Border { get; set; } = true;
-        public static bool RememberHeight { get; set; } = true;
 
         public static int Screen { get; set; } = -1;
         public static int Edition { get; set; }
 
         public static float Autofit { get; set; } = 0.5f;
 
+        static string LastPlaybackRestartFile;
+
+        public static void Init()
+        {
+            LoadLibrary("mpv-1.dll");
+            Handle = mpv_create();
+            set_property_string("osc", "yes");
+            set_property_string("config", "yes");
+            set_property_string("wid", MainForm.Hwnd.ToString());
+            set_property_string("force-window", "yes");
+            set_property_string("input-media-keys", "yes");
+            mpv_initialize(Handle);
+            ShowLogo();
+            ProcessCommandLine();
+            Task.Run(() => { LoadScripts(); });
+            Task.Run(() => { Addon = new Addon(); });
+            Task.Run(() => { EventLoop(); });
+        }
+
         public static void ProcessProperty(string name, string value)
         {
             switch (name)
@@ -92,7 +111,6 @@ namespace mpvnet
                 case "fullscreen": Fullscreen = value == "yes"; break;
                 case "border": Border = value == "yes"; break;
                 case "screen": Screen = Convert.ToInt32(value); break;
-                case "remember-height": RememberHeight = value == "yes"; break;
             }
         }
 
@@ -161,24 +179,6 @@ namespace mpvnet
             }
         }
 
-        public static void Init()
-        {
-            string dummy = ConfFolder;
-            LoadLibrary("mpv-1.dll");
-            Handle = mpv_create();
-            set_property_string("osc", "yes");
-            set_property_string("config", "yes");
-            set_property_string("wid", MainForm.Hwnd.ToString());
-            set_property_string("force-window", "yes");
-            set_property_string("input-media-keys", "yes");
-            mpv_initialize(Handle);
-            ShowLogo();
-            ProcessCommandLine();
-            Task.Run(() => { LoadScripts(); });
-            Task.Run(() => { Addon = new Addon(); });
-            Task.Run(() => { EventLoop(); });
-        }
-
         public static void LoadScripts()
         {
             string[] startupScripts = Directory.GetFiles(Application.StartupPath + "\\Scripts");
@@ -213,7 +213,7 @@ namespace mpvnet
                 if (WindowHandle == IntPtr.Zero)
                     WindowHandle = FindWindowEx(MainForm.Hwnd, IntPtr.Zero, "mpv", null);
 
-                //System.Diagnostics.Debug.WriteLine(evt.event_id.ToString());
+                // System.Diagnostics.Debug.WriteLine(evt.event_id.ToString());
 
                 try
                 {
@@ -222,7 +222,7 @@ namespace mpvnet
                         case mpv_event_id.MPV_EVENT_SHUTDOWN:
                             Shutdown?.Invoke();
                             WriteHistory(null);
-                            AutoResetEvent.Set();
+                            ShutdownAutoResetEvent.Set();
                             return;
                         case mpv_event_id.MPV_EVENT_LOG_MESSAGE:
                             LogMessage?.Invoke();
@@ -311,15 +311,21 @@ namespace mpvnet
                             break;
                         case mpv_event_id.MPV_EVENT_PLAYBACK_RESTART:
                             PlaybackRestart?.Invoke();
-                            Size vidSize = new Size(get_property_int("dwidth"), get_property_int("dheight"));
-
-                            if (VideoSize != vidSize && vidSize != Size.Empty)
+                            string path = get_property_string("path");
+                            if (LastPlaybackRestartFile != path)
                             {
-                                VideoSize = vidSize;
-                                VideoSizeChanged?.Invoke();
+                                Size vidSize = new Size(get_property_int("dwidth"), get_property_int("dheight"));
+                                if (vidSize.Width == 0 || vidSize.Height == 0)
+                                    vidSize = new Size(1, 1);
+                                if (VideoSize != vidSize)
+                                {
+                                    VideoSize = vidSize;
+                                    VideoSizeChanged?.Invoke();
+                                }
+                                VideoSizeAutoResetEvent.Set();
+                                Task.Run(new Action(() => ReadMetaData()));
+                                LastPlaybackRestartFile = path;
                             }
-
-                            Task.Run(new Action(() => ReadMetaData()));
                             break;
                         case mpv_event_id.MPV_EVENT_CHAPTER_CHANGE:
                             ChapterChange?.Invoke();
@@ -516,6 +522,12 @@ namespace mpvnet
 
             Load(files.ToArray(), App.ProcessInstance != "queue", Control.ModifierKeys.HasFlag(Keys.Control));
 
+            if (files.Count == 0)
+            {
+                VideoSizeAutoResetEvent.Set();
+                VideoSizeChanged?.Invoke();
+            }
+
             foreach (string i in args)
             {
                 if (i.StartsWith("--"))
@@ -539,7 +551,7 @@ namespace mpvnet
             }
         }
 
-        static DateTime LastLoad;
+        public static DateTime LastLoad;
 
         public static void Load(string[] files, bool loadFolder, bool append)
         {