diff --git a/README.md b/README.md index c878349..693d270 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Modern GUI with customizable color themes. #### Command Line Interface -mpv.net supports mpvs property based command line switches. +mpv.net supports mpv's property based command line switches. #### High quality video output @@ -165,14 +165,6 @@ The command palette based playlist showing my favorite artist of the stax record ![Playlist](docs/img/Playlist.png) -#### Setup - -The setup dialog to register file associations, create a start menu item and -add mpv.net to the PATH environment variable (per user) - -![Setup](docs/img/Setup.png) - - Related apps ------------ diff --git a/docs/Changelog.md b/docs/Changelog.md index c5b6e1c..b8e5f8d 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -4,8 +4,8 @@ not yet released - Various conf editor improvements. (hooke007) - Custom conf folder location feature removed (a directory sym link can be used instead). -- Inno Setup replaced with MS Store MSIX setup, - winget and chocolatey support will follow shortly. +- Inno Setup replaced with MS Store MSIX setup. +- Fix script-opts files being ingnored. 5.5.0.4 Beta (2021-11-05) diff --git a/docs/Manual.md b/docs/Manual.md index cf843ae..a46ce44 100644 --- a/docs/Manual.md +++ b/docs/Manual.md @@ -562,7 +562,7 @@ features are supported that have an own implementation in mpv.net. A window free mode is currently not supported, the main window is always visible, even when mpv.net is started from the terminal and music is played. -The documentation of mpvs window features can be found here: +The documentation of mpv's window features can be found here: https://mpv.io/manual/master/#window @@ -643,7 +643,7 @@ If the input.conf file does not exists mpv.net generates it with the following d -input.conf defines mpvs key and mouse bindings and mpv.net uses +input.conf defines mpv's key and mouse bindings and mpv.net uses comments to define the context menu. diff --git a/docs/Privacy.md b/docs/Privacy.md new file mode 100644 index 0000000..c57f894 --- /dev/null +++ b/docs/Privacy.md @@ -0,0 +1,2 @@ + +mpv.net does not collect any personal information. diff --git a/docs/img/Setup.png b/docs/img/Setup.png deleted file mode 100644 index 1bac8fd..0000000 Binary files a/docs/img/Setup.png and /dev/null differ diff --git a/src/Misc/CorePlayer.cs b/src/Misc/CorePlayer.cs index 18eed94..afffe28 100644 --- a/src/Misc/CorePlayer.cs +++ b/src/Misc/CorePlayer.cs @@ -140,7 +140,6 @@ namespace mpvnet SetPropertyString("watch-later-options", "mute"); SetPropertyString("screenshot-directory", "~~desktop/"); - SetPropertyString("script-opts", "osc-scalewindowed=1.5,osc-hidetimeout=2000,console-scale=1.5"); SetPropertyString("osd-playing-msg", "${filename}"); SetPropertyString("wid", MainForm.Hwnd.ToString()); SetPropertyString("osc", "yes"); diff --git a/src/Misc/MainForm.cs b/src/Misc/MainForm.cs index e3514a4..a7e2231 100644 --- a/src/Misc/MainForm.cs +++ b/src/Misc/MainForm.cs @@ -1138,10 +1138,10 @@ namespace mpvnet base.OnDragDrop(e); if (e.Data.GetDataPresent(DataFormats.FileDrop)) - Core.LoadFiles(e.Data.GetData(DataFormats.FileDrop) as String[], true, Control.ModifierKeys.HasFlag(Keys.Control)); + Core.LoadFiles(e.Data.GetData(DataFormats.FileDrop) as String[], true, ModifierKeys.HasFlag(Keys.Control)); if (e.Data.GetDataPresent(DataFormats.Text)) - Core.LoadFiles(new[] { e.Data.GetData(DataFormats.Text).ToString() }, true, Control.ModifierKeys.HasFlag(Keys.Control)); + Core.LoadFiles(new[] { e.Data.GetData(DataFormats.Text).ToString() }, true, ModifierKeys.HasFlag(Keys.Control)); } protected override void OnLostFocus(EventArgs e) diff --git a/src/Package/Images/mpvnetExtensions.targetsize-128.png b/src/Package/Images/mpvnetExtensions.targetsize-128.png deleted file mode 100644 index c4a0a75..0000000 Binary files a/src/Package/Images/mpvnetExtensions.targetsize-128.png and /dev/null differ diff --git a/src/Package/Images/mpvnetExtensions.targetsize-16.png b/src/Package/Images/mpvnetExtensions.targetsize-16.png deleted file mode 100644 index 7597ff8..0000000 Binary files a/src/Package/Images/mpvnetExtensions.targetsize-16.png and /dev/null differ diff --git a/src/Package/Images/mpvnetExtensions.targetsize-20.png b/src/Package/Images/mpvnetExtensions.targetsize-20.png deleted file mode 100644 index ff8296e..0000000 Binary files a/src/Package/Images/mpvnetExtensions.targetsize-20.png and /dev/null differ diff --git a/src/Package/Images/mpvnetExtensions.targetsize-24.png b/src/Package/Images/mpvnetExtensions.targetsize-24.png deleted file mode 100644 index 9d67c0f..0000000 Binary files a/src/Package/Images/mpvnetExtensions.targetsize-24.png and /dev/null differ diff --git a/src/Package/Images/mpvnetExtensions.targetsize-256.png b/src/Package/Images/mpvnetExtensions.targetsize-256.png deleted file mode 100644 index 4c08c44..0000000 Binary files a/src/Package/Images/mpvnetExtensions.targetsize-256.png and /dev/null differ diff --git a/src/Package/Images/mpvnetExtensions.targetsize-32.png b/src/Package/Images/mpvnetExtensions.targetsize-32.png deleted file mode 100644 index c8407a7..0000000 Binary files a/src/Package/Images/mpvnetExtensions.targetsize-32.png and /dev/null differ diff --git a/src/Package/Images/mpvnetExtensions.targetsize-40.png b/src/Package/Images/mpvnetExtensions.targetsize-40.png deleted file mode 100644 index 81c4010..0000000 Binary files a/src/Package/Images/mpvnetExtensions.targetsize-40.png and /dev/null differ diff --git a/src/Package/Images/mpvnetExtensions.targetsize-48.png b/src/Package/Images/mpvnetExtensions.targetsize-48.png deleted file mode 100644 index 0453e38..0000000 Binary files a/src/Package/Images/mpvnetExtensions.targetsize-48.png and /dev/null differ diff --git a/src/Package/Images/mpvnetExtensions.targetsize-64.png b/src/Package/Images/mpvnetExtensions.targetsize-64.png deleted file mode 100644 index 0aae563..0000000 Binary files a/src/Package/Images/mpvnetExtensions.targetsize-64.png and /dev/null differ diff --git a/src/Package/Package.appxmanifest b/src/Package/Package.appxmanifest index 41f73b1..c1401d6 100644 --- a/src/Package/Package.appxmanifest +++ b/src/Package/Package.appxmanifest @@ -8,130 +8,118 @@ xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" IgnorableNamespaces="uap rescap"> - + - - mpv.net - Frank Skare - Images\StoreLogo.png - + + mpv.net + Frank Skare + Images\StoreLogo.png + - - - - + + + + - - - + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - Images\mpvnetExtensions.png - - .264 - .265 - .asf - .avc - .avi - .avs - .dav - .flv - .h264 - .h265 - .hevc - .m2t - .m2ts - .m2v - .m4v - .mkv - .mov - .mp4 - .mpeg - .mpg - .mpv - .mts - .ts - .vob - .vpy - .webm - .wmv - .y4m - - - + + + + .264 + .265 + .asf + .avc + .avi + .avs + .dav + .flv + .h264 + .h265 + .hevc + .m2t + .m2ts + .m2v + .m4v + .mkv + .mov + .mp4 + .mpeg + .mpg + .mpv + .mts + .ts + .vob + .vpy + .webm + .wmv + .y4m + + + - - - Images\mpvnetExtensions.png - - .aac - .ac3 - .dts - .dtshd - .dtshr - .dtsma - .eac3 - .flac - .m4a - .mka - .mp2 - .mp3 - .mpa - .mpc - .ogg - .opus - .thd - .w64 - .wav - - - + + + + .aac + .ac3 + .dts + .dtshd + .dtshr + .dtsma + .eac3 + .flac + .m4a + .mka + .mp2 + .mp3 + .mpa + .mpc + .ogg + .opus + .thd + .w64 + .wav + + + - - - Images\mpvnetExtensions.png - - .bmp - .gif - .jpg - .png - .webp - - - - - - - - + + + + - - - - + + + + + + + diff --git a/src/Package/mpv.net.package.wapproj b/src/Package/mpv.net.package.wapproj index 126c71e..830305c 100644 --- a/src/Package/mpv.net.package.wapproj +++ b/src/Package/mpv.net.package.wapproj @@ -56,6 +56,42 @@ en-US false ..\mpv.net.csproj + False + False + True + neutral + True + 0 + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always @@ -86,6 +122,7 @@ + diff --git a/src/Properties/AssemblyInfo.cs b/src/Properties/AssemblyInfo.cs index 29cc662..30d7df4 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.5.0.4")] -[assembly: AssemblyFileVersion("5.5.0.4")] +[assembly: AssemblyVersion("5.6.0.0")] +[assembly: AssemblyFileVersion("5.6.0.0")] diff --git a/src/Resources/input.conf.txt b/src/Resources/input.conf.txt index ab23015..68a0071 100644 --- a/src/Resources/input.conf.txt +++ b/src/Resources/input.conf.txt @@ -171,7 +171,6 @@ l ab-loop #menu: Tools > Set/clear A-B L cycle-values loop-file inf no #menu: Tools > Toggle infinite file looping _ playlist-shuffle #menu: Tools > Shuffle Playlist Ctrl+h cycle-values hwdec auto no #menu: Tools > Toggle Hardware Decoding -_ script-message mpv.net show-setup-dialog #menu: Tools > Setup... _ script-message mpv.net shell-execute https://mpv.io #menu: Help > Website mpv _ script-message mpv.net shell-execute https://github.com/stax76/mpv.net #menu: Help > Website mpv.net diff --git a/src/mpv.net.csproj b/src/mpv.net.csproj index 3dc6a61..9090f19 100644 --- a/src/mpv.net.csproj +++ b/src/mpv.net.csproj @@ -13,6 +13,21 @@ 512 true + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true @@ -254,7 +269,18 @@ Designer - + + + False + Microsoft .NET Framework 4.8 %28x86 and x64%29 + true + + + False + .NET Framework 3.5 SP1 + false + +