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

Santa hat shown in december

Browse Source
This commit is contained in:
Frank Skare
2020-12-24 11:24:03 +01:00
parent f3909acdfe
commit b396012934
9 changed files with 38 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog.md
View File

@@ -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

BIN
img/mpvnet-santa.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 25 KiB

35
mpv.net/Properties/Resources.Designer.cs generated
View File

@@ -80,18 +80,20 @@ namespace mpvnet.Properties {
/// <summary>
/// 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 &apos;Settings&apos;. 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 &apos;Settings&apos;.
///
/// # The mpv.conf defaults of mpv.net contain: &apos;input-default-bindings = no&apos;
/// # 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 &apos;o&apos; has already a binding you can search for &apos; o &apos;.
///
/// # 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&apos;s defaults of mpv.conf contain: &apos;input-default-bindings = no&apos;
/// # which disables mpv&apos;s i [rest of string was truncated]&quot;;.
/// # The [rest of string was truncated]&quot;;.
/// </summary>
internal static string input_conf {
get {
@@ -108,9 +110,8 @@ namespace mpvnet.Properties {
///keep-open-pause = no
///osd-duration = 2000
///osd-playing-msg = &apos;${filename}&apos;
///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 = &apos;~~desktop/&apos;
///hwdec = yes
///
///[protocol.https]
///osd-playing-msg = &apos;${media-title}&apos;
@@ -132,6 +133,16 @@ namespace mpvnet.Properties {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap mpvnet_santa {
get {
object obj = ResourceManager.GetObject("mpvnet_santa", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized string similar to
///[dark]

3
mpv.net/Properties/Resources.resx
View File

@@ -127,6 +127,9 @@
<data name="mpvnet" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\mpvnet.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="mpvnet_santa" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\mpvnet-santa.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="mpv_conf" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\mpv.conf.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
</data>

2
mpv.net/Resources/mpv.conf.txt
View File

@@ -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]

BIN
mpv.net/Resources/mpvnet-santa.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 25 KiB

2
mpv.net/WPF/AboutWindow.xaml.cs
View File

@@ -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";
}

1
mpv.net/mpv.net.csproj
View File

@@ -101,6 +101,7 @@
<Link>License.txt</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<None Include="Resources\mpvnet-santa.png" />
<Content Include="Resources\theme.txt" />
<Page Include="WPF\SearchTextBoxUserControl.xaml">
<Generator>MSBuild:Compile</Generator>

11
mpv.net/mpv/Core.cs
View File

@@ -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;