From 60228090808ecbf90ce1d8bf3de4b097f37dbfc8 Mon Sep 17 00:00:00 2001 From: Frank Skare Date: Fri, 8 Mar 2019 22:51:34 +0100 Subject: [PATCH] - --- mpvnet/MainForm.Designer.cs | 3 +-- mpvnet/MainForm.cs | 6 ------ mpvnet/Properties/AssemblyInfo.cs | 4 ++-- mpvnet/Resources/input_conf.txt | 4 ++-- mpvnet/mpv.cs | 1 + release_mpvnet.ps1 | 6 +++--- vbnet/Menu.vb | 7 +------ 7 files changed, 10 insertions(+), 21 deletions(-) diff --git a/mpvnet/MainForm.Designer.cs b/mpvnet/MainForm.Designer.cs index 84f8a35..fc0ff2e 100644 --- a/mpvnet/MainForm.Designer.cs +++ b/mpvnet/MainForm.Designer.cs @@ -43,7 +43,7 @@ // this.AllowDrop = true; this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.BackColor = System.Drawing.Color.Black; this.ClientSize = new System.Drawing.Size(1553, 1000); this.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -52,7 +52,6 @@ this.Name = "MainForm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "mpv.net"; - this.Activated += new System.EventHandler(this.MainForm_Activated); this.Load += new System.EventHandler(this.MainForm_Load); this.ResumeLayout(false); diff --git a/mpvnet/MainForm.cs b/mpvnet/MainForm.cs index b93ac7a..df259f7 100644 --- a/mpvnet/MainForm.cs +++ b/mpvnet/MainForm.cs @@ -33,7 +33,6 @@ namespace mpvnet Instance = this; Hwnd = Handle; ChangeFullscreen((mpv.mpvConv.ContainsKey("fullscreen") && mpv.mpvConv["fullscreen"] == "yes") || (mpv.mpvConv.ContainsKey("fs") && mpv.mpvConv["fs"] == "yes")); - ToolStripManager.Renderer = new ToolStripRendererEx(ToolStripRenderModeEx.SystemDefault); CMS = new ContextMenuStripEx(components); CMS.Opened += CMS_Opened; ContextMenuStrip = CMS; @@ -303,10 +302,5 @@ namespace mpvnet mpv.VideoSizeChanged += Mpv_VideoSizeChanged; mpv.PlaybackRestart += mpv_PlaybackRestart; } - - private void MainForm_Activated(object sender, EventArgs ea) - { - - } } } \ No newline at end of file diff --git a/mpvnet/Properties/AssemblyInfo.cs b/mpvnet/Properties/AssemblyInfo.cs index 1a00c0e..7aab4a0 100644 --- a/mpvnet/Properties/AssemblyInfo.cs +++ b/mpvnet/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.2.5.0")] -[assembly: AssemblyFileVersion("0.2.5.0")] +[assembly: AssemblyVersion("0.2.6.0")] +[assembly: AssemblyFileVersion("0.2.6.0")] diff --git a/mpvnet/Resources/input_conf.txt b/mpvnet/Resources/input_conf.txt index 6a9a860..7712630 100644 --- a/mpvnet/Resources/input_conf.txt +++ b/mpvnet/Resources/input_conf.txt @@ -27,8 +27,8 @@ m cycle mute #menu: M ; Volume | Mute KP6 add audio-delay 0.100 #menu: Numpad 6 ; Audio | Delay +0.1 KP9 add audio-delay -0.100 #menu: Numpad 9 ; Audio | Delay -0.1 -Right no-osd seek 10 #menu: Right ; Seek | 7 sec forward -Left no-osd seek -10 #menu: Left ; Seek | 7 sec backward +Right no-osd seek 7 #menu: Right ; Seek | 7 sec forward +Left no-osd seek -7 #menu: Left ; Seek | 7 sec backward _ ignore #menu: _ ; Seek | - Up no-osd seek 40 #menu: Up ; Seek | 1 min forward Down no-osd seek -40 #menu: Down ; Seek | 1 min backward diff --git a/mpvnet/mpv.cs b/mpvnet/mpv.cs index d7304c5..014e5f2 100644 --- a/mpvnet/mpv.cs +++ b/mpvnet/mpv.cs @@ -66,6 +66,7 @@ namespace mpvnet SetIntProp("input-ar-rate", 20); SetIntProp("volume", 50); SetStringProp("hwdec", "yes"); + SetStringProp("vo", "direct3d"); SetStringProp("input-default-bindings", "yes"); SetStringProp("osd-playing-msg", "'${filename}'"); SetStringProp("screenshot-directory", "~~desktop/"); diff --git a/release_mpvnet.ps1 b/release_mpvnet.ps1 index b1d9b7a..c9331a0 100644 --- a/release_mpvnet.ps1 +++ b/release_mpvnet.ps1 @@ -1,8 +1,8 @@ using namespace System.Diagnostics -$exePath = "C:\Users\frank\Desktop\Projekte\mpvnet\mpvnet\bin\Debug\mpvnet.exe" +$exePath = "C:\Users\frank\C-Daten\Projekte\VS\CS\mpvnet\mpvnet\bin\Debug\mpvnet.exe" $version = [FileVersionInfo]::GetVersionInfo($exePath).FileVersion $targetDir = "C:\Users\Frank\Desktop\mpv.net-" + $version -Copy-Item C:\Users\frank\Desktop\Projekte\mpvnet\mpvnet\bin\Debug $targetDir -recurse +Copy-Item C:\Users\frank\C-Daten\Projekte\VS\CS\mpvnet\mpvnet\bin\Debug $targetDir -recurse $addonDir = $targetDir + "\Addons" remove-item $addonDir -Recurse -Include *vbnet.pdb, *mpvnet.exe, *mpvnet.exe.config, *mpvnet.pdb, *vbnet.dll -D:\Projekte\VS\VB\util\bin\util.exe -pack $targetDir \ No newline at end of file +C:\Users\frank\C-Daten\Projekte\VS\VB\util\bin\util.exe -pack $targetDir \ No newline at end of file diff --git a/vbnet/Menu.vb b/vbnet/Menu.vb index 3cf1254..f85828e 100644 --- a/vbnet/Menu.vb +++ b/vbnet/Menu.vb @@ -254,14 +254,9 @@ Namespace UI MyBase.New(container) End Sub - Protected Overrides Sub OnOpening(e As CancelEventArgs) - MyBase.OnOpening(e) - MenuHelp.SetRenderer(Me) - End Sub - Protected Overrides Sub OnHandleCreated(e As EventArgs) MyBase.OnHandleCreated(e) - Font = New Font("Segoe UI", 9) + MenuHelp.SetRenderer(Me) End Sub