diff --git a/Changelog.md b/Changelog.md index 067be10..f1e3e0f 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,3 +1,8 @@ +### + +- osc=yes and input-media-keys=yes was enforced, + now it can be disabled in mpv.conf + ### 5.3 - added new feature: Open > Open DVD/Blu-ray Drive/Folder... diff --git a/mpv.net/Misc/App.cs b/mpv.net/Misc/App.cs index 9f4683a..7261ddb 100644 --- a/mpv.net/Misc/App.cs +++ b/mpv.net/Misc/App.cs @@ -8,7 +8,7 @@ namespace mpvnet { 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[] ImageTypes { get; } = {"jpg", "bmp", "gif", "png"}; public static string[] SubtitleTypes { get; } = { "srt", "ass", "idx", "sup", "ttxt", "ssa", "smi" }; diff --git a/mpv.net/mpv/mp.cs b/mpv.net/mpv/mp.cs index 6554e0d..83adf57 100644 --- a/mpv.net/mpv/mp.cs +++ b/mpv.net/mpv/mp.cs @@ -103,9 +103,11 @@ namespace mpvnet } 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("input-media-keys", "yes"); set_property_string("config-dir", ConfigFolder); set_property_string("config", "yes");