diff --git a/docs/Manual.md b/docs/Manual.md index 35742f8..e24ab4f 100644 --- a/docs/Manual.md +++ b/docs/Manual.md @@ -2,7 +2,7 @@ mpv.net manual ============== -Other Languages: [简体中文](Manual_chs.md) +**ENGLISH** | **[简体中文](Manual_chs.md)** Table of contents ----------------- @@ -73,9 +73,8 @@ the setup don't enforce it because it's not easy to implement. For internet streaming youtube-dl must be downloaded and installed manually, meaning it must be located in the PATH environment variable or in the startup directory. -mpvnet.exe is platform agnostic, users that need x86 have to replace 4 native tools: +mpvnet.exe is platform agnostic, users that need x86 have to replace 3 native tools: -- Everything.dll - mpv-1.dll - MediaInfo.dll - mpvnet.com @@ -652,7 +651,6 @@ Third party components are: - [libmpv provides the core functionality](https://mpv.io/) - [MediaInfo](https://mediaarea.net/en/MediaInfo) -- [Everything, a fast file search service](https://www.voidtools.com) Context Menu @@ -696,17 +694,12 @@ from the browser from sites like YouTube is described in the For internet streaming youtube-dl must be downloaded and installed manually, meaning it must be located in the PATH environment variable or in the startup directory. + ### Open > Open DVD/Blu-ray Drive/Folder Opens a DVD/Blu-ray Drive/Folder. -### Open > Show media search - -mpv.net supports system wide media searches using the Everything indexing -service installed by the popular file search tool [Everything](www.voidtools.com). - - ### Open > Load external audio files Allows to load an external audio file. It's also possible to auto detect diff --git a/docs/Manual_chs.md b/docs/Manual_chs.md index b489c2c..d5b6b24 100644 --- a/docs/Manual_chs.md +++ b/docs/Manual_chs.md @@ -2,7 +2,9 @@ mpv.net手册 ============== -同步源提交_20210627_c40a0d8 +同步源提交_[20210722](https://github.com/stax76/mpv.net/commit/3f137474139d3721c3b8dd0b264bb76ceba36004#diff-bf7b5e59783955f479505de4969f792255eca0a69945ccfe3ec5dda409495bbe) + +**[ENGLISH](Manual.md)** | **简体中文** 目录 ----------------- @@ -15,7 +17,7 @@ mpv.net手册 * [快捷键输入绑定](#快捷键输入绑定) * [命令行界面](#命令行界面) * [终端](#终端) -* [mpv.net的专属选项](#mpv.net的专属选项) +* [mpv.net的专属选项](#mpvnet的专属选项) * [外部工具](#外部工具) * [脚本](#脚本) * [扩展](#扩展) @@ -68,9 +70,8 @@ mpv.net需要.NET Framework 4.8运行库和高于win7版本的系统以及一张 对于网络串流，必须手动下载安装youtube-dl，它必须位于环境变量 PATH 或启动目录中。 -mpv.net不限制系统平台，win32的用户必须替换目录中的4个工具： +mpv.net不限制系统平台，win32的用户必须替换目录中的3个工具： -- Everything.dll - mpv-1.dll - MediaInfo.dll - mpvnet.com @@ -127,7 +128,7 @@ mpv.net在以下路径寻找设置文件夹： [mpv.conf defaults](../../../tree/master/src/Resources/mpv.conf.txt) -mpv.net的专属选项保存在 mpvnet.conf 文件中，参数解释请参阅[此处](#mpv.net的专属选项). +mpv.net的专属选项保存在 mpvnet.conf 文件中，参数解释请参阅 [此处](#mpvnet的专属选项) 快捷键输入绑定 @@ -183,7 +184,7 @@ mpv.net通常不支持非属性的运行时状态切换！ 在菜单中的 'Tools > Setup' 可以将mpv.net添加到环境变量PATH。 -A common task for the terminal is debugging scripts. +终端的常见用处是脚本调试。 mpv.net的专属选项 @@ -200,9 +201,8 @@ mpv.net的专属选项 #### --command=\ -发送一个输入命令。用于从命令行控制mpv.net，例如使用 AutoHotkey 创建全局热键， +通过命令行向正在运行的mpv.net实例发送输入命令，例如使用 AutoHotkey 创建全局热键， 必须设置 [process-instance=single](#--process-instancevalue) 。 -空格必须用引号转义，引号必须用双引号转义。 ### Audio @@ -372,7 +372,7 @@ mpv.net的专属选项 ### Universal Remote 安卓应用 -Universal Remote 是一个收费的安卓远程控制app。 +Universal Remote 是一个收费的安卓远程控制APP。 https://www.unifiedremote.com @@ -597,11 +597,16 @@ mpv.net支持基于属性的mpv命令行选项，这意味着它支持mpv几乎 --version +### 脚本限制(Lua&JavaScript) + +不直接支持脚本输入绑定 `mp.add_key_binding` ，必须在 input.conf 中重新定义绑定。 + + ### mpv.net的专属选项 -在config editor中输入 'mpv.net' 检索这些选项，在[此处](#mpv.net的专属选项)的手册中有对应说明。 +在config editor中输入 `mpv.net` 检索这些选项，在[此处](#mpvnet的专属选项)的手册中有对应说明。 -mpv.net的专属选项保存在 'mpvnet.conf' 文件中，与mpv一样可由命令行界面获取。 +mpv.net的专属选项保存在 mpvnet.conf 文件中，与mpv一样可由命令行界面获取。 技术概览 @@ -618,7 +623,6 @@ mpv.net使用 C#7 编写并且需要 .NET Framework 4.8 来运行。 - [libmpv提供了核心功能](https://mpv.io/) - [MediaInfo](https://mediaarea.net/en/MediaInfo) -- [Everything快速文件搜索服务](https://www.voidtools.com) 上下文菜单 @@ -655,16 +659,12 @@ input.conf 定义mpv的快捷键，同时mpv.net使用注释定义上下文菜 对于网络流媒体，必须手动下载并安装youtube-dl，这意味着它必须位于环境变量PATH或启动目录中。 + ### Open > Open DVD/Blu-ray Drive/Folder 打开DVD/Blu-ray的驱动器/文件夹。 -### Open > Show media search - -mpv.net使用流行的文件搜索工具[Everything](www.voidtools.com)的索引服务支持系统范围的媒体搜索。 - - ### Open > Load external audio files 允许加载外部音轨文件。也可以根据文件名自动检测，该选项可在下面的设置中找到 diff --git a/src/Misc/CorePlayer.cs b/src/Misc/CorePlayer.cs index 7c2c546..262f6fb 100644 --- a/src/Misc/CorePlayer.cs +++ b/src/Misc/CorePlayer.cs @@ -21,7 +21,7 @@ namespace mpvnet public static string[] VideoTypes { get; set; } = "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".Split(' '); public static string[] AudioTypes { get; set; } = "aac ac3 dts dtshd dtshr dtsma eac3 flac m4a mka mp2 mp3 mpa mpc ogg opus thd thd+ac3 w64 wav".Split(' '); public static string[] ImageTypes { get; set; } = { "jpg", "bmp", "png", "gif" }; - public static string[] SubtitleTypes { get; } = { "srt", "ass", "idx", "sup", "ttxt", "ssa", "smi" }; + public static string[] SubtitleTypes { get; } = { "srt", "ass", "idx", "sub", "sup", "ttxt", "txt", "ssa", "smi", "mks" }; public event Action LogMessageAsync; // log-message MPV_EVENT_LOG_MESSAGE public event Action EndFileAsync; // end-file MPV_EVENT_END_FILE diff --git a/src/Resources/input.conf.txt b/src/Resources/input.conf.txt index c055f41..b464bf8 100644 --- a/src/Resources/input.conf.txt +++ b/src/Resources/input.conf.txt @@ -207,5 +207,6 @@ MBTN_Back playlist-prev < playlist-prev Ctrl+Wheel_Up no-osd seek 7 Ctrl+Wheel_Down no-osd seek -7 +MBTN_Left ignore MBTN_Left_DBL cycle fullscreen KP_Enter cycle fullscreen diff --git a/src/Resources/mpv.conf.txt b/src/Resources/mpv.conf.txt index dc662f5..fcaa56b 100644 --- a/src/Resources/mpv.conf.txt +++ b/src/Resources/mpv.conf.txt @@ -8,4 +8,4 @@ osd-duration = 2000 osd-playing-msg = '${filename}' script-opts = osc-scalewindowed=1.5,osc-hidetimeout=2000,console-scale=1 screenshot-directory = '~~desktop/' -watch-later-options = start +watch-later-options =