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

logo change

Browse Source
This commit is contained in:
stax76
2022-06-09 10:25:06 +02:00
parent 71d6b96c10
commit 0bfee26418
4 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/Changelog.md
View File

@@ -5,7 +5,6 @@
- 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)

2
docs/Manual.md
View File

@@ -541,7 +541,7 @@ Draws the blue mpv.net logo ontop of the native OSC logo. Default: yes
#### --show-santa-logo=\<yes|no\> #### --show-santa-logo=\<yes|no\>
Draws the blue mpv.net logo with a santa hat in december, 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 External Tools
-------------- --------------

11
src/Misc/Player.cs
View File

@@ -79,7 +79,6 @@ namespace mpvnet
public List<TimeSpan> BluRayTitles { get; } = new List<TimeSpan>(); public List<TimeSpan> BluRayTitles { get; } = new List<TimeSpan>();
public object MediaTracksLock { get; } = new object(); 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 string ConfPath { get => ConfigFolder + "mpv.conf"; } public string ConfPath { get => ConfigFolder + "mpv.conf"; }
@@ -151,12 +150,6 @@ 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)
@@ -1374,10 +1367,6 @@ 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));

2
src/Resources/editor_conf.txt
View File

@@ -655,7 +655,7 @@ name = show-santa-logo
file = mpvnet file = mpvnet
default = yes default = yes
filter = UI 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 = yes
option = no option = no