-

2019-03-18 22:00:08 +01:00
parent 3fd1285ad8
commit c508761c36
10 changed files with 147 additions and 107 deletions
--- a/README.md
+++ b/README.md
@@ -84,6 +84,10 @@ mp.register_event("seek", seek) # or use: mp.Seek += seek

 ### Changes

+### 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
--- a/mpv.net/MainForm.cs
+++ b/mpv.net/MainForm.cs
@@ -31,10 +31,6 @@ namespace mpvnet
                Instance = this;
                Hwnd = Handle;
                ChangeFullscreen((mp.mpvConv.ContainsKey("fullscreen") && mp.mpvConv["fullscreen"] == "yes") || (mp.mpvConv.ContainsKey("fs") && mp.mpvConv["fs"] == "yes"));
-                CMS = new ContextMenuStripEx(components);
-                CMS.Opened += CMS_Opened;
-                ContextMenuStrip = CMS;
-                BuildMenu();
            }
            catch (Exception ex)
            {
@@ -44,14 +40,6 @@ namespace mpvnet

        public void BuildMenu()
        {
-            if (!File.Exists(mp.InputConfPath))
-            {
-                if (!Directory.Exists(mp.mpvConfFolderPath))
-                    Directory.CreateDirectory(mp.mpvConfFolderPath);
-
-                File.WriteAllText(mp.InputConfPath, Properties.Resources.input_conf);
-            }
-
            foreach (var i in File.ReadAllText(mp.InputConfPath).SplitLinesNoEmpty())
            {
                if (!i.Contains("#menu:"))
@@ -129,7 +117,7 @@ namespace mpvnet
        private void mp_Shutdown()
        {
            if (!IsClosed)
-                Invoke(new Action(() => Close()));
+                BeginInvoke(new Action(() => Close()));
        }

        public bool IsFullscreen
@@ -293,6 +281,15 @@ namespace mpvnet
            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);
@@ -302,7 +299,7 @@ namespace mpvnet
            for (int i = 0; i < 99; i++)
            {
                if (mp.IsShutdownComplete) break;
-                Thread.Sleep(50);
+                Thread.Sleep(100);
            }
        }
    }
--- a/mpv.net/Properties/AssemblyInfo.cs
+++ b/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.1.0.0")]
-[assembly: AssemblyFileVersion("1.1.0.0")]
+[assembly: AssemblyVersion("1.2.0.0")]
+[assembly: AssemblyFileVersion("1.2.0.0")]
--- a/mpv.net/Properties/Resources.Designer.cs
+++ b/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);
+            }
+        }
    }
 }
--- a/mpv.net/Properties/Resources.resx
+++ b/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>
--- a/mpv.net/Resources/input.conf.txt
+++ b/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
--- a/mpv.net/Resources/mpv.conf.txt
+++ b/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/
--- a/mpv.net/mp.cs
+++ b/mpv.net/mp.cs
@@ -88,18 +88,18 @@ namespace mpvnet

        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();
-            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());
--- a/mpv.net/mpv.net.csproj
+++ b/mpv.net/mpv.net.csproj
@@ -132,6 +132,11 @@
    <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="PyScript.cs" />
    <Compile Include="StringExtensions.cs" />
    <Compile Include="libmpv.cs" />
@@ -155,14 +160,9 @@
    </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="Properties\Settings.settings">
      <Generator>SettingsSingleFileGenerator</Generator>
@@ -173,6 +173,7 @@
      <DependentUpon>Settings.settings</DependentUpon>
      <DesignTimeSharedInput>True</DesignTimeSharedInput>
    </Compile>
+    <Content Include="Resources\mpv.conf.txt" />
  </ItemGroup>
  <ItemGroup>
    <None Include="App.config" />
@@ -180,7 +181,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" />
--- a/release.ps1
+++ b/release.ps1
@@ -4,7 +4,6 @@ $version = [Diagnostics.FileVersionInfo]::GetVersionInfo($exePath).FileVersion
 $desktopDir = [Environment]::GetFolderPath("Desktop")
 $targetDir = $desktopDir + "\mpv.net-" + $version
 Copy-Item $scriptDir\mpv.net\bin\Debug $targetDir -recurse
-$addonDir = $targetDir + "\Addons"
 $7zPath = "C:\Program Files\7-Zip\7z.exe"
 $args = "a -t7z -mx9 $targetDir.7z -r $targetDir\*"
 Start-Process -FilePath $7zPath -ArgumentList $args