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

Fix logo overlap using mordenx.lua

Browse Source
This commit is contained in:
stax76
2022-06-09 08:27:45 +02:00
parent d1b7250a7a
commit 71d6b96c10
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/Changelog.md
View File

@@ -5,6 +5,7 @@
- New options `autofit-image` and `autofit-audio`, like autofit but used for image and audio files. Default 80. - 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. - 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 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) # 6.0.0.0 Beta (2022-06-05)

25
src/Misc/Player.cs
View File

@@ -70,19 +70,18 @@ namespace mpvnet
public Dictionary<string, List<Action<double>>> DoublePropChangeActions { get; set; } = new Dictionary<string, List<Action<double>>>(); public Dictionary<string, List<Action<double>>> DoublePropChangeActions { get; set; } = new Dictionary<string, List<Action<double>>>();
public Dictionary<string, List<Action<string>>> StringPropChangeActions { get; set; } = new Dictionary<string, List<Action<string>>>(); public Dictionary<string, List<Action<string>>> StringPropChangeActions { get; set; } = new Dictionary<string, List<Action<string>>>();
public List<MediaTrack> MediaTracks { get; set; } = new List<MediaTrack>(); public AutoResetEvent ShutdownAutoResetEvent { get; } = new AutoResetEvent(false);
public object MediaTracksLock { get; } = new object(); public AutoResetEvent VideoSizeAutoResetEvent { get; } = new AutoResetEvent(false);
public List<KeyValuePair<string, double>> Chapters { get; set; } = new List<KeyValuePair<string, double>>();
public List<TimeSpan> BluRayTitles { get; } = new List<TimeSpan>();
public IntPtr Handle { get; set; } public IntPtr Handle { get; set; }
public IntPtr NamedHandle { get; set; } public IntPtr NamedHandle { get; set; }
public List<KeyValuePair<string, double>> Chapters { get; set; } = new List<KeyValuePair<string, double>>();
public List<MediaTrack> MediaTracks { get; set; } = new List<MediaTrack>();
public List<TimeSpan> BluRayTitles { get; } = new List<TimeSpan>();
public object MediaTracksLock { get; } = new object();
public Size VideoSize { get; set; } public Size VideoSize { get; set; }
public List<string> Scripts { get; } = new List<string>();
public TimeSpan Duration; public TimeSpan Duration;
public AutoResetEvent ShutdownAutoResetEvent { get; } = new AutoResetEvent(false);
public AutoResetEvent VideoSizeAutoResetEvent { get; } = new AutoResetEvent(false);
public string ConfPath { get => ConfigFolder + "mpv.conf"; } public string ConfPath { get => ConfigFolder + "mpv.conf"; }
public string GPUAPI { get; set; } = "auto"; public string GPUAPI { get; set; } = "auto";
public string InputConfPath => ConfigFolder + "input.conf"; public string InputConfPath => ConfigFolder + "input.conf";
@@ -152,6 +151,12 @@ namespace mpvnet
Environment.SetEnvironmentVariable("mpv_client", "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); mpv_error err = mpv_initialize(Handle);
if (err < 0) if (err < 0)
@@ -1369,6 +1374,10 @@ namespace mpvnet
if (!App.ShowLogo || MainForm.Instance == null || Core.Handle == IntPtr.Zero) if (!App.ShowLogo || MainForm.Instance == null || Core.Handle == IntPtr.Zero)
return; return;
foreach (string i in Scripts)
if (i == "mordenx.lua")
return;
bool december = DateTime.Now.Month == 12; bool december = DateTime.Now.Month == 12;
Rectangle cr = MainForm.Instance.ClientRectangle; Rectangle cr = MainForm.Instance.ClientRectangle;
int len = Convert.ToInt32(cr.Height / (december ? 4.5 : 5)); int len = Convert.ToInt32(cr.Height / (december ? 4.5 : 5));