v6.0.4.0 Stable

input.conf.txt: add binding for overriding sub styles

docs/Changelog.md

@@ -1,4 +1,10 @@
 
+# v6.0.4.0 Stable (2023-08-17)
+
+- libmpv-2.dll support
+- MediaInfo v23.07
+- libmpv shinchiro 2023-08-16
+
 # v6.0.3.2 Beta (2022-10-14)
 
 - Support multiple folders input (regression fix).

docs/Manual.md

@@ -318,7 +318,7 @@ Shows chapters in the command palette.
 Shows the command palette.
 
 ### show-commands
-Shows available mpv imput commands.
+Shows available mpv input commands.
 
 ### show-conf-editor
 Shows the conf editor.
@@ -341,7 +341,7 @@ Shows available keys (as shown with `--input-keylist`) in the command palette.
 
 ### show-media-info [\<flags\>]
 **msgbox**  
-Shows media info in a messsge box.
+Shows media info in a messsage box.
 
 **editor**  
 Shows media info in the text editor.

src/Misc/App.cs

@@ -141,7 +141,7 @@ namespace mpvnet
 
         public static string Version => "Copyright (C) 2000-2022 mpv.net/mpv/mplayer\n" +
             $"mpv.net {Application.ProductVersion}" + GetLastWriteTime(Application.ExecutablePath) + "\n" +
-            $"{Core.GetPropertyString("mpv-version")}" + GetLastWriteTime(Folder.Startup + "mpv-2.dll") + "\n" +
+            $"{Core.GetPropertyString("mpv-version")}" + GetLastWriteTime(Folder.Startup + "libmpv-2.dll") + "\n" +
             $"ffmpeg {Core.GetPropertyString("ffmpeg-version")}\n" +
             $"MediaInfo {FileVersionInfo.GetVersionInfo(Path.Combine(Application.StartupPath, "MediaInfo.dll")).FileVersion}" +
             GetLastWriteTime(Path.Combine(Application.StartupPath , "MediaInfo.dll")) + "\nGPL v2 License";

src/Misc/Commands.cs

@@ -546,13 +546,16 @@ namespace mpvnet
             {
                 int index = i;
                 string file = Core.GetPropertyString($"playlist/{i}/filename");
+                string title = Core.GetPropertyString($"playlist/{i}/title");
 
                 CommandPaletteItem item = new CommandPaletteItem()
                 {
-                    Text = file.FileName(),
+                    Text = title,
                     Action = () => Core.SetPropertyInt("playlist-pos", index)
                 };
 
+                if (string.IsNullOrEmpty(item.Text))
+                    item.Text = file.FileName();
                 if (string.IsNullOrEmpty(item.Text))
                     item.Text = file;
 

src/Misc/ExtensionMethods.cs

@@ -120,14 +120,13 @@ public static class PathStringExtension
         return instance;
     }
 
-    // Ensure trailing directory separator char
     public static string AddSep(this string instance)
     {
         if (string.IsNullOrEmpty(instance))
             return "";
 
         if (!instance.EndsWith(Path.DirectorySeparatorChar.ToString()))
-            instance = instance + Path.DirectorySeparatorChar;
+            instance += Path.DirectorySeparatorChar;
 
         return instance;
     }

src/Native/libmpv.cs

@@ -5,70 +5,70 @@ using System.Text;
 
 public class libmpv
 {
-    [DllImport("mpv-2.dll", CallingConvention = CallingConvention.Cdecl)]
+    [DllImport("libmpv-2.dll", CallingConvention = CallingConvention.Cdecl)]
     public static extern IntPtr mpv_create();
 
-    [DllImport("mpv-2.dll", CallingConvention = CallingConvention.Cdecl)]
+    [DllImport("libmpv-2.dll", CallingConvention = CallingConvention.Cdecl)]
     public static extern IntPtr mpv_create_client(IntPtr mpvHandle, [MarshalAs(UnmanagedType.LPUTF8Str)] string command);
 
-    [DllImport("mpv-2.dll", CallingConvention = CallingConvention.Cdecl)]
+    [DllImport("libmpv-2.dll", CallingConvention = CallingConvention.Cdecl)]
     public static extern mpv_error mpv_initialize(IntPtr mpvHandle);
 
-    [DllImport("mpv-2.dll", CallingConvention = CallingConvention.Cdecl)]
+    [DllImport("libmpv-2.dll", CallingConvention = CallingConvention.Cdecl)]
     public static extern void mpv_destroy(IntPtr mpvHandle);
 
-    [DllImport("mpv-2.dll", CallingConvention = CallingConvention.Cdecl)]
+    [DllImport("libmpv-2.dll", CallingConvention = CallingConvention.Cdecl)]
     public static extern mpv_error mpv_command(IntPtr mpvHandle, IntPtr strings);
 
-    [DllImport("mpv-2.dll", CallingConvention = CallingConvention.Cdecl)]
+    [DllImport("libmpv-2.dll", CallingConvention = CallingConvention.Cdecl)]
     public static extern mpv_error mpv_command_string(IntPtr mpvHandle, [MarshalAs(UnmanagedType.LPUTF8Str)] string command);
 
-    [DllImport("mpv-2.dll", CallingConvention = CallingConvention.Cdecl)]
+    [DllImport("libmpv-2.dll", CallingConvention = CallingConvention.Cdecl)]
     public static extern mpv_error mpv_command_ret(IntPtr mpvHandle, IntPtr strings, IntPtr node);
 
-    [DllImport("mpv-2.dll", CallingConvention = CallingConvention.Cdecl)]
+    [DllImport("libmpv-2.dll", CallingConvention = CallingConvention.Cdecl)]
     public static extern void mpv_free_node_contents(IntPtr node);
 
-    [DllImport("mpv-2.dll", CallingConvention = CallingConvention.Cdecl)]
+    [DllImport("libmpv-2.dll", CallingConvention = CallingConvention.Cdecl)]
     public static extern IntPtr mpv_error_string(mpv_error error);
 
-    [DllImport("mpv-2.dll", CallingConvention = CallingConvention.Cdecl)]
+    [DllImport("libmpv-2.dll", CallingConvention = CallingConvention.Cdecl)]
     public static extern mpv_error mpv_request_log_messages(IntPtr mpvHandle, [MarshalAs(UnmanagedType.LPUTF8Str)] string min_level);
 
-    [DllImport("mpv-2.dll", CallingConvention = CallingConvention.Cdecl)]
+    [DllImport("libmpv-2.dll", CallingConvention = CallingConvention.Cdecl)]
     public static extern int mpv_set_option(IntPtr mpvHandle, byte[] name, mpv_format format, ref long data);
 
-    [DllImport("mpv-2.dll", CallingConvention = CallingConvention.Cdecl)]
+    [DllImport("libmpv-2.dll", CallingConvention = CallingConvention.Cdecl)]
     public static extern int mpv_set_option_string(IntPtr mpvHandle, byte[] name, byte[] value);
 
-    [DllImport("mpv-2.dll", CallingConvention = CallingConvention.Cdecl)]
+    [DllImport("libmpv-2.dll", CallingConvention = CallingConvention.Cdecl)]
     public static extern mpv_error mpv_get_property(IntPtr mpvHandle, byte[] name, mpv_format format, out IntPtr data);
 
-    [DllImport("mpv-2.dll", CallingConvention = CallingConvention.Cdecl)]
+    [DllImport("libmpv-2.dll", CallingConvention = CallingConvention.Cdecl)]
     public static extern mpv_error mpv_get_property(IntPtr mpvHandle, byte[] name, mpv_format format, out double data);
 
-    [DllImport("mpv-2.dll", CallingConvention = CallingConvention.Cdecl)]
+    [DllImport("libmpv-2.dll", CallingConvention = CallingConvention.Cdecl)]
     public static extern mpv_error mpv_set_property(IntPtr mpvHandle, byte[] name, mpv_format format, ref byte[] data);
 
-    [DllImport("mpv-2.dll", CallingConvention = CallingConvention.Cdecl)]
+    [DllImport("libmpv-2.dll", CallingConvention = CallingConvention.Cdecl)]
     public static extern mpv_error mpv_set_property(IntPtr mpvHandle, byte[] name, mpv_format format, ref long data);
 
-    [DllImport("mpv-2.dll", CallingConvention = CallingConvention.Cdecl)]
+    [DllImport("libmpv-2.dll", CallingConvention = CallingConvention.Cdecl)]
     public static extern mpv_error mpv_set_property(IntPtr mpvHandle, byte[] name, mpv_format format, ref double data);
 
-    [DllImport("mpv-2.dll", CallingConvention = CallingConvention.Cdecl)]
+    [DllImport("libmpv-2.dll", CallingConvention = CallingConvention.Cdecl)]
     public static extern mpv_error mpv_observe_property(IntPtr mpvHandle, ulong reply_userdata, [MarshalAs(UnmanagedType.LPUTF8Str)] string name, mpv_format format);
 
-    [DllImport("mpv-2.dll", CallingConvention = CallingConvention.Cdecl)]
+    [DllImport("libmpv-2.dll", CallingConvention = CallingConvention.Cdecl)]
     public static extern int mpv_unobserve_property(IntPtr mpvHandle, ulong registered_reply_userdata);
 
-    [DllImport("mpv-2.dll", CallingConvention = CallingConvention.Cdecl)]
+    [DllImport("libmpv-2.dll", CallingConvention = CallingConvention.Cdecl)]
     public static extern void mpv_free(IntPtr data);
 
-    [DllImport("mpv-2.dll", CallingConvention = CallingConvention.Cdecl)]
+    [DllImport("libmpv-2.dll", CallingConvention = CallingConvention.Cdecl)]
     public static extern IntPtr mpv_wait_event(IntPtr mpvHandle, double timeout);
 
-    [DllImport("mpv-2.dll", CallingConvention = CallingConvention.Cdecl)]
+    [DllImport("libmpv-2.dll", CallingConvention = CallingConvention.Cdecl)]
     public static extern mpv_error mpv_request_event(IntPtr mpvHandle, mpv_event_id id, int enable);
 
     public enum mpv_error

src/Package/Package.appxmanifest

@@ -11,7 +11,7 @@
 	<Identity
 	  Name="5664FrankSkare.mpv.net"
 	  Publisher="CN=6A1A1E69-736C-4C77-B310-7B6D38E32617"
-	  Version="6.0.3.0" />
+	  Version="6.0.4.0" />
 
 	<Properties>
 		<DisplayName>mpv.net</DisplayName>

src/Package/mpv.net.package.wapproj

@@ -51,8 +51,8 @@
       <Link>mpv.net\Microsoft.Management.Infrastructure.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\bin\mpv-2.dll">
+    <Content Include="..\bin\libmpv-2.dll">
-      <Link>mpv.net\mpv-2.dll</Link>
+      <Link>mpv.net\libmpv-2.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="..\bin\mpvnet.com">

src/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("6.0.3.2")]
+[assembly: AssemblyVersion("6.0.4.0")]
-[assembly: AssemblyFileVersion("6.0.3.2")]
+[assembly: AssemblyFileVersion("6.0.4.0")]

src/Resources/input.conf.txt

@@ -71,6 +71,7 @@ Ctrl+7      add saturation -1      #menu: Video > Decrease Saturation
 Ctrl+8      add saturation  1      #menu: Video > Increase Saturation
 _           ignore                 #menu: Video > -
 s           async screenshot       #menu: Video > Take Screenshot
+S           async screenshot video #menu: Video > Take Screenshot without subtitles
 d           cycle deinterlace      #menu: Video > Toggle Deinterlace
 a           cycle-values video-aspect 16:9 4:3 2.35:1 -1 #menu: Video > Cycle Aspect Ratio
 Ctrl+r      cycle-values video-rotate 90 180 270 0       #menu: Video > Rotate Video
@@ -80,7 +81,7 @@ _           ignore                 #menu: Audio > -
 Ctrl+d      add audio-delay  0.1   #menu: Audio > Delay +0.1
 Ctrl+D      add audio-delay -0.1   #menu: Audio > Delay -0.1
 
-KP8         script-message-to mpvnet cycle-subtitles #menu: Subtitle > Cycle/Next #menu: Subtitle > Cycle/Next
+KP8         script-message-to mpvnet cycle-subtitles #menu: Subtitle > Cycle/Next
 v           cycle sub-visibility   #menu: Subtitle > Toggle Visibility
 _           ignore                 #menu: Subtitle > -
 z           add sub-delay -0.1     #menu: Subtitle > Delay -0.1
@@ -91,6 +92,8 @@ R           add sub-pos +1         #menu: Subtitle > Move Down
 _           ignore                 #menu: Subtitle > -
 F           add sub-scale -0.1     #menu: Subtitle > Decrease Subtitle Font Size
 G           add sub-scale  0.1     #menu: Subtitle > Increase Subtitle Font Size
+_           ignore                 #menu: Subtitle > -
+u           cycle-values sub-ass-override force no #menu: Subtitle > Advanced > Toggle overriding SSA/ASS subtitle styles with the normal styles
 
 _           ignore                 #menu: Track
 

src/mpv.net.csproj

@@ -13,6 +13,7 @@
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFrameworkProfile />
+    <IsWebBootstrapper>false</IsWebBootstrapper>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -25,7 +26,6 @@
     <MapFileExtensions>true</MapFileExtensions>
     <ApplicationRevision>0</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>