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

osc=yes and input-media-keys=yes was enforced, can now be disabled in mpv.conf

Browse Source
This commit is contained in:
Frank Skare
2019-08-16 19:37:07 +02:00
parent 558bd67591
commit e230f0f474
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Changelog.md
View File

@@ -1,3 +1,8 @@
###
- osc=yes and input-media-keys=yes was enforced,
now it can be disabled in mpv.conf
### 5.3 ### 5.3
- added new feature: Open > Open DVD/Blu-ray Drive/Folder... - added new feature: Open > Open DVD/Blu-ray Drive/Folder...

2
mpv.net/Misc/App.cs
View File

@@ -8,7 +8,7 @@ namespace mpvnet
{ {
public class App public class App
{ {
public static string[] VideoTypes { get; } = "264 265 asf avc avi avs flv h264 h265 hevc m2ts m2v m4v mkv mov mp4 mpeg mpg mpv mts ts vob vpy webm webm wmv y4m".Split(' '); public static string[] VideoTypes { get; } = "264 265 asf avc avi avs flv h264 h265 hevc m2ts m2v m4v mkv mov mp4 mpeg mpg mpv mts ts vob vpy webm wmv y4m".Split(' ');
public static string[] AudioTypes { get; } = "mp3 mp2 ac3 ogg opus flac wav w64 m4a dts dtsma dtshr dtshd eac3 thd thd+ac3 mka aac mpa".Split(' '); public static string[] AudioTypes { get; } = "mp3 mp2 ac3 ogg opus flac wav w64 m4a dts dtsma dtshr dtshd eac3 thd thd+ac3 mka aac mpa".Split(' ');
public static string[] ImageTypes { get; } = {"jpg", "bmp", "gif", "png"}; public static string[] ImageTypes { get; } = {"jpg", "bmp", "gif", "png"};
public static string[] SubtitleTypes { get; } = { "srt", "ass", "idx", "sup", "ttxt", "ssa", "smi" }; public static string[] SubtitleTypes { get; } = { "srt", "ass", "idx", "sup", "ttxt", "ssa", "smi" };

6
mpv.net/mpv/mp.cs
View File

@@ -103,9 +103,11 @@ namespace mpvnet
} }
set_property_string("wid", MainForm.Hwnd.ToString()); set_property_string("wid", MainForm.Hwnd.ToString());
set_property_string("osc", "yes");
if (!Conf.Keys.Contains("osc")) set_property_string("osc", "yes");
if (!Conf.Keys.Contains("input-media-keys")) set_property_string("input-media-keys", "yes");
set_property_string("force-window", "yes"); set_property_string("force-window", "yes");
set_property_string("input-media-keys", "yes");
set_property_string("config-dir", ConfigFolder); set_property_string("config-dir", ConfigFolder);
set_property_string("config", "yes"); set_property_string("config", "yes");