From e6fb775dcd2709eee22da2bfb234ee77540f6481 Mon Sep 17 00:00:00 2001 From: Frank Skare Date: Tue, 17 Mar 2020 19:36:07 +0100 Subject: [PATCH] 5.4.4.1 --- Changelog.md | 8 +-- Manual.md | 7 --- README.md | 24 +++++---- Release.ps1 | 80 ++++++++++++++++++------------ mpv.net/Properties/AssemblyInfo.cs | 4 +- mpv.net/Resources/inputConf.txt | 4 +- mpv.net/Resources/theme.txt | 2 +- mpv.net/WinForms/MainForm.cs | 2 +- mpv.net/mpv/mp.cs | 2 +- 9 files changed, 72 insertions(+), 61 deletions(-) diff --git a/Changelog.md b/Changelog.md index 17bfe5f..6fd5b79 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,6 +1,7 @@ -### +### 5.4.4.1 +- new: external console replaced with internal console - new: blue color in dark theme is now less intense - new: menu item 'View > Show Progress' (p key) to show progress bar - new: `script-message mpv.net playlist-first`, unlike mpv does not @@ -9,8 +10,8 @@ then the error is printed to the terminal instead of shown with a message box - fix: update routine did only work when mpv.net was located in 'Program Files' -- fix: errors were just ignored and only seen printed in the terminal in case mpv.net - was started from the terminal, now for every error a message box is shown +- fix: errors were ignored and only seen in the terminal, + now a message box is shown - fix: when start-size=video was used then enlarging or shrinking the window size was broken @@ -137,7 +138,6 @@ ### 5.1 -- 'Tools > Execute mpv command' was replaced with [mpv-repl](https://github.com/rossy/mpv-repl) - many [wiki pages](https://github.com/stax76/mpv.net/wiki) were improved - the logo/icon had a very small cosmetic change - the help in the context menu was improved, diff --git a/Manual.md b/Manual.md index c299bfa..d743203 100644 --- a/Manual.md +++ b/Manual.md @@ -88,7 +88,6 @@ + [Tools > Set/clear A-B loop points](#tools--set-clear-a-b-loop-points) + [Tools > Toggle infinite file looping](#tools--toggle-infinite-file-looping) + [Tools > Toggle Hardware Decoding](#tools--toggle-hardware-decoding) - + [Tools > Show REPL](#tools--show-repl) + [Tools > Setup](#tools--setup) + [Help > Show mpv manual](#help--show-mpv-manual) + [Help > Show mpv.net manual](#help--show-mpvnet-manual) @@ -862,12 +861,6 @@ Cycles the hwdec property to enable/disable hardware decoding using the followin [hwdec property](https://mpv.io/manual/master/#options-hwdec) -### Tools > Show REPL - -Shows a on screen REPL. - -https://github.com/rossy/mpv-repl - ### Tools > Setup Allows to manage file associations. diff --git a/README.md b/README.md index 7a941b5..0f4255f 100644 --- a/README.md +++ b/README.md @@ -39,6 +39,7 @@ Table of contents - [Features](#features) - [Screenshots](#screenshots) +- [Download](#download) - [Installation](#installation) - [Manual](#manual) - [Context Menu](#context-menu) @@ -66,8 +67,7 @@ Table of contents - Language agnostic JSON IPC to control the player with a external programs - On Screen Controler (OSC, play control buttons) ([Screenshot](#main-window-screenshot)) - [Command Line Interface](https://mpv.io/manual/master/#options) -- If started from a PowerShell terminal mpv.net will attach to the terminal and print status and debug output ([Screenshot](#terminal-and-repl-screenshot)) -- [OSD REPL](https://github.com/rossy/mpv-repl) +- If started from a PowerShell terminal mpv.net will attach to the terminal and print status and debug output ([Screenshot](#terminal-screenshot)) - DXVA2 video decoding acceleration - OpenGL based 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 - Search feature powered by [Everything](https://www.voidtools.com) to find and play media ([Screenshot](#media-search-screenshot)) @@ -106,9 +106,9 @@ A searchable config editor as alternative to edit the mpv.conf file manually. ![](https://raw.githubusercontent.com/stax76/mpv.net/master/img/ConfEditor.png) -#### Terminal and REPL Screenshot +#### Terminal Screenshot -mpv.net attached to a PowerShell terminal showing the [OSD REPL](https://github.com/rossy/mpv-repl). +mpv.net attached to a PowerShell terminal showing the OSD console. ![](https://raw.githubusercontent.com/stax76/mpv.net/master/img/Terminal.png) @@ -131,6 +131,12 @@ Media search feature powered by [Everything](https://www.voidtools.com) to find ![Media Search](https://raw.githubusercontent.com/stax76/mpv.net/master/img/MediaSearch.png) +## Download + +Stable releases can be downloaded from the [Release page](releases) + +Newer Beta version can be downloaded from [OneDrive](https://1drv.ms/u/s!ArwKS_ZUR01g1ldoLA90tX9DzKTj?e=xITXbC) and [DropBox](https://www.dropbox.com/sh/t54p9igdwvllbpl/AADKyWpaFnIhdyosxyP5d3_xa?dl=0). + ## Installation mpv.net requires minimum .NET Framework 4.8 and Windows 7. For optimal results a modern graphics card is recommended. @@ -231,17 +237,15 @@ Third party components: ## Support +Before making a support request for a particular issue, please try if it was already addressed in a newer [beta version](#download). + [Support thread in Doom9 forum](https://forum.doom9.org/showthread.php?t=174841) [Support thread in VideoHelp forum](https://forum.videohelp.com/threads/392514-mpv-net-a-extendable-media-player-for-windows) -[Issue tracker](https://github.com/stax76/mpv.net/issues), feel free to use for anything mpv.net related +[Issue tracker](https://github.com/stax76/mpv.net/issues), feel free to use for anything mpv.net related. -[frank.skare.de@gmail.com](mailto:frank.skare.de@gmail.com?Subject=mpv.net%20support) - -Please click on the star at the top of the page and like mpv.net at [alternativeto.net](https://alternativeto.net/software/mpv-net/). - -If you want to support the development of mpv.net or express your appreciation you can do so with a donation: +Supporting the development of mpv.net possible via PayPal donation: diff --git a/Release.ps1 b/Release.ps1 index 2fefcf9..06186a3 100644 --- a/Release.ps1 +++ b/Release.ps1 @@ -1,41 +1,20 @@ $ErrorActionPreference = 'Stop' -$desktopDir = [Environment]::GetFolderPath('Desktop') -$exePath = $PSScriptRoot + '\mpv.net\bin\x64\mpvnet.exe' -$version = [Reflection.Assembly]::LoadFile($exePath).GetName().Version -$msbuild = 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\MSBuild.exe' -$inno = 'C:\Program Files (x86)\Inno Setup 6\ISCC.exe' -$7z = 'C:\Program Files\7-Zip\7z.exe' +$desktopDir = [Environment]::GetFolderPath('Desktop') +$exePath = $PSScriptRoot + '\mpv.net\bin\x64\mpvnet.exe' +$versionInfo = [Diagnostics.FileVersionInfo]::GetVersionInfo($exePath) +$vsDir = 'C:\Program Files (x86)\Microsoft Visual Studio\2019' +$msBuild = $vsDir + '\Community\MSBuild\Current\Bin\MSBuild.exe' +$inno = 'C:\Program Files (x86)\Inno Setup 6\ISCC.exe' +$7z = 'C:\Program Files\7-Zip\7z.exe' -if ($version.Revision -ne 0) +if ($versionInfo.FilePrivatePart -eq 0) { - & $msbuild mpv.net.sln -t:Rebuild -p:Configuration=Debug -p:Platform=x64 + & $msBuild mpv.net.sln -t:Rebuild -p:Configuration=Debug -p:Platform=x64 if ($LastExitCode) { throw $LastExitCode } - $targetDir = "$desktopDir\mpv.net-portable-x64-$version-beta" - Copy-Item .\mpv.net\bin\x64 $targetDir -Recurse -Exclude System.Management.Automation.xml - & $7z a -t7z -mx9 "$targetDir.7z" -r "$targetDir\*" - if ($LastExitCode) { throw $LastExitCode } - - $targetDirectories = 'C:\Users\frank\OneDrive\StaxRip\TestBuilds\', - 'C:\Users\frank\Dropbox\public\StaxRip\Builds\' - - foreach ($dir in $targetDirectories) - { - if (Test-Path $dir) - { - Copy-Item ($targetDir + '.7z') ($dir + (Split-Path $targetDir -Leaf) + '.7z') - Invoke-Item $dir - } - } -} -else -{ - & $msbuild mpv.net.sln /p:Configuration=Debug /p:Platform=x64 - if ($LastExitCode) { throw $LastExitCode } - - & $msbuild mpv.net.sln /p:Configuration=Debug /p:Platform=x86 + & $msBuild mpv.net.sln -t:Rebuild -p:Configuration=Debug -p:Platform=x86 if ($LastExitCode) { throw $LastExitCode } & $inno /Darch=x64 setup.iss @@ -44,7 +23,7 @@ else & $inno /Darch=x86 setup.iss if ($LastExitCode) { throw $LastExitCode } - $targetDir = $desktopDir + "\mpv.net-portable-x64-$version" + $targetDir = $desktopDir + "\mpv.net-portable-x64-$($versionInfo.FileVersion)" Copy-Item .\mpv.net\bin\x64 $targetDir -Recurse -Exclude System.Management.Automation.xml & $7z a -t7z -mx9 "$targetDir.7z" -r "$targetDir\*" @@ -53,7 +32,7 @@ else & $7z a -tzip -mx9 "$targetDir.zip" -r "$targetDir\*" if ($LastExitCode) { throw $LastExitCode } - $targetDir = $desktopDir + "\mpv.net-portable-x86-$version" + $targetDir = $desktopDir + "\mpv.net-portable-x86-$($versionInfo.FileVersion)" Copy-Item .\mpv.net\bin\x86 $targetDir -Recurse -Exclude System.Management.Automation.xml & $7z a -t7z -mx9 "$targetDir.7z" -r "$targetDir\*" @@ -62,5 +41,40 @@ else & $7z a -tzip -mx9 "$targetDir.zip" -r "$targetDir\*" if ($LastExitCode) { throw $LastExitCode } } +else +{ + & $msBuild mpv.net.sln -t:Rebuild -p:Configuration=Debug -p:Platform=x64 + if ($LastExitCode) { throw $LastExitCode } + + $targetDir = "$desktopDir\mpv.net-portable-x64-$($versionInfo.FileVersion)-beta" + Copy-Item .\mpv.net\bin\x64 $targetDir -Recurse -Exclude System.Management.Automation.xml + & $7z a -t7z -mx9 "$targetDir.7z" -r "$targetDir\*" + if ($LastExitCode) { throw $LastExitCode } + + $cloudDirectories = 'C:\Users\frank\OneDrive\Public\mpv.net\', + 'C:\Users\frank\Dropbox\Public\mpv.net\' + + foreach ($cloudDirectory in $cloudDirectories) + { + if (-not (Test-Path $cloudDirectory)) + { + throw $cloudDirectory + } + + $targetFile = $cloudDirectory + (Split-Path $targetDir -Leaf) + '.7z' + + if (Test-Path $targetFile) + { + throw $targetFile + } + + Copy-Item ($targetDir + '.7z') $targetFile + Invoke-Item $cloudDirectory + } +} + +Set-Clipboard ($versionInfo.FileVersion + "`n`n" + + 'https://github.com/stax76/mpv.net/blob/master/Changelog.md' + "`n`n" + + 'https://github.com/stax76/mpv.net#download') Write-Host 'successfully finished' -ForegroundColor Green diff --git a/mpv.net/Properties/AssemblyInfo.cs b/mpv.net/Properties/AssemblyInfo.cs index cacff91..946dcd6 100644 --- 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("5.4.4.0")] -[assembly: AssemblyFileVersion("5.4.4.0")] +[assembly: AssemblyVersion("5.4.4.1")] +[assembly: AssemblyFileVersion("5.4.4.1")] diff --git a/mpv.net/Resources/inputConf.txt b/mpv.net/Resources/inputConf.txt index d4787d9..d10e162 100644 --- a/mpv.net/Resources/inputConf.txt +++ b/mpv.net/Resources/inputConf.txt @@ -144,14 +144,14 @@ F8 script-binding show-playlist #menu: View > Show Playlist F9 show-text ${track-list} 5000 #menu: View > Show Audio/Video/Subtitle List p show-progress #menu: View > Show Progress - + ` script-binding console/enable #menu: View > Show REPL + c script-message mpv.net show-conf-editor #menu: Settings > Show Config Editor Ctrl+i script-message mpv.net show-input-editor #menu: Settings > Show Input Editor Ctrl+f script-message mpv.net open-conf-folder #menu: Settings > Open Config Folder F1 script-message mpv.net show-command-palette #menu: Tools > Show All Commands h script-message mpv.net show-history #menu: Tools > Show History - Ctrl+r script-message-to repl type "" #menu: Tools > Show REPL l ab-loop #menu: Tools > Set/clear A-B loop points L cycle-values loop-file "inf" "no" #menu: Tools > Toggle infinite file looping _ cycle shuffle #menu: Tools > Toggle Shuffle diff --git a/mpv.net/Resources/theme.txt b/mpv.net/Resources/theme.txt index a512f31..adb671a 100644 --- a/mpv.net/Resources/theme.txt +++ b/mpv.net/Resources/theme.txt @@ -1,7 +1,7 @@  [dark] -heading = #6099C1 +heading = #3C8CC8 foreground = #DDDDDD foreground2 = #AAAAAA background = #323232 diff --git a/mpv.net/WinForms/MainForm.cs b/mpv.net/WinForms/MainForm.cs index 47e9350..ffd68f3 100644 --- a/mpv.net/WinForms/MainForm.cs +++ b/mpv.net/WinForms/MainForm.cs @@ -595,7 +595,7 @@ namespace mpvnet { if (value != 1) { - Invoke(new Action(() => SetFormPosAndSize(value))); + BeginInvoke(new Action(() => SetFormPosAndSize(value))); mp.command("no-osd set window-scale 1"); } } diff --git a/mpv.net/mpv/mp.cs b/mpv.net/mpv/mp.cs index e2e01bb..5c50ae9 100644 --- a/mpv.net/mpv/mp.cs +++ b/mpv.net/mpv/mp.cs @@ -253,7 +253,7 @@ namespace mpvnet } } - public static string[] KnownScripts { get; } = { "osc-visibility.js", "show-playlist.js", "seek-show-position.py", "repl.lua" }; + public static string[] KnownScripts { get; } = { "osc-visibility.js", "show-playlist.js", "seek-show-position.py" }; public static void LoadScripts() {