From 8066d07a7643bf72d2aec52fe4e148f9c76c0bda Mon Sep 17 00:00:00 2001 From: stax76 Date: Sat, 5 Mar 2022 14:59:05 +0100 Subject: [PATCH] 5.6.1.0 Beta --- README.md | 12 +++---- docs/Changelog.md | 2 +- src/Misc/App.cs | 2 +- src/Misc/CorePlayer.cs | 11 ++----- src/Properties/AssemblyInfo.cs | 6 ++-- src/Release.ps1 | 51 +++--------------------------- src/WPF/CommandPaletteControl.xaml | 7 ---- 7 files changed, 16 insertions(+), 75 deletions(-) diff --git a/README.md b/README.md index aa5dc80..9a29a38 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Modern GUI with customizable color themes. #### Command Line Interface -mpv.net supports mpv's property based command line switches. +mpv.net supports mpvs command line interface. #### High quality video output @@ -70,12 +70,12 @@ Features that mpv and mpv.net have in common - Started from a terminal status, error and debug output is printed on the terminal - DXVA2 video decoding acceleration - Video output capable of features loved by videophiles, such as video scaling with popular high quality algorithms, color management, frame timing, interpolation, HDR, and more -- Browser extensions to start mpv(.net) from the browser +- Browser extensions to start mpv.net from the browser - Fast seek performance - Fast startup performance - Usable as video player, audio player and image viewer with a wide range of supported formats - Built-in decoders, no external codecs have to be installed -- Build-in media streaming (requires youtube-dl being installed) +- Build-in media streaming (requires yt-dlp being installed) - External audio and subtitle files can be loaded manually or automatically - Screenshot feature - Watch later feature to save the video position @@ -84,7 +84,7 @@ Features that mpv and mpv.net have in common Features exclusiv to mpv.net ---------------------------- -- High degree of mpv compatibility, almost all mpv features are available +- Very high degree of mpv compatibility, almost all mpv features are available - Modern graphical user interface with customizable color themes - Customizable context menu defined in the same file as the key bindings - Searchable config editor @@ -93,11 +93,9 @@ Features exclusiv to mpv.net - Global keyboard shortcuts - Command palette to quickly and easily find commands and keys - Extension API for .NET languages (C#, VB.NET and F#) -- Setup as x64 installer, portable, Chocolatey and WinGet -- Setup dialog for system integration (file associations etc.) +- Portable, MS Store or WinGet download and installation - File history feature to log time and filename - Files can be enqueued from File Explorer -- Update check and update routine ## [Support](docs/Manual.md#support) diff --git a/docs/Changelog.md b/docs/Changelog.md index 2f637c3..29590d9 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -1,5 +1,5 @@ -not yet released +5.6.1.0 Beta (2022-03-05) - Various conf editor improvements. (hooke007) - Custom conf folder location feature removed. diff --git a/src/Misc/App.cs b/src/Misc/App.cs index f67ef1c..4e951f9 100644 --- a/src/Misc/App.cs +++ b/src/Misc/App.cs @@ -129,7 +129,7 @@ namespace mpvnet }); } - public static string Version => "Copyright (C) 2000-2021 mpv.net/mpv/mplayer\n" + + public static string Version => "Copyright (C) 2000-2022 mpv.net/mpv/mplayer\n" + $"mpv.net {Application.ProductVersion} ({File.GetLastWriteTime(Application.ExecutablePath).ToShortDateString()})\n" + $"{Core.GetPropertyString("mpv-version")} ({File.GetLastWriteTime(Folder.Startup + "mpv-2.dll").ToShortDateString()})\nffmpeg {Core.GetPropertyString("ffmpeg-version")}\nGPL v2 License"; diff --git a/src/Misc/CorePlayer.cs b/src/Misc/CorePlayer.cs index 433810e..a773ee4 100644 --- a/src/Misc/CorePlayer.cs +++ b/src/Misc/CorePlayer.cs @@ -125,6 +125,7 @@ namespace mpvnet SetPropertyString("msg-level", "osd/libass=fatal"); } + SetPropertyString("script-opts", "osc-scalewindowed=1.5,osc-hidetimeout=2000,console-scale=1.5"); SetPropertyString("watch-later-options", "mute"); SetPropertyString("screenshot-directory", "~~desktop/"); SetPropertyString("osd-playing-msg", "${filename}"); @@ -138,14 +139,8 @@ namespace mpvnet SetPropertyBool("keep-open", true); SetPropertyBool("keep-open-pause", false); - SetPropertyBool("input-default-bindings", true); - - try { - SetPropertyBool("input-builtin-bindings", false, true); - } catch { - SetPropertyBool("input-default-bindings", false); - } + SetPropertyBool("input-builtin-bindings", false); ProcessCommandLine(true); mpv_error err = mpv_initialize(Handle); @@ -252,8 +247,6 @@ namespace mpvnet Directory.CreateDirectory(_ConfigFolder); } - Directory.CreateDirectory(_ConfigFolder); - _ConfigFolder = _ConfigFolder.AddSep(); if (!File.Exists(_ConfigFolder + "input.conf")) diff --git a/src/Properties/AssemblyInfo.cs b/src/Properties/AssemblyInfo.cs index 30d7df4..bf76c80 100644 --- a/src/Properties/AssemblyInfo.cs +++ b/src/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("mpv.net/mpv/mplayer")] [assembly: AssemblyProduct("mpv.net")] -[assembly: AssemblyCopyright("Copyright (C) 2000-2021 mpv.net/mpv/mplayer")] +[assembly: AssemblyCopyright("Copyright (C) 2000-2022 mpv.net/mpv/mplayer")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -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.0.0")] -[assembly: AssemblyFileVersion("5.6.0.0")] +[assembly: AssemblyVersion("5.6.1.0")] +[assembly: AssemblyFileVersion("5.6.1.0")] diff --git a/src/Release.ps1 b/src/Release.ps1 index 950c3ba..7a75d18 100644 --- a/src/Release.ps1 +++ b/src/Release.ps1 @@ -2,54 +2,11 @@ $tmpDir = 'D:\Work' $exePath = $PSScriptRoot + '\bin\mpvnet.exe' $versionInfo = [Diagnostics.FileVersionInfo]::GetVersionInfo($exePath) -$inno = 'C:\Program Files (x86)\Inno Setup 6\ISCC.exe' $7z = 'C:\Program Files\7-Zip\7z.exe' -$cloudDirectories = 'C:\Users\frank\OneDrive\Public\mpv.net\', - 'C:\Users\frank\Dropbox\Public\mpv.net\' - -function UploadBeta($sourceFile) -{ - foreach ($cloudDirectory in $cloudDirectories) - { - if (-not (Test-Path $cloudDirectory)) - { - throw $cloudDirectory - } - - $targetFile = $cloudDirectory + (Split-Path $sourceFile -Leaf) - - if (Test-Path $targetFile) - { - throw $targetFile - } - - Copy-Item $sourceFile $targetFile - } -} - -if ($versionInfo.FilePrivatePart -eq 0) -{ - & $inno $PSScriptRoot\setup.iss - if ($LastExitCode) { throw $LastExitCode } - - $targetDir = $tmpDir + "\mpv.net-$($versionInfo.FileVersion)-portable" - Copy-Item $PSScriptRoot\bin $targetDir -Recurse -Exclude 'System.Management.Automation.xml' - & $7z a -tzip -mx9 "$targetDir.zip" -r "$targetDir\*" - if ($LastExitCode) { throw $LastExitCode } -} -else -{ - $targetDir = "$tmpDir\mpv.net-$($versionInfo.FileVersion)-portable-beta" - Copy-Item $PSScriptRoot\bin $targetDir -Recurse -Exclude 'System.Management.Automation.xml' - & $7z a -tzip -mx9 "$targetDir.zip" -r "$targetDir\*" - if ($LastExitCode) { throw $LastExitCode } - UploadBeta "$targetDir.zip" - - foreach ($cloudDirectory in $cloudDirectories) - { - Invoke-Item $cloudDirectory - } -} +$targetDir = $tmpDir + "\mpv.net-$($versionInfo.FileVersion)-portable-beta" +Copy-Item $PSScriptRoot\bin $targetDir -Recurse -Exclude 'System.Management.Automation.xml' +& $7z a -tzip -mx9 "$targetDir.zip" -r "$targetDir\*" +if ($LastExitCode) { throw $LastExitCode } Write-Host 'successfully finished' -ForegroundColor Green diff --git a/src/WPF/CommandPaletteControl.xaml b/src/WPF/CommandPaletteControl.xaml index 45afcbc..c67b348 100644 --- a/src/WPF/CommandPaletteControl.xaml +++ b/src/WPF/CommandPaletteControl.xaml @@ -89,13 +89,6 @@ - - - - - - -