linus/mpv.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

docs improvement

Browse Source
This commit is contained in:
stax76
2021-11-18 10:36:32 +01:00
parent 243b45326e
commit f0c9dd7956
21 changed files with 180 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
README.md
View File

@@ -16,7 +16,7 @@ Modern GUI with customizable color themes.
#### Command Line Interface #### 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 #### 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) ![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 Related apps
------------ ------------

4
docs/Changelog.md
View File

@@ -4,8 +4,8 @@ not yet released
- Various conf editor improvements. (hooke007) - Various conf editor improvements. (hooke007)
- Custom conf folder location feature removed - Custom conf folder location feature removed
(a directory sym link can be used instead). (a directory sym link can be used instead).
- Inno Setup replaced with MS Store MSIX setup, - Inno Setup replaced with MS Store MSIX setup.
winget and chocolatey support will follow shortly. - Fix script-opts files being ingnored.
5.5.0.4 Beta (2021-11-05) 5.5.0.4 Beta (2021-11-05)

4
docs/Manual.md
View File

@@ -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 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. 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 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
<https://github.com/stax76/mpv.net/tree/master/src/Resources/input.conf.txt> <https://github.com/stax76/mpv.net/tree/master/src/Resources/input.conf.txt>
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. comments to define the context menu.

2
docs/Privacy.md Normal file
View File

@@ -0,0 +1,2 @@
mpv.net does not collect any personal information.

BIN
docs/img/Setup.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 94 KiB

1
src/Misc/CorePlayer.cs
View File

@@ -140,7 +140,6 @@ namespace mpvnet
SetPropertyString("watch-later-options", "mute"); SetPropertyString("watch-later-options", "mute");
SetPropertyString("screenshot-directory", "~~desktop/"); SetPropertyString("screenshot-directory", "~~desktop/");
SetPropertyString("script-opts", "osc-scalewindowed=1.5,osc-hidetimeout=2000,console-scale=1.5");
SetPropertyString("osd-playing-msg", "${filename}"); SetPropertyString("osd-playing-msg", "${filename}");
SetPropertyString("wid", MainForm.Hwnd.ToString()); SetPropertyString("wid", MainForm.Hwnd.ToString());
SetPropertyString("osc", "yes"); SetPropertyString("osc", "yes");

4
src/Misc/MainForm.cs
View File

@@ -1138,10 +1138,10 @@ namespace mpvnet
base.OnDragDrop(e); base.OnDragDrop(e);
if (e.Data.GetDataPresent(DataFormats.FileDrop)) 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)) 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) protected override void OnLostFocus(EventArgs e)

BIN
src/Package/Images/mpvnetExtensions.targetsize-128.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.6 KiB

BIN
src/Package/Images/mpvnetExtensions.targetsize-16.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 555 B

BIN
src/Package/Images/mpvnetExtensions.targetsize-20.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 723 B

BIN
src/Package/Images/mpvnetExtensions.targetsize-24.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 890 B

BIN
src/Package/Images/mpvnetExtensions.targetsize-256.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 8.2 KiB

BIN
src/Package/Images/mpvnetExtensions.targetsize-32.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

BIN
src/Package/Images/mpvnetExtensions.targetsize-40.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 KiB

BIN
src/Package/Images/mpvnetExtensions.targetsize-48.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.7 KiB

BIN
src/Package/Images/mpvnetExtensions.targetsize-64.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.2 KiB

222
src/Package/Package.appxmanifest
View File

@@ -8,130 +8,118 @@
xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
IgnorableNamespaces="uap rescap"> IgnorableNamespaces="uap rescap">
<Identity <Identity
Name="0351c0fc-9274-46ee-941b-728b74e8c5d5" Name="5664FrankSkare.mpv.net"
Publisher="CN=frank" Publisher="CN=6A1A1E69-736C-4C77-B310-7B6D38E32617"
Version="1.0.0.0" /> Version="5.6.0.0" />
<Properties> <Properties>
<DisplayName>mpv.net</DisplayName> <DisplayName>mpv.net</DisplayName>
<PublisherDisplayName>Frank Skare</PublisherDisplayName> <PublisherDisplayName>Frank Skare</PublisherDisplayName>
<Logo>Images\StoreLogo.png</Logo> <Logo>Images\StoreLogo.png</Logo>
</Properties> </Properties>
<Dependencies> <Dependencies>
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" /> <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
<TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.14393.0" MaxVersionTested="10.0.14393.0" /> <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.14393.0" MaxVersionTested="10.0.14393.0" />
</Dependencies> </Dependencies>
<Resources> <Resources>
<Resource Language="x-generate"/> <Resource Language="x-generate"/>
</Resources> </Resources>
<Applications> <Applications>
<Application Id="App" <Application Id="App"
Executable="$targetnametoken$.exe" Executable="$targetnametoken$.exe"
EntryPoint="$targetentrypoint$"> EntryPoint="$targetentrypoint$">
<uap:VisualElements <uap:VisualElements
DisplayName="mpv.net" DisplayName="mpv.net"
Description="mpv.net is a modern media player based on the popular mpv player." Description="mpv.net is a modern media player based on the popular mpv player."
BackgroundColor="transparent" BackgroundColor="transparent"
Square150x150Logo="Images\Square150x150Logo.png" Square150x150Logo="Images\Square150x150Logo.png"
Square44x44Logo="Images\Square44x44Logo.png"> Square44x44Logo="Images\Square44x44Logo.png">
<uap:DefaultTile Wide310x150Logo="Images\Wide310x150Logo.png" /> <uap:DefaultTile Wide310x150Logo="Images\Wide310x150Logo.png" />
<uap:SplashScreen Image="Images\SplashScreen.png" /> <uap:SplashScreen Image="Images\SplashScreen.png" />
</uap:VisualElements> </uap:VisualElements>
<Extensions> <Extensions>
<uap3:Extension Category="windows.appExecutionAlias"> <uap3:Extension Category="windows.appExecutionAlias">
<uap3:AppExecutionAlias> <uap3:AppExecutionAlias>
<desktop:ExecutionAlias Alias="mpvnet.exe" /> <desktop:ExecutionAlias Alias="mpvnet.exe" />
</uap3:AppExecutionAlias> </uap3:AppExecutionAlias>
</uap3:Extension> </uap3:Extension>
<uap:Extension Category="windows.fileTypeAssociation"> <uap:Extension Category="windows.fileTypeAssociation">
<uap:FileTypeAssociation Name="videotypes"> <uap:FileTypeAssociation Name="videotypes">
<uap:Logo>Images\mpvnetExtensions.png</uap:Logo> <uap:SupportedFileTypes>
<uap:SupportedFileTypes> <uap:FileType>.264</uap:FileType>
<uap:FileType>.264</uap:FileType> <uap:FileType>.265</uap:FileType>
<uap:FileType>.265</uap:FileType> <uap:FileType>.asf</uap:FileType>
<uap:FileType>.asf</uap:FileType> <uap:FileType>.avc</uap:FileType>
<uap:FileType>.avc</uap:FileType> <uap:FileType>.avi</uap:FileType>
<uap:FileType>.avi</uap:FileType> <uap:FileType>.avs</uap:FileType>
<uap:FileType>.avs</uap:FileType> <uap:FileType>.dav</uap:FileType>
<uap:FileType>.dav</uap:FileType> <uap:FileType>.flv</uap:FileType>
<uap:FileType>.flv</uap:FileType> <uap:FileType>.h264</uap:FileType>
<uap:FileType>.h264</uap:FileType> <uap:FileType>.h265</uap:FileType>
<uap:FileType>.h265</uap:FileType> <uap:FileType>.hevc</uap:FileType>
<uap:FileType>.hevc</uap:FileType> <uap:FileType>.m2t</uap:FileType>
<uap:FileType>.m2t</uap:FileType> <uap:FileType>.m2ts</uap:FileType>
<uap:FileType>.m2ts</uap:FileType> <uap:FileType>.m2v</uap:FileType>
<uap:FileType>.m2v</uap:FileType> <uap:FileType>.m4v</uap:FileType>
<uap:FileType>.m4v</uap:FileType> <uap:FileType>.mkv</uap:FileType>
<uap:FileType>.mkv</uap:FileType> <uap:FileType>.mov</uap:FileType>
<uap:FileType>.mov</uap:FileType> <uap:FileType>.mp4</uap:FileType>
<uap:FileType>.mp4</uap:FileType> <uap:FileType>.mpeg</uap:FileType>
<uap:FileType>.mpeg</uap:FileType> <uap:FileType>.mpg</uap:FileType>
<uap:FileType>.mpg</uap:FileType> <uap:FileType>.mpv</uap:FileType>
<uap:FileType>.mpv</uap:FileType> <uap:FileType>.mts</uap:FileType>
<uap:FileType>.mts</uap:FileType> <uap:FileType>.ts</uap:FileType>
<uap:FileType>.ts</uap:FileType> <uap:FileType>.vob</uap:FileType>
<uap:FileType>.vob</uap:FileType> <uap:FileType>.vpy</uap:FileType>
<uap:FileType>.vpy</uap:FileType> <uap:FileType>.webm</uap:FileType>
<uap:FileType>.webm</uap:FileType> <uap:FileType>.wmv</uap:FileType>
<uap:FileType>.wmv</uap:FileType> <uap:FileType>.y4m</uap:FileType>
<uap:FileType>.y4m</uap:FileType> </uap:SupportedFileTypes>
</uap:SupportedFileTypes> </uap:FileTypeAssociation>
</uap:FileTypeAssociation> </uap:Extension>
</uap:Extension>
<uap:Extension Category="windows.fileTypeAssociation"> <uap:Extension Category="windows.fileTypeAssociation">
<uap:FileTypeAssociation Name="audiotypes"> <uap:FileTypeAssociation Name="audiotypes">
<uap:Logo>Images\mpvnetExtensions.png</uap:Logo> <uap:SupportedFileTypes>
<uap:SupportedFileTypes> <uap:FileType>.aac</uap:FileType>
<uap:FileType>.aac</uap:FileType> <uap:FileType>.ac3</uap:FileType>
<uap:FileType>.ac3</uap:FileType> <uap:FileType>.dts</uap:FileType>
<uap:FileType>.dts</uap:FileType> <uap:FileType>.dtshd</uap:FileType>
<uap:FileType>.dtshd</uap:FileType> <uap:FileType>.dtshr</uap:FileType>
<uap:FileType>.dtshr</uap:FileType> <uap:FileType>.dtsma</uap:FileType>
<uap:FileType>.dtsma</uap:FileType> <uap:FileType>.eac3</uap:FileType>
<uap:FileType>.eac3</uap:FileType> <uap:FileType>.flac</uap:FileType>
<uap:FileType>.flac</uap:FileType> <uap:FileType>.m4a</uap:FileType>
<uap:FileType>.m4a</uap:FileType> <uap:FileType>.mka</uap:FileType>
<uap:FileType>.mka</uap:FileType> <uap:FileType>.mp2</uap:FileType>
<uap:FileType>.mp2</uap:FileType> <uap:FileType>.mp3</uap:FileType>
<uap:FileType>.mp3</uap:FileType> <uap:FileType>.mpa</uap:FileType>
<uap:FileType>.mpa</uap:FileType> <uap:FileType>.mpc</uap:FileType>
<uap:FileType>.mpc</uap:FileType> <uap:FileType>.ogg</uap:FileType>
<uap:FileType>.ogg</uap:FileType> <uap:FileType>.opus</uap:FileType>
<uap:FileType>.opus</uap:FileType> <uap:FileType>.thd</uap:FileType>
<uap:FileType>.thd</uap:FileType> <uap:FileType>.w64</uap:FileType>
<uap:FileType>.w64</uap:FileType> <uap:FileType>.wav</uap:FileType>
<uap:FileType>.wav</uap:FileType> </uap:SupportedFileTypes>
</uap:SupportedFileTypes> </uap:FileTypeAssociation>
</uap:FileTypeAssociation> </uap:Extension>
</uap:Extension>
<uap:Extension Category="windows.fileTypeAssociation"> <uap:Extension Category="windows.protocol">
<uap:FileTypeAssociation Name="imagetypes"> <uap:Protocol Name="ytdl" />
<uap:Logo>Images\mpvnetExtensions.png</uap:Logo> </uap:Extension>
<uap:SupportedFileTypes> </Extensions>
<uap:FileType>.bmp</uap:FileType>
<uap:FileType>.gif</uap:FileType>
<uap:FileType>.jpg</uap:FileType>
<uap:FileType>.png</uap:FileType>
<uap:FileType>.webp</uap:FileType>
</uap:SupportedFileTypes>
</uap:FileTypeAssociation>
</uap:Extension>
</Extensions>
</Application>
</Applications>
<Capabilities> </Application>
<Capability Name="internetClient" /> </Applications>
<rescap:Capability Name="runFullTrust" />
</Capabilities> <Capabilities>
<Capability Name="internetClient" />
<rescap:Capability Name="runFullTrust" />
</Capabilities>
</Package> </Package>

37
src/Package/mpv.net.package.wapproj
View File

@@ -56,6 +56,42 @@
<DefaultLanguage>en-US</DefaultLanguage> <DefaultLanguage>en-US</DefaultLanguage>
<AppxPackageSigningEnabled>false</AppxPackageSigningEnabled> <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
<EntryPointProjectUniqueName>..\mpv.net.csproj</EntryPointProjectUniqueName> <EntryPointProjectUniqueName>..\mpv.net.csproj</EntryPointProjectUniqueName>
<GenerateAppInstallerFile>False</GenerateAppInstallerFile>
<AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
<GenerateTestArtifacts>True</GenerateTestArtifacts>
<AppxBundlePlatforms>neutral</AppxBundlePlatforms>
<GenerateTemporaryStoreCertificate>True</GenerateTemporaryStoreCertificate>
<HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<AppxBundle>Always</AppxBundle>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
<AppxBundle>Always</AppxBundle>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
<AppxBundle>Always</AppxBundle>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
<AppxBundle>Always</AppxBundle>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<AppxBundle>Always</AppxBundle>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<AppxBundle>Always</AppxBundle>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<AppxBundle>Always</AppxBundle>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
<AppxBundle>Always</AppxBundle>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<AppxBundle>Always</AppxBundle>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<AppxBundle>Always</AppxBundle>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<AppxManifest Include="Package.appxmanifest"> <AppxManifest Include="Package.appxmanifest">
@@ -86,6 +122,7 @@
<Content Include="Images\Square44x44Logo.targetsize-24_altform-unplated.png" /> <Content Include="Images\Square44x44Logo.targetsize-24_altform-unplated.png" />
<Content Include="Images\StoreLogo.png" /> <Content Include="Images\StoreLogo.png" />
<Content Include="Images\Wide310x150Logo.scale-200.png" /> <Content Include="Images\Wide310x150Logo.scale-200.png" />
<None Include="Package.StoreAssociation.xml" />
</ItemGroup> </ItemGroup>
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" /> <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
<ItemGroup> <ItemGroup>

4
src/Properties/AssemblyInfo.cs
View File

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("5.5.0.4")] [assembly: AssemblyVersion("5.6.0.0")]
[assembly: AssemblyFileVersion("5.5.0.4")] [assembly: AssemblyFileVersion("5.6.0.0")]

1
src/Resources/input.conf.txt
View File

@@ -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 L cycle-values loop-file inf no #menu: Tools > Toggle infinite file looping
_ playlist-shuffle #menu: Tools > Shuffle Playlist _ playlist-shuffle #menu: Tools > Shuffle Playlist
Ctrl+h cycle-values hwdec auto no #menu: Tools > Toggle Hardware Decoding 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://mpv.io #menu: Help > Website mpv
_ script-message mpv.net shell-execute https://github.com/stax76/mpv.net #menu: Help > Website mpv.net _ script-message mpv.net shell-execute https://github.com/stax76/mpv.net #menu: Help > Website mpv.net

28
src/mpv.net.csproj
View File

@@ -13,6 +13,21 @@
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
<UpdateEnabled>false</UpdateEnabled>
<UpdateMode>Foreground</UpdateMode>
<UpdateInterval>7</UpdateInterval>
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup> </PropertyGroup>
<PropertyGroup /> <PropertyGroup />
<PropertyGroup /> <PropertyGroup />
@@ -254,7 +269,18 @@
<SubType>Designer</SubType> <SubType>Designer</SubType>
</Page> </Page>
</ItemGroup> </ItemGroup>
<ItemGroup /> <ItemGroup>
<BootstrapperPackage Include=".NETFramework,Version=v4.8">
<Visible>False</Visible>
<ProductName>Microsoft .NET Framework 4.8 %28x86 and x64%29</ProductName>
<Install>true</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1</ProductName>
<Install>false</Install>
</BootstrapperPackage>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.