diff --git a/docs/Changelog.md b/docs/Changelog.md index 2be2b34..377f03b 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -1,4 +1,10 @@ +5.7.0.0 Stable (2022-03-09) + +- Improved title and chapter menu for Blu-Rays. +- Fix of conf folder virtualization issue of MS Store version. +- MS Store page no longer displays ARM and x86 support. + 5.6.2.0 Beta (2022-03-05) - Fix script-opts files being ignored, removed options are: diff --git a/src/Misc/CorePlayer.cs b/src/Misc/CorePlayer.cs index 2cc7610..1f8830d 100644 --- a/src/Misc/CorePlayer.cs +++ b/src/Misc/CorePlayer.cs @@ -1509,6 +1509,10 @@ KP1 script-binding delete_current_file/confirm { string text = GetPropertyString($"chapter-list/{x}/title"); double time = GetPropertyDouble($"chapter-list/{x}/time"); + + if (string.IsNullOrEmpty(text)) + text = "Chapter " + (x + 1); + Chapters.Add(new KeyValuePair(text, time)); } } diff --git a/src/Misc/MainForm.cs b/src/Misc/MainForm.cs index beeab46..5cfe15d 100644 --- a/src/Misc/MainForm.cs +++ b/src/Misc/MainForm.cs @@ -320,22 +320,26 @@ namespace mpvnet lock (Core.BluRayTitles) { - List<(int Index, TimeSpan Len)> items = new List<(int Index, TimeSpan Len)>(); + List<(int Index, TimeSpan Length)> items = new List<(int, TimeSpan)>(); for (int i = 0; i < Core.BluRayTitles.Count; i++) items.Add((i, Core.BluRayTitles[i])); - var titleItems = items.OrderByDescending(item => item.Len) - .Take(20).OrderBy(item => item.Index); + var titleItems = items.OrderByDescending(item => item.Length) + .Take(20) + .OrderBy(item => item.Index); foreach (var item in titleItems) { - if (item.Len != TimeSpan.Zero) + if (item.Length != TimeSpan.Zero) { - var mi = MenuHelp.Add(titlesMenuItem.Items, $"{item.Len} ({item.Index})"); + var mi = MenuHelp.Add(titlesMenuItem.Items, $"Title {item.Index + 1}"); if (mi != null) + { + mi.InputGestureText = item.Length.ToString(); mi.Click += (sender, args) => Core.SetBluRayTitle(item.Index); + } } } } diff --git a/src/Package/Package.appxmanifest b/src/Package/Package.appxmanifest index 41aa5f0..a57e374 100644 --- a/src/Package/Package.appxmanifest +++ b/src/Package/Package.appxmanifest @@ -11,7 +11,7 @@ + Version="5.7.0.0" /> mpv.net diff --git a/src/Package/mpv.net.package.wapproj b/src/Package/mpv.net.package.wapproj index abe9e94..a1c8052 100644 --- a/src/Package/mpv.net.package.wapproj +++ b/src/Package/mpv.net.package.wapproj @@ -4,38 +4,6 @@ 15.0 - - Debug - x86 - - - Release - x86 - - - Debug - x64 - - - Release - x64 - - - Debug - ARM - - - Release - ARM - - - Debug - ARM64 - - - Release - ARM64 - Debug AnyCPU diff --git a/src/Properties/AssemblyInfo.cs b/src/Properties/AssemblyInfo.cs index a459c80..764d995 100644 --- a/src/Properties/AssemblyInfo.cs +++ b/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("5.6.2.0")] -[assembly: AssemblyFileVersion("5.6.2.0")] +[assembly: AssemblyVersion("5.7.0.0")] +[assembly: AssemblyFileVersion("5.7.0.0")] diff --git a/src/Release.ps1 b/src/Release.ps1 index 7a75d18..bfeb8ed 100644 --- a/src/Release.ps1 +++ b/src/Release.ps1 @@ -4,7 +4,7 @@ $exePath = $PSScriptRoot + '\bin\mpvnet.exe' $versionInfo = [Diagnostics.FileVersionInfo]::GetVersionInfo($exePath) $7z = 'C:\Program Files\7-Zip\7z.exe' -$targetDir = $tmpDir + "\mpv.net-$($versionInfo.FileVersion)-portable-beta" +$targetDir = $tmpDir + "\mpv.net-$($versionInfo.FileVersion)-beta" Copy-Item $PSScriptRoot\bin $targetDir -Recurse -Exclude 'System.Management.Automation.xml' & $7z a -tzip -mx9 "$targetDir.zip" -r "$targetDir\*" if ($LastExitCode) { throw $LastExitCode } diff --git a/src/mpv.net.sln b/src/mpv.net.sln index e2e2719..534f62d 100644 --- a/src/mpv.net.sln +++ b/src/mpv.net.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.28729.10 +# Visual Studio Version 17 +VisualStudioVersion = 17.1.32228.430 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mpv.net", "mpv.net.csproj", "{1751F378-8EDF-4B62-BE6D-304C7C287089}" EndProject @@ -17,87 +17,23 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU - Debug|ARM = Debug|ARM - Debug|ARM64 = Debug|ARM64 - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU - Release|ARM = Release|ARM - Release|ARM64 = Release|ARM64 - Release|x64 = Release|x64 - Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {1751F378-8EDF-4B62-BE6D-304C7C287089}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1751F378-8EDF-4B62-BE6D-304C7C287089}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1751F378-8EDF-4B62-BE6D-304C7C287089}.Debug|ARM.ActiveCfg = Debug|Any CPU - {1751F378-8EDF-4B62-BE6D-304C7C287089}.Debug|ARM.Build.0 = Debug|Any CPU - {1751F378-8EDF-4B62-BE6D-304C7C287089}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {1751F378-8EDF-4B62-BE6D-304C7C287089}.Debug|ARM64.Build.0 = Debug|Any CPU - {1751F378-8EDF-4B62-BE6D-304C7C287089}.Debug|x64.ActiveCfg = Debug|Any CPU - {1751F378-8EDF-4B62-BE6D-304C7C287089}.Debug|x64.Build.0 = Debug|Any CPU - {1751F378-8EDF-4B62-BE6D-304C7C287089}.Debug|x86.ActiveCfg = Debug|Any CPU - {1751F378-8EDF-4B62-BE6D-304C7C287089}.Debug|x86.Build.0 = Debug|Any CPU {1751F378-8EDF-4B62-BE6D-304C7C287089}.Release|Any CPU.ActiveCfg = Release|Any CPU {1751F378-8EDF-4B62-BE6D-304C7C287089}.Release|Any CPU.Build.0 = Release|Any CPU - {1751F378-8EDF-4B62-BE6D-304C7C287089}.Release|ARM.ActiveCfg = Release|Any CPU - {1751F378-8EDF-4B62-BE6D-304C7C287089}.Release|ARM.Build.0 = Release|Any CPU - {1751F378-8EDF-4B62-BE6D-304C7C287089}.Release|ARM64.ActiveCfg = Release|Any CPU - {1751F378-8EDF-4B62-BE6D-304C7C287089}.Release|ARM64.Build.0 = Release|Any CPU - {1751F378-8EDF-4B62-BE6D-304C7C287089}.Release|x64.ActiveCfg = Release|Any CPU - {1751F378-8EDF-4B62-BE6D-304C7C287089}.Release|x64.Build.0 = Release|Any CPU - {1751F378-8EDF-4B62-BE6D-304C7C287089}.Release|x86.ActiveCfg = Release|Any CPU - {1751F378-8EDF-4B62-BE6D-304C7C287089}.Release|x86.Build.0 = Release|Any CPU {55C88710-539D-4402-84C8-31694841C731}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {55C88710-539D-4402-84C8-31694841C731}.Debug|Any CPU.Build.0 = Debug|Any CPU - {55C88710-539D-4402-84C8-31694841C731}.Debug|ARM.ActiveCfg = Debug|Any CPU - {55C88710-539D-4402-84C8-31694841C731}.Debug|ARM.Build.0 = Debug|Any CPU - {55C88710-539D-4402-84C8-31694841C731}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {55C88710-539D-4402-84C8-31694841C731}.Debug|ARM64.Build.0 = Debug|Any CPU - {55C88710-539D-4402-84C8-31694841C731}.Debug|x64.ActiveCfg = Debug|Any CPU - {55C88710-539D-4402-84C8-31694841C731}.Debug|x64.Build.0 = Debug|Any CPU - {55C88710-539D-4402-84C8-31694841C731}.Debug|x86.ActiveCfg = Debug|Any CPU - {55C88710-539D-4402-84C8-31694841C731}.Debug|x86.Build.0 = Debug|Any CPU {55C88710-539D-4402-84C8-31694841C731}.Release|Any CPU.ActiveCfg = Release|Any CPU {55C88710-539D-4402-84C8-31694841C731}.Release|Any CPU.Build.0 = Release|Any CPU - {55C88710-539D-4402-84C8-31694841C731}.Release|ARM.ActiveCfg = Release|Any CPU - {55C88710-539D-4402-84C8-31694841C731}.Release|ARM.Build.0 = Release|Any CPU - {55C88710-539D-4402-84C8-31694841C731}.Release|ARM64.ActiveCfg = Release|Any CPU - {55C88710-539D-4402-84C8-31694841C731}.Release|ARM64.Build.0 = Release|Any CPU - {55C88710-539D-4402-84C8-31694841C731}.Release|x64.ActiveCfg = Release|Any CPU - {55C88710-539D-4402-84C8-31694841C731}.Release|x64.Build.0 = Release|Any CPU - {55C88710-539D-4402-84C8-31694841C731}.Release|x86.ActiveCfg = Release|Any CPU - {55C88710-539D-4402-84C8-31694841C731}.Release|x86.Build.0 = Release|Any CPU {81DAEE3A-76FF-4494-9384-D28A651D70BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {81DAEE3A-76FF-4494-9384-D28A651D70BB}.Debug|Any CPU.Build.0 = Debug|Any CPU {81DAEE3A-76FF-4494-9384-D28A651D70BB}.Debug|Any CPU.Deploy.0 = Debug|Any CPU - {81DAEE3A-76FF-4494-9384-D28A651D70BB}.Debug|ARM.ActiveCfg = Debug|ARM - {81DAEE3A-76FF-4494-9384-D28A651D70BB}.Debug|ARM.Build.0 = Debug|ARM - {81DAEE3A-76FF-4494-9384-D28A651D70BB}.Debug|ARM.Deploy.0 = Debug|ARM - {81DAEE3A-76FF-4494-9384-D28A651D70BB}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {81DAEE3A-76FF-4494-9384-D28A651D70BB}.Debug|ARM64.Build.0 = Debug|ARM64 - {81DAEE3A-76FF-4494-9384-D28A651D70BB}.Debug|ARM64.Deploy.0 = Debug|ARM64 - {81DAEE3A-76FF-4494-9384-D28A651D70BB}.Debug|x64.ActiveCfg = Debug|x64 - {81DAEE3A-76FF-4494-9384-D28A651D70BB}.Debug|x64.Build.0 = Debug|x64 - {81DAEE3A-76FF-4494-9384-D28A651D70BB}.Debug|x64.Deploy.0 = Debug|x64 - {81DAEE3A-76FF-4494-9384-D28A651D70BB}.Debug|x86.ActiveCfg = Debug|x86 - {81DAEE3A-76FF-4494-9384-D28A651D70BB}.Debug|x86.Build.0 = Debug|x86 - {81DAEE3A-76FF-4494-9384-D28A651D70BB}.Debug|x86.Deploy.0 = Debug|x86 {81DAEE3A-76FF-4494-9384-D28A651D70BB}.Release|Any CPU.ActiveCfg = Release|Any CPU {81DAEE3A-76FF-4494-9384-D28A651D70BB}.Release|Any CPU.Build.0 = Release|Any CPU {81DAEE3A-76FF-4494-9384-D28A651D70BB}.Release|Any CPU.Deploy.0 = Release|Any CPU - {81DAEE3A-76FF-4494-9384-D28A651D70BB}.Release|ARM.ActiveCfg = Release|ARM - {81DAEE3A-76FF-4494-9384-D28A651D70BB}.Release|ARM.Build.0 = Release|ARM - {81DAEE3A-76FF-4494-9384-D28A651D70BB}.Release|ARM.Deploy.0 = Release|ARM - {81DAEE3A-76FF-4494-9384-D28A651D70BB}.Release|ARM64.ActiveCfg = Release|ARM64 - {81DAEE3A-76FF-4494-9384-D28A651D70BB}.Release|ARM64.Build.0 = Release|ARM64 - {81DAEE3A-76FF-4494-9384-D28A651D70BB}.Release|ARM64.Deploy.0 = Release|ARM64 - {81DAEE3A-76FF-4494-9384-D28A651D70BB}.Release|x64.ActiveCfg = Release|x64 - {81DAEE3A-76FF-4494-9384-D28A651D70BB}.Release|x64.Build.0 = Release|x64 - {81DAEE3A-76FF-4494-9384-D28A651D70BB}.Release|x64.Deploy.0 = Release|x64 - {81DAEE3A-76FF-4494-9384-D28A651D70BB}.Release|x86.ActiveCfg = Release|x86 - {81DAEE3A-76FF-4494-9384-D28A651D70BB}.Release|x86.Build.0 = Release|x86 - {81DAEE3A-76FF-4494-9384-D28A651D70BB}.Release|x86.Deploy.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE