From ad30dc5ae28aed06429b9640fdb61a83d23094c6 Mon Sep 17 00:00:00 2001 From: Frank Skare Date: Mon, 5 Aug 2019 03:06:40 +0200 Subject: [PATCH] command line processing was improved --- Changelog.md | 11 ++++- img/Avatar.png | Bin 10810 -> 10861 bytes mpv.net/Properties/AssemblyInfo.cs | 4 +- mpv.net/WPF/AboutWindow.xaml | 3 +- mpv.net/WPF/AboutWindow.xaml.cs | 6 ++- mpv.net/WinForms/MainForm.cs | 2 +- mpv.net/mpv/mp.cs | 66 ++++++++++++++++++----------- 7 files changed, 59 insertions(+), 33 deletions(-) diff --git a/Changelog.md b/Changelog.md index cb6c266..cf8e106 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,8 +1,15 @@ ### - bug fix for single-instance not working with unicode filenames -- bug fix for logo not shown -- bug fix osd-visibility.js script causing memory leak +- bug fix for logo not shown on start +- osd-visibility.js script was removed because the OSC uses too much memory +- youtube-dl was updated +- in case mpv.net is started from a terminal it sets now the mpv property input-terminal to yes, + this means mpv.net will now receive input keys from the terminal +- command line processing was improved, certain properties didn't work, now they should work: + (input-terminal, terminal, input-file, config, config-dir, input-conf, + load-scripts, script, scripts, player-operation-mode) +- the about dialog shows now the mpv version and build date ### 5.1 diff --git a/img/Avatar.png b/img/Avatar.png index 7b26fef0bcc95b71501f34d37ed3b6ff0c9c1b06..98ad90ceea69cc84b3804551f23ad64e72d99217 100644 GIT binary patch delta 9695 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 t8JI>DSwN#QkKIGV2qI{!*2LK@j+|WqszNm>Gi mpv.net Copyright (c) 2017-2019 Frank Skare (stax76) + MIT License diff --git a/mpv.net/WPF/AboutWindow.xaml.cs b/mpv.net/WPF/AboutWindow.xaml.cs index b79c910..b3ba7ae 100644 --- a/mpv.net/WPF/AboutWindow.xaml.cs +++ b/mpv.net/WPF/AboutWindow.xaml.cs @@ -1,4 +1,5 @@ -using System.Windows; +using System.IO; +using System.Windows; using System.Windows.Input; using System.Windows.Media; @@ -9,7 +10,8 @@ namespace mpvnet public AboutWindow() { InitializeComponent(); - Version.Text = $"Version {System.Windows.Forms.Application.ProductVersion}"; + Version.Text = $"mpv.net Version {System.Windows.Forms.Application.ProductVersion}"; + mpvVersion.Text = $"{mp.get_property_string("mpv-version")} ({File.GetLastWriteTime(PathHelp.StartupPath + "mpv-1.dll").ToShortDateString()})"; } protected override void OnPreviewKeyDown(KeyEventArgs e) => Close(); diff --git a/mpv.net/WinForms/MainForm.cs b/mpv.net/WinForms/MainForm.cs index 0eeac4d..4db0ef6 100644 --- a/mpv.net/WinForms/MainForm.cs +++ b/mpv.net/WinForms/MainForm.cs @@ -511,7 +511,7 @@ namespace mpvnet protected override void OnShown(EventArgs e) { base.OnShown(e); - if (mp.GPUAPI == "vulkan") mp.ProcessCommandLine(); + if (mp.GPUAPI == "vulkan") mp.ProcessCommandLine(false); var wpfColor = WPF.WPF.ThemeColor; Color color = Color.FromArgb(wpfColor.A, wpfColor.R, wpfColor.G, wpfColor.B); ToolStripRendererEx.InitColors(color, App.IsDarkMode, App.ThemedMenu); diff --git a/mpv.net/mpv/mp.cs b/mpv.net/mpv/mp.cs index 4fb89d7..3d472e9 100644 --- a/mpv.net/mpv/mp.cs +++ b/mpv.net/mpv/mp.cs @@ -98,6 +98,7 @@ namespace mpvnet if (App.IsStartedFromTerminal) { set_property_string("terminal", "yes"); + set_property_string("input-terminal", "yes"); set_property_string("msg-level", "osd/libass=fatal"); } @@ -108,10 +109,11 @@ namespace mpvnet set_property_string("config-dir", ConfigFolder); set_property_string("config", "yes"); + ProcessCommandLine(true); mpv_initialize(Handle); Initialized?.Invoke(); LoadMpvScripts(); - if (GPUAPI != "vulkan") ProcessCommandLine(); + if (GPUAPI != "vulkan") ProcessCommandLine(false); } public static void ProcessProperty(string name, string value) @@ -564,40 +566,40 @@ namespace mpvnet StringPropChangeActions.Add(new KeyValuePair>(name, action)); } - public static void ProcessCommandLine() + public static void ProcessCommandLine(bool preInit) { var args = Environment.GetCommandLineArgs().Skip(1); - List files = new List(); + + //Msg.Show(string.Join("\n", args)); + + string[] preInitProperties = { "input-terminal", "terminal", "input-file", "config", "config-dir", "input-conf", "load-scripts", "scripts", "player-operation-mode" }; foreach (string i in args) { - if (!i.StartsWith("--") && (i == "-" || i.Contains("://") || File.Exists(i))) - { - files.Add(i); - if (i.Contains("://")) RegHelp.SetObject(App.RegPath, "LastURL", i); - } - } + string arg = i; - foreach (string i in args) - { - if (i.StartsWith("--")) + if (arg.StartsWith("--")) { try { - if (i.Contains("=")) + if (!arg.Contains("=")) arg += "=yes"; + + string left = arg.Substring(2, arg.IndexOf("=") - 2); + string right = arg.Substring(left.Length + 3); + + if (left == "script") left = "scripts"; + + if (preInit && preInitProperties.Contains(left)) { - string left = i.Substring(2, i.IndexOf("=") - 2); - string right = i.Substring(left.Length + 3); mp.ProcessProperty(left, right); if (!App.ProcessProperty(left, right)) set_property_string(left, right, true); } - else + else if (!preInit && !preInitProperties.Contains(left)) { - string name = i.Substring(2); - mp.ProcessProperty(name, "yes"); - if (!App.ProcessProperty(name, "yes")) - set_property_string(name, "yes", true); + mp.ProcessProperty(left, right); + if (!App.ProcessProperty(left, right)) + set_property_string(left, right, true); } } catch (Exception e) @@ -607,12 +609,26 @@ namespace mpvnet } } - Load(files.ToArray(), App.ProcessInstance != "queue", Control.ModifierKeys.HasFlag(Keys.Control)); - - if (files.Count == 0 || files[0].Contains("://")) + if (!preInit) { - VideoSizeAutoResetEvent.Set(); - VideoSizeChanged?.Invoke(); + List files = new List(); + + foreach (string i in args) + { + if (!i.StartsWith("--") && (i == "-" || i.Contains("://") || File.Exists(i))) + { + files.Add(i); + if (i.Contains("://")) RegHelp.SetObject(App.RegPath, "LastURL", i); + } + } + + Load(files.ToArray(), App.ProcessInstance != "queue", Control.ModifierKeys.HasFlag(Keys.Control)); + + if (files.Count == 0 || files[0].Contains("://")) + { + VideoSizeAutoResetEvent.Set(); + VideoSizeChanged?.Invoke(); + } } }