diff --git a/.github/workflows/build.yml b/.github/__workflows__/build.yml similarity index 100% rename from .github/workflows/build.yml rename to .github/__workflows__/build.yml diff --git a/docs/changelog.md b/docs/changelog.md index ca23662..c6787b2 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -1,5 +1,5 @@ -# v7.1.1.4 Beta (????-??-??) +# v7.1.1.4 Beta (2025-09-12) - The mpv.net manual was updated. - The Turkish translation was updated. A Bulgarian translation was added. @@ -8,7 +8,13 @@ - The required Dotnet version changed from 6.0 to 9.0. This drops Win 7 support unfortunately. It was done to use new C# language features and make the mpv.net project more attractive for new developers to contribute. - + Also most users prefer having the newest runtime. +- The script src/Tools/update-mpv.ps1 has been improved. It's the easiest way + update mpv and libmpv (x64 and ARM64). Shinshiro has a update script too, + but it's a lot longer and more complex. +- mediainfo and libmpv have been updated. +- auto build has been disabled because it requires updating libmpv and + mediainfo all the time which is too much manual work. # v7.1.1.3 Beta (2024-10-20) diff --git a/docs/manual.md b/docs/manual.md index 6289b1d..9e47b91 100644 --- a/docs/manual.md +++ b/docs/manual.md @@ -42,9 +42,7 @@ differences are documented in this manual under [Differences compared to mpv](#d Download -------- -1. [Stable and beta portable and setup via GitHub download](../../../releases) -2. Stable via command line with winget: `winget install mpv.net` -3. [Automated nightly portable builds](https://github.com/mpvnet-player/mpv.net/actions) +[Stable and beta portable and setup via GitHub download](../../../releases) [Changelog](changelog.md) @@ -90,15 +88,6 @@ to add mpv.net to path is: For more information see the [terminal section](#terminal). -#### Command Palette user script - -It's recommended to install the -[Command Palette user script](https://github.com/stax76/mpv-scripts?tab=readme-ov-file#command_palette), -the installer script can be invoked from: - -`Context Menu > Config > Setup > Install Command Palette` - - Support ------- diff --git a/src/MpvNet.Windows/GuiCommand.cs b/src/MpvNet.Windows/GuiCommand.cs index 36ba4f7..a829c5c 100644 --- a/src/MpvNet.Windows/GuiCommand.cs +++ b/src/MpvNet.Windows/GuiCommand.cs @@ -32,7 +32,6 @@ public class GuiCommand { ["add-to-path"] = args => AddToPath(), ["edit-conf-file"] = EditCongFile, - ["install-command-palette"] = args => InstallCommandPalette(), ["load-audio"] = LoadAudio, ["load-sub"] = LoadSubtitle, ["move-window"] = args => MoveWindow?.Invoke(args[0]), @@ -165,8 +164,7 @@ public class GuiCommand } string header = BR + - "https://mpv.io/manual/master/#list-of-input-commands" + BR2 + - "https://github.com/stax76/mpv-scripts#command_palette" + BR; + "https://mpv.io/manual/master/#list-of-input-commands" + BR; ShowTextWithEditor("Input Commands", header + sb.ToString()); } @@ -276,24 +274,6 @@ public class GuiCommand catch { } } - void InstallCommandPalette() - { - if (Msg.ShowQuestion("Install command palette?") != MessageBoxResult.OK) - return; - - try - { - Environment.SetEnvironmentVariable("MPV_CONFIG_DIR", Player.ConfigFolder); - using Process proc = new Process(); - proc.StartInfo.FileName = "powershell"; - proc.StartInfo.Arguments = "-executionpolicy bypass -nologo -noexit -noprofile -command \"irm https://raw.githubusercontent.com/stax76/mpv-scripts/refs/heads/main/powershell/command_palette_installer.ps1 | iex\""; - proc.Start(); - } - catch - { - } - } - void StreamQuality() { int version = Player.GetPropertyInt("user-data/command-palette/version"); diff --git a/src/MpvNet.Windows/MpvNet.Windows.csproj b/src/MpvNet.Windows/MpvNet.Windows.csproj index 41c38b7..1df327f 100644 --- a/src/MpvNet.Windows/MpvNet.Windows.csproj +++ b/src/MpvNet.Windows/MpvNet.Windows.csproj @@ -10,9 +10,9 @@ true true mpv-icon.ico - 7.1.1.3 - 7.1.1.3 - 7.1.1.3 + 7.1.1.4 + 7.1.1.4 + 7.1.1.4 diff --git a/src/MpvNet/InputHelp.cs b/src/MpvNet/InputHelp.cs index b27ad99..096d82b 100644 --- a/src/MpvNet/InputHelp.cs +++ b/src/MpvNet/InputHelp.cs @@ -99,7 +99,7 @@ public static class InputHelp Add(b, new (_("Video"), _("Toggle Deinterlace"), "cycle deinterlace", "d")); Add(b, new (_("Video"), _("Change Aspect Ratio"), "cycle-values video-aspect-override 16:9 4:3 2.35:1 0 -1", "a")); Add(b, new (_("Video"), _("Rotate Video"), "cycle-values video-rotate 90 180 270 0", "Ctrl+r")); - Add(b, new (_("Video"), _("Stream Quality"), "script-message-to mpvnet stream-quality", "Alt+q")); + Add(b, new (_("Video"), _("Stream Quality"), "script-message-to mpvnet stream-quality")); Add(b, new (_("Audio"), _("Audio Device"))); Add(b, new (_("Audio"), _("Next Track"), "script-message-to mpvnet cycle-audio", "KP7")); @@ -157,29 +157,6 @@ public static class InputHelp Add(b, new (_("View") + " > " + _("Select Menu"), _("Watch History"), "script-binding select/select-watch-history", "Alt+h")); Add(b, new (_("View") + " > " + _("Select Menu"), _("Watch Later"), "script-binding select/select-watch-later")); - if (File.Exists(Player.ConfigFolder + "/scripts/command_palette.lua")) - { - Add(b, new(_("View") + " > " + _("Command Palette"), _("Command Palette"), "script-message-to command_palette show-command-palette \"Command Palette\"", "Ctrl+p")); - Add(b, new(_("View") + " > " + _("Command Palette"), _("Bindings"), "script-message-to command_palette show-command-palette \"Bindings\"", "F1")); - Add(b, new(_("View") + " > " + _("Command Palette"), _("Properties"), "script-message-to command_palette show-command-palette \"Properties\"", "F2")); - Add(b, new(_("View") + " > " + _("Command Palette"), _("Commands"), "script-message-to command_palette show-command-palette \"Commands\"", "F3")); - Add(b, new(_("View") + " > " + _("Command Palette"), _("Options"), "script-message-to command_palette show-command-palette \"Options\"", "F4")); - Add(b, new(_("View") + " > " + _("Command Palette"), _("Playlist"), "script-message-to command_palette show-command-palette \"Playlist\"", "F8")); - Add(b, new(_("View") + " > " + _("Command Palette"), _("Tracks"), "script-message-to command_palette show-command-palette \"Tracks\"", "F9")); - Add(b, new(_("View") + " > " + _("Command Palette"), _("Audio Tracks"), "script-message-to command_palette show-command-palette \"Audio Tracks\"", "Alt+a")); - Add(b, new(_("View") + " > " + _("Command Palette"), _("Subtitle Tracks"), "script-message-to command_palette show-command-palette \"Subtitle Tracks\"", "Alt+s")); - Add(b, new(_("View") + " > " + _("Command Palette"), _("Secondary Subtitle"), "script-message-to command_palette show-command-palette \"Secondary Subtitle\"", "Alt+b")); - Add(b, new(_("View") + " > " + _("Command Palette"), _("Video Tracks"), "script-message-to command_palette show-command-palette \"Video Tracks\"", "Alt+v")); - Add(b, new(_("View") + " > " + _("Command Palette"), _("Chapters"), "script-message-to command_palette show-command-palette \"Chapters\"", "Alt+c")); - Add(b, new(_("View") + " > " + _("Command Palette"), _("Profiles"), "script-message-to command_palette show-command-palette \"Profiles\"", "Alt+p")); - Add(b, new(_("View") + " > " + _("Command Palette"), _("Audio Devices"), "script-message-to command_palette show-command-palette \"Audio Devices\"", "Alt+d")); - Add(b, new(_("View") + " > " + _("Command Palette"), _("Subtitle Line"), "script-message-to command_palette show-command-palette \"Subtitle Line\"", "Alt+l")); - Add(b, new(_("View") + " > " + _("Command Palette"), _("Blu-ray Titles"), "script-message-to command_palette show-command-palette \"Blu-ray Titles\"", "Alt+t")); - Add(b, new(_("View") + " > " + _("Command Palette"), _("Stream Quality"), "script-message-to command_palette show-command-palette \"Stream Quality\"", "Alt+q")); - Add(b, new(_("View") + " > " + _("Command Palette"), _("Aspect Ratio"), "script-message-to command_palette show-command-palette \"Aspect Ratio\"", "Alt+r")); - Add(b, new(_("View") + " > " + _("Command Palette"), _("Recent Files"), "script-message-to mpvnet show-recent-in-command-palette", "Alt+f")); - } - Add(b, new (_("View"), "-")); Add(b, new (_("View") + " > " + _("More"), _("Show Console"), "script-binding console/enable", "`")); Add(b, new (_("View") + " > " + _("More"), _("Show Commands"), "script-message-to mpvnet show-commands", "F2")); @@ -221,8 +198,6 @@ public static class InputHelp Add(b, new (_("Config") + " > " + _("Setup"), "-")); Add(b, new (_("Config") + " > " + _("Setup"), _("Add mpv.net to Path environment variable"), "script-message-to mpvnet add-to-path")); Add(b, new (_("Config") + " > " + _("Setup"), _("Remove mpv.net from Path environment variable"), "script-message-to mpvnet remove-from-path")); - Add(b, new (_("Config") + " > " + _("Setup"), "-")); - Add(b, new (_("Config") + " > " + _("Setup"), _("Install Command Palette"), "script-message-to mpvnet install-command-palette")); Add(b, new (_("Tools"), _("Set/clear A-B loop points"), "ab-loop", "l")); Add(b, new (_("Tools"), _("Toggle infinite file looping"), "cycle-values loop-file inf no", "L")); diff --git a/src/Tools/update-mpv.ps1 b/src/Tools/update-mpv.ps1 index 9ab7057..b77e49e 100644 --- a/src/Tools/update-mpv.ps1 +++ b/src/Tools/update-mpv.ps1 @@ -4,8 +4,7 @@ Updates mpv (x64) and libmpv (x64 , ARM64). Files are downloaded from: - x64: github.com/zhongfly/mpv-winbuild - ARM64: github.com/Andarwinux/mpv-winbuild + https://github.com/shinchiro/mpv-winbuild-cmake/releases Requires 7zip being installed at 'C:\Program Files\7-Zip\7z.exe'. @@ -54,8 +53,8 @@ function Unpack($archieveFile, $outputRootDir) { # Update mpv x64 if (Test-Path (Join-Path $MpvDirX64 'mpv.exe')) { - $apiURL = "https://api.github.com/repos/zhongfly/mpv-winbuild/releases/latest" - $archiveFile = Get-Item (Download $apiURL "mpv-x86_64-[0-9]{8}") + $apiURL = "https://api.github.com/repos/shinchiro/mpv-winbuild-cmake/releases/latest" + $archiveFile = Get-Item (Download $apiURL "mpv-x86_64-[0-9]{8}-git-[0-9a-z]+\.7z") $archiveDir = Unpack $archiveFile $env:TEMP Remove-Item "$MpvDirX64\*" -Force -Recurse Copy-Item "$archiveDir\*" $MpvDirX64 -Force -Recurse @@ -68,8 +67,8 @@ if (Test-Path (Join-Path $MpvDirX64 'mpv.exe')) { # Update libmpv x64 if (Test-Path (Join-Path $LibmpvDirX64 'libmpv-2.dll')) { - $apiURL = "https://api.github.com/repos/zhongfly/mpv-winbuild/releases/latest" - $archiveFile = Get-Item (Download $apiURL "mpv-dev-x86_64-[0-9]{8}") + $apiURL = "https://api.github.com/repos/shinchiro/mpv-winbuild-cmake/releases/latest" + $archiveFile = Get-Item (Download $apiURL "mpv-dev-x86_64-[0-9]{8}-git-[0-9a-z]+\.7z") $archiveDir = Unpack $archiveFile $env:TEMP Copy-Item $archiveDir\libmpv-2.dll $LibmpvDirX64 -Force Remove-Item $archiveFile.FullName @@ -81,8 +80,8 @@ if (Test-Path (Join-Path $LibmpvDirX64 'libmpv-2.dll')) { # Update libmpv ARM64 if (Test-Path (Join-Path $LibmpvDirARM64 'libmpv-2.dll')) { - $apiURL = "https://api.github.com/repos/Andarwinux/mpv-winbuild/releases/latest" - $archiveFile = Get-Item (Download $apiURL "mpv-dev-aarch64-[0-9]{8}") + $apiURL = "https://api.github.com/repos/shinchiro/mpv-winbuild-cmake/releases/latest" + $archiveFile = Get-Item (Download $apiURL "mpv-dev-aarch64-[0-9]{8}-git-[0-9a-z]+\.7z") $archiveDir = Unpack $archiveFile $env:TEMP Copy-Item $archiveDir\libmpv-2.dll $LibmpvDirARM64 -Force Remove-Item $archiveFile.FullName