From 0bfee264182957feafda41ca11c5205fcaa3d03a Mon Sep 17 00:00:00 2001 From: stax76 Date: Thu, 9 Jun 2022 10:25:06 +0200 Subject: [PATCH] logo change --- docs/Changelog.md | 1 - docs/Manual.md | 2 +- src/Misc/Player.cs | 11 ----------- src/Resources/editor_conf.txt | 2 +- 4 files changed, 2 insertions(+), 14 deletions(-) diff --git a/docs/Changelog.md b/docs/Changelog.md index 9767813..84e8036 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -5,7 +5,6 @@ - New options `autofit-image` and `autofit-audio`, like autofit but used for image and audio files. Default 80. - New [auto-mode](https://github.com/stax76/mpv-scripts) script to use mpv and mpv.net as image viewer and audio player. - Fix long commands causing key bindings not visible in the command palette. -- Fix logo overlap using mordenx.lua, if the file mordenx.lua exists, the mpv.net logo is disabled. # 6.0.0.0 Beta (2022-06-05) diff --git a/docs/Manual.md b/docs/Manual.md index 9a88850..fa63bb6 100644 --- a/docs/Manual.md +++ b/docs/Manual.md @@ -541,7 +541,7 @@ Draws the blue mpv.net logo ontop of the native OSC logo. Default: yes #### --show-santa-logo=\ Draws the blue mpv.net logo with a santa hat in december, -the option is called green and grumpy in mpv. Default: yes +the option is called greenandgrumpy in mpv. Default: yes External Tools -------------- diff --git a/src/Misc/Player.cs b/src/Misc/Player.cs index 5982c72..d0ee5c9 100644 --- a/src/Misc/Player.cs +++ b/src/Misc/Player.cs @@ -79,7 +79,6 @@ namespace mpvnet public List BluRayTitles { get; } = new List(); public object MediaTracksLock { get; } = new object(); public Size VideoSize { get; set; } - public List Scripts { get; } = new List(); public TimeSpan Duration; public string ConfPath { get => ConfigFolder + "mpv.conf"; } @@ -151,12 +150,6 @@ namespace mpvnet Environment.SetEnvironmentVariable("mpv_client", "mpvnet"); - string scriptsFolder = ConfigFolder + "scripts"; - - if (Directory.Exists(scriptsFolder)) - foreach (string i in Directory.GetFiles(scriptsFolder)) - Scripts.Add(i.FileName().ToLower()); - mpv_error err = mpv_initialize(Handle); if (err < 0) @@ -1374,10 +1367,6 @@ namespace mpvnet if (!App.ShowLogo || MainForm.Instance == null || Core.Handle == IntPtr.Zero) return; - foreach (string i in Scripts) - if (i == "mordenx.lua") - return; - bool december = DateTime.Now.Month == 12; Rectangle cr = MainForm.Instance.ClientRectangle; int len = Convert.ToInt32(cr.Height / (december ? 4.5 : 5)); diff --git a/src/Resources/editor_conf.txt b/src/Resources/editor_conf.txt index 427ca45..38736b8 100644 --- a/src/Resources/editor_conf.txt +++ b/src/Resources/editor_conf.txt @@ -655,7 +655,7 @@ name = show-santa-logo file = mpvnet default = yes filter = UI -help = Draws the blue mpv.net logo with a santa hat in december, the option is called green and grumpy in mpv. +help = Draws the blue mpv.net logo with a santa hat in december, the option is called greenandgrumpy in mpv. option = yes option = no