diff --git a/Changelog.md b/Changelog.md
index 8c607ef..82ae53d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,7 @@
5.4.8.6 Beta (not yet released)
============
+- Santa hat shown in december. (#216)
- Filename not being always shown in title bar. (#214)
- Improved OSD message when cycling audio.
- Finally support DVD audio and subtitle track selection.
@@ -14,6 +15,7 @@
- Protocols can be shown in the menu under: View > Show Protocols
- Allow mpv.net to start from different startup locations
without showing the setup dialog. (#218)
+- libmpv updated to shinshiro 2020-12-20
5.4.8.5 Beta
diff --git a/img/mpvnet-santa.png b/img/mpvnet-santa.png
new file mode 100644
index 0000000..634c297
Binary files /dev/null and b/img/mpvnet-santa.png differ
diff --git a/mpv.net/Properties/Resources.Designer.cs b/mpv.net/Properties/Resources.Designer.cs
index ef1b679..3cf86f3 100644
--- a/mpv.net/Properties/Resources.Designer.cs
+++ b/mpv.net/Properties/Resources.Designer.cs
@@ -80,18 +80,20 @@ namespace mpvnet.Properties {
///
/// Looks up a localized string similar to
- /// # This file defines the key and mouse bindings and the context menu
- /// # of mpv.net. A input and config editor can be found in mpv.nets
- /// # context menu under 'Settings'. The defaults of this file can be found at:
+ /// # This file defines the key and mouse bindings and the context menu of mpv.net.
+ ///
+ /// # A input and config editor can be found in the context menu under 'Settings'.
+ ///
+ /// # The mpv.conf defaults of mpv.net contain: 'input-default-bindings = no'
+ /// # which disables the input defaults of mpv.
+ ///
+ /// # Every line in this file begins with a space character to make search easier,
+ /// # if you want to know if 'o' has already a binding you can search for ' o '.
///
- /// # https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/inputConf.txt
+ /// # input test mode:
+ /// # mpvnet --input-test
///
- /// # The defaults of mpv can be found at:
- ///
- /// # https://github.com/mpv-player/mpv/blob/master/etc/input.conf
- ///
- /// # mpv.net's defaults of mpv.conf contain: 'input-default-bindings = no'
- /// # which disables mpv's i [rest of string was truncated]";.
+ /// # The [rest of string was truncated]";.
///
internal static string input_conf {
get {
@@ -108,9 +110,8 @@ namespace mpvnet.Properties {
///keep-open-pause = no
///osd-duration = 2000
///osd-playing-msg = '${filename}'
- ///script-opts = osc-scalewindowed=1.5,osc-hidetimeout=2000,console-scale=1
+ ///script-opts = osc-scalewindowed=1.5,osc-hidetimeout=2000,osc-greenandgrumpy=yes,console-scale=1
///screenshot-directory = '~~desktop/'
- ///hwdec = yes
///
///[protocol.https]
///osd-playing-msg = '${media-title}'
@@ -132,6 +133,16 @@ namespace mpvnet.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ internal static System.Drawing.Bitmap mpvnet_santa {
+ get {
+ object obj = ResourceManager.GetObject("mpvnet_santa", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
///
/// Looks up a localized string similar to
///[dark]
diff --git a/mpv.net/Properties/Resources.resx b/mpv.net/Properties/Resources.resx
index 6c7effc..e55dfa1 100644
--- a/mpv.net/Properties/Resources.resx
+++ b/mpv.net/Properties/Resources.resx
@@ -127,6 +127,9 @@
..\Resources\mpvnet.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\mpvnet-santa.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
..\Resources\mpv.conf.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8
diff --git a/mpv.net/Resources/mpv.conf.txt b/mpv.net/Resources/mpv.conf.txt
index 7237d22..a22a874 100644
--- a/mpv.net/Resources/mpv.conf.txt
+++ b/mpv.net/Resources/mpv.conf.txt
@@ -6,7 +6,7 @@ keep-open = yes
keep-open-pause = no
osd-duration = 2000
osd-playing-msg = '${filename}'
-script-opts = osc-scalewindowed=1.5,osc-hidetimeout=2000,osc-greenandgrumpy=yes,console-scale=1
+script-opts = osc-scalewindowed=1.5,osc-hidetimeout=2000,console-scale=1
screenshot-directory = '~~desktop/'
[protocol.https]
diff --git a/mpv.net/Resources/mpvnet-santa.png b/mpv.net/Resources/mpvnet-santa.png
new file mode 100644
index 0000000..634c297
Binary files /dev/null and b/mpv.net/Resources/mpvnet-santa.png differ
diff --git a/mpv.net/WPF/AboutWindow.xaml.cs b/mpv.net/WPF/AboutWindow.xaml.cs
index 22a337d..d711b09 100644
--- a/mpv.net/WPF/AboutWindow.xaml.cs
+++ b/mpv.net/WPF/AboutWindow.xaml.cs
@@ -12,7 +12,7 @@ namespace mpvnet
public AboutWindow()
{
InitializeComponent();
- ContentBlock.Text= "Copyright (C) 2017-2020 Frank Skare\n" +
+ ContentBlock.Text= "Copyright (C) 2017-2020 Frank Skare (stax76)\n" +
$"mpv.net {System.Windows.Forms.Application.ProductVersion} ({File.GetLastWriteTime(System.Windows.Forms.Application.ExecutablePath).ToShortDateString()})\n" +
$"{core.get_property_string("mpv-version")} ({File.GetLastWriteTime(Folder.Startup + "mpv-1.dll").ToShortDateString()})\nffmpeg {core.get_property_string("ffmpeg-version")}\nMIT License";
}
diff --git a/mpv.net/mpv.net.csproj b/mpv.net/mpv.net.csproj
index c00e6c5..0db6080 100644
--- a/mpv.net/mpv.net.csproj
+++ b/mpv.net/mpv.net.csproj
@@ -101,6 +101,7 @@
License.txt
PreserveNewest
+
MSBuild:Compile
diff --git a/mpv.net/mpv/Core.cs b/mpv.net/mpv/Core.cs
index 48c0810..e526e7e 100644
--- a/mpv.net/mpv/Core.cs
+++ b/mpv.net/mpv/Core.cs
@@ -1227,8 +1227,10 @@ namespace mpvnet
if (MainForm.Instance is null)
return;
+ bool december = DateTime.Now.Month == 12;
+
Rectangle cr = MainForm.Instance.ClientRectangle;
- int len = cr.Height / 5;
+ int len = Convert.ToInt32(cr.Height / (december ? 4.5 : 5));
if (len == 0)
return;
@@ -1240,10 +1242,11 @@ namespace mpvnet
gx.InterpolationMode = InterpolationMode.HighQualityBicubic;
gx.Clear(Color.Black);
Rectangle rect = new Rectangle(0, 0, len, len);
- gx.DrawImage(Properties.Resources.mpvnet, rect);
+ Bitmap bmp2 = december ? Properties.Resources.mpvnet_santa : Properties.Resources.mpvnet;
+ gx.DrawImage(bmp2, rect);
BitmapData bd = bmp.LockBits(rect, ImageLockMode.ReadOnly, PixelFormat.Format32bppPArgb);
- int x = Convert.ToInt32((cr.Width - len) / 2.0);
- int y = Convert.ToInt32(((cr.Height - len) / 2.0) * 0.9);
+ int x = Convert.ToInt32((cr.Width - len) / (december ? 1.95 : 2));
+ int y = Convert.ToInt32(((cr.Height - len) / 2.0) * (december ? 0.85 : 0.9));
commandv("overlay-add", "0", $"{x}", $"{y}", "&" + bd.Scan0.ToInt64().ToString(), "0", "bgra", bd.Width.ToString(), bd.Height.ToString(), bd.Stride.ToString());
bmp.UnlockBits(bd);
IsLogoVisible = true;