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

1.0.0.0

Browse Source
This commit is contained in:
Frank Skare
2019-03-11 21:10:14 +01:00
parent 7e1c30ffa0
commit d91bba6521
7 changed files with 175 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mpv.net/MainForm.cs
View File

@@ -134,7 +134,7 @@ namespace mpvnet
public bool IsFullscreen public bool IsFullscreen
{ {
get { return WindowState == FormWindowState.Maximized; } get => WindowState == FormWindowState.Maximized;
} }
void MpvChangeFullscreen(bool value) void MpvChangeFullscreen(bool value)

72
mpv.net/Menu.cs
View File

@@ -78,7 +78,7 @@ public class ActionMenuItem : MenuItemEx
public static ActionMenuItem Add(ToolStripItemCollection items, string path, Action action) public static ActionMenuItem Add(ToolStripItemCollection items, string path, Action action)
{ {
var a = path.Split(new[] { " > " }, StringSplitOptions.RemoveEmptyEntries); var a = path.Split(new[] { " > ", " | " }, StringSplitOptions.RemoveEmptyEntries);
var l = items; var l = items;
for (var x = 0; x <= a.Length - 1; x++) for (var x = 0; x <= a.Length - 1; x++)
@@ -381,37 +381,25 @@ public struct HSLColor
Luminosity = l; Luminosity = l;
} }
private double HueValue; private double hue;
public int Hue { public int Hue {
get { get => System.Convert.ToInt32(hue * 240);
return System.Convert.ToInt32(HueValue * 240); set => hue = CheckRange(value / 240.0);
}
set {
HueValue = CheckRange(value / 240.0);
}
} }
private double SaturationValue; private double saturation;
public int Saturation { public int Saturation {
get { get => System.Convert.ToInt32(saturation * 240);
return System.Convert.ToInt32(SaturationValue * 240); set => saturation = CheckRange(value / 240.0);
}
set {
SaturationValue = CheckRange(value / (double)240);
}
} }
private double LuminosityValue; private double luminosity;
public int Luminosity { public int Luminosity {
get { get => System.Convert.ToInt32(luminosity * 240);
return System.Convert.ToInt32(LuminosityValue * 240); set => luminosity = CheckRange(value / 240.0);
}
set {
LuminosityValue = CheckRange(value / (double)240);
}
} }
private double CheckRange(double value) private double CheckRange(double value)
@@ -426,13 +414,13 @@ public struct HSLColor
public Color ToColorAddLuminosity(int luminosity) public Color ToColorAddLuminosity(int luminosity)
{ {
this.Luminosity += luminosity; Luminosity += luminosity;
return ToColor(); return ToColor();
} }
public Color ToColorSetLuminosity(int luminosity) public Color ToColorSetLuminosity(int luminosity)
{ {
this.Luminosity = luminosity; Luminosity = luminosity;
return ToColor(); return ToColor();
} }
@@ -440,22 +428,22 @@ public struct HSLColor
{ {
double r = 0, g = 0, b = 0; double r = 0, g = 0, b = 0;
if (LuminosityValue != 0) if (luminosity != 0)
{ {
if (SaturationValue == 0) if (saturation == 0)
{ {
b = LuminosityValue; b = luminosity;
g = LuminosityValue; g = luminosity;
r = LuminosityValue; r = luminosity;
} }
else else
{ {
var temp2 = GetTemp2(this); var temp2 = GetTemp2(this);
var temp1 = 2.0 * LuminosityValue - temp2; var temp1 = 2.0 * luminosity - temp2;
r = GetColorComponent(temp1, temp2, HueValue + 1.0 / 3.0); r = GetColorComponent(temp1, temp2, hue + 1.0 / 3.0);
g = GetColorComponent(temp1, temp2, HueValue); g = GetColorComponent(temp1, temp2, hue);
b = GetColorComponent(temp1, temp2, HueValue - 1.0 / 3.0); b = GetColorComponent(temp1, temp2, hue - 1.0 / 3.0);
} }
} }
@@ -493,10 +481,10 @@ public struct HSLColor
{ {
double temp2; double temp2;
if (hslColor.LuminosityValue < 0.5) if (hslColor.luminosity < 0.5)
temp2 = hslColor.LuminosityValue * (1.0 + hslColor.SaturationValue); temp2 = hslColor.luminosity * (1.0 + hslColor.saturation);
else else
temp2 = hslColor.LuminosityValue + hslColor.SaturationValue - (hslColor.LuminosityValue * hslColor.SaturationValue); temp2 = hslColor.luminosity + hslColor.saturation - (hslColor.luminosity * hslColor.saturation);
return temp2; return temp2;
} }
@@ -504,17 +492,17 @@ public struct HSLColor
public static HSLColor Convert(Color c) public static HSLColor Convert(Color c)
{ {
HSLColor r = new HSLColor(); HSLColor r = new HSLColor();
r.HueValue = c.GetHue() / 360.0; r.hue = c.GetHue() / 360.0;
r.LuminosityValue = c.GetBrightness(); r.luminosity = c.GetBrightness();
r.SaturationValue = c.GetSaturation(); r.saturation = c.GetSaturation();
return r; return r;
} }
public void SetRGB(int red, int green, int blue) public void SetRGB(int red, int green, int blue)
{ {
var hc = HSLColor.Convert(Color.FromArgb(red, green, blue)); var hc = HSLColor.Convert(Color.FromArgb(red, green, blue));
HueValue = hc.HueValue; hue = hc.hue;
SaturationValue = hc.SaturationValue; saturation = hc.saturation;
LuminosityValue = hc.LuminosityValue; luminosity = hc.luminosity;
} }
} }

6
mpv.net/Native.cs
View File

@@ -61,17 +61,17 @@ namespace mpvnet
public Size Size public Size Size
{ {
get { return new Size(Right - Left, Bottom - Top); } get => new Size(Right - Left, Bottom - Top);
} }
public int Width public int Width
{ {
get { return Right - Left; } get => Right - Left;
} }
public int Height public int Height
{ {
get { return Bottom - Top; } get => Bottom - Top;
} }
} }
} }

4
mpv.net/Properties/AssemblyInfo.cs
View File

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.2.6.0")] [assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("0.2.6.0")] [assembly: AssemblyFileVersion("1.0.0.0")]

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

@@ -61,19 +61,6 @@ namespace mpvnet.Properties {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to
///#key command key caption menu path/caption
///
///o script-message mpv.net open-files #menu: O; Open Files
///
///Space cycle pause #menu: Space ; Play/Pause
///s stop #menu: S ; Stop
///
///F11 playlist-prev #menu: F11 ; Navigate | Previous
///F12 playlist-next #menu: F12 ; Navigate | Next
///
///Ctrl++ add video-zoom 0.1 #menu: Ctrl++ ; Pan &amp;&amp; Scan | Increase Size
///Ctrl+- add video-zoom -0.1 #menu: Ct [rest of string was truncated]&quot;;.
/// </summary> /// </summary>
internal static string input_conf { internal static string input_conf {
get { get {

121
mpv.net/Resources/input_conf.txt
View File

@@ -35,17 +35,46 @@ _ ignore #menu: _ ; Pan && Scan > -
Shift+Up add video-pan-y -0.01 #menu: Shift+Up ; Pan && Scan > Move Up Shift+Up add video-pan-y -0.01 #menu: Shift+Up ; Pan && Scan > Move Up
Shift+Down add video-pan-y 0.01 #menu: Shift+Down ; Pan && Scan > Move Down Shift+Down add video-pan-y 0.01 #menu: Shift+Down ; Pan && Scan > Move Down
_ ignore #menu: _ ; Pan && Scan > - _ ignore #menu: _ ; Pan && Scan > -
w add panscan -0.1 #menu: W ; Pan && Scan > Decrease Height
W add panscan +0.1 #menu: Shift+W ; Pan && Scan > Increase Height
_ ignore #menu: _ ; Pan && Scan > -
Shift+BS set video-zoom 0 ; set video-pan-x 0 ; set video-pan-y 0 #menu: Alt+Backspace ; Pan && Scan > Reset Shift+BS set video-zoom 0 ; set video-pan-x 0 ; set video-pan-y 0 #menu: Alt+Backspace ; Pan && Scan > Reset
Ctrl+1 add contrast -1 #menu: Ctrl+1 ; Video > Decrease Contrast
Ctrl+2 add contrast 1 #menu: Ctrl+2 ; Video > Increase Contrast
_ ignore #menu: _ ; Video > -
Ctrl+3 add brightness -1 #menu: Ctrl+3 ; Video > Decrease Brightness
Ctrl+4 add brightness 1 #menu: Ctrl+4 ; Video > Increase Brightness
_ ignore #menu: _ ; Video > -
Ctrl+5 add gamma -1 #menu: Ctrl+5 ; Video > Decrease Gamma
Ctrl+6 add gamma 1 #menu: Ctrl+6 ; Video > Increase Gamma
_ ignore #menu: _ ; Video > -
Ctrl+7 add saturation -1 #menu: Ctrl+7 ; Video > Decrease Saturation
Ctrl+8 add saturation 1 #menu: Ctrl+8 ; Video > Increase Saturation
_ ignore #menu: _ ; Video > -
Ctrl+S async screenshot #menu: Ctrl+S ; Video > Take Screenshot
Ctrl+Shift+S screenshot each-frame #menu: Ctrl+Shift+S ; Video > Take Screenshots All Frames
_ ignore #menu: _ ; Video > -
d cycle deinterlace #menu: D ; Video > Toggle Deinterlace
a cycle-values video-aspect "16:9" "4:3" "2.35:1" "-1" #menu: A ; Video > Cycle Aspect Ratio
KP7 cycle audio #menu: Keypad 7 ; Audio > Cycle/Next KP7 cycle audio #menu: Keypad 7 ; Audio > Cycle/Next
_ ignore #menu: _ ; Audio > - _ ignore #menu: _ ; Audio > -
KP6 add audio-delay 0.100 #menu: Keypad 6 ; Audio > Delay +0.1 KP6 add audio-delay 0.100 #menu: Keypad 6 ; Audio > Delay +0.1
KP9 add audio-delay -0.100 #menu: Keypad 9 ; Audio > Delay -0.1 KP9 add audio-delay -0.100 #menu: Keypad 9 ; Audio > Delay -0.1
KP8 cycle sub #menu: Keypad 8 ; Subtitle > Cycle/Next KP8 cycle sub #menu: Keypad 8 ; Subtitle > Cycle/Next
v cycle sub-visibility #menu: V ; Subtitle > Toggle Visibility
_ ignore #menu: _ ; Subtitle > - _ ignore #menu: _ ; Subtitle > -
z add sub-delay -0.1 #menu: Z ; Subtitle > Delay -0.1 z add sub-delay -0.1 #menu: Z ; Subtitle > Delay -0.1
Z add sub-delay +0.1 #menu: Shift+Z ; Subtitle > Delay +0.1 Z add sub-delay +0.1 #menu: Shift+Z ; Subtitle > Delay +0.1
_ ignore #menu: _ ; Subtitle > -
r add sub-pos -1 #menu: R ; Subtitle > Move Up
R add sub-pos +1 #menu: Shift+R ; Subtitle > Move Down
_ ignore #menu: _ ; Subtitle > -
_ add sub-scale -0.1 #menu: _ ; Subtitle > Decrease Subtitle Font Size
_ add sub-scale +0.1 #menu: _ ; Subtitle > Increase Subtitle Font Size
_ ignore #menu: _ ; Subtitle > -
+ add volume 10 #menu: + ; Volume > Up + add volume 10 #menu: + ; Volume > Up
- add volume -10 #menu: - ; Volume > Down - add volume -10 #menu: - ; Volume > Down
@@ -75,12 +104,18 @@ p script-message mpv.net show-prefs #menu: P ; Settings > Show Prefer
k script-message mpv.net show-keys #menu: K ; Settings > Show Keys k script-message mpv.net show-keys #menu: K ; Settings > Show Keys
c script-message mpv.net open-config-folder #menu: C ; Settings > Open Config Folder c script-message mpv.net open-config-folder #menu: C ; Settings > Open Config Folder
i show-progress ; script-message mpv.net show-info #menu: I ; Tools > Info i show-progress ; script-message mpv.net show-info #menu: I ; Tools | Info
t script-binding stats/display-stats #menu: T ; Tools > Show Statistics t script-binding stats/display-stats #menu: T ; Tools > Show Statistics
T script-binding stats/display-stats-toggle #menu: Shift+T ; Tools > Toggle Statistics T script-binding stats/display-stats-toggle #menu: Shift+T ; Tools > Toggle Statistics
_ ignore #menu: _ ; Tools > - _ ignore #menu: _ ; Tools > -
h script-message mpv.net history #menu: H ; Tools > Show History h script-message mpv.net history #menu: H ; Tools > Show History
l ab-loop #menu: L ; Tools > Set/clear A-B loop points l ab-loop #menu: L ; Tools > Set/clear A-B loop points
L cycle-values loop-file "inf" "no" #menu: Shift+L ; Tools > Toggle Infinite Looping
DEL script-binding osc/visibility #menu: Delete ; Tools > Toggle OSC Visibility
Ctrl+H cycle-values hwdec "auto" "no" #menu: Ctrl+H ; Tools > Cycle Hardware Decoding
F8 show_text ${playlist} #menu: F8 ; Tools > Show Playlist
F9 show_text ${track-list} #menu: F9 ; Tools > Show Audio/Video/Subtitle List
_ script-message mpv.net shell-execute https://mpv.io/manual/stable/ #menu: _ ; Tools > Web > Show mpv manual _ script-message mpv.net shell-execute https://mpv.io/manual/stable/ #menu: _ ; Tools > Web > Show mpv manual
_ script-message mpv.net shell-execute https://github.com/mpv-player/mpv/blob/master/etc/input.conf #menu: _ ; Tools > Web > Show mpv default keys _ script-message mpv.net shell-execute https://github.com/mpv-player/mpv/blob/master/etc/input.conf #menu: _ ; Tools > Web > Show mpv default keys
_ script-message mpv.net shell-execute https://github.com/stax76/mpvnet #menu: _ ; Tools > Web > Show mpv.net web site _ script-message mpv.net shell-execute https://github.com/stax76/mpvnet #menu: _ ; Tools > Web > Show mpv.net web site
@@ -88,74 +123,18 @@ _ ignore #menu: _ ; -
Esc quit #menu: Escape ; Exit Esc quit #menu: Escape ; Exit
Q quit-watch-later #menu: Shift+Q ; Exit Watch Later Q quit-watch-later #menu: Shift+Q ; Exit Watch Later
# Adjust timing to previous/next subtitle > playlist-next
Ctrl+Shift+LEFT sub-step -1 < playlist-prev
Ctrl+Shift+RIGHT sub-step 1
> playlist-next # skip to next file POWER quit
< playlist-prev # skip to previous file PLAY cycle pause
PAUSE cycle pause
O no-osd cycle-values osd-level 3 1 # cycle through OSD mode PLAYPAUSE cycle pause
STOP quit
#1 add contrast -1 FORWARD seek 60
#2 add contrast 1 REWIND seek -60
#3 add brightness -1 VOLUME_UP add volume 2
#4 add brightness 1 VOLUME_DOWN add volume -2
#5 add gamma -1 MUTE cycle mute
#6 add gamma 1 CLOSE_WIN quit
#7 add saturation -1 CLOSE_WIN {encode} quit 4
#8 add saturation 1
# toggle deinterlacer (automatically inserts or removes required filter)
#d cycle deinterlace
#r add sub-pos -1 # move subtitles up
#R add sub-pos +1 # down
#t add sub-pos +1 # same as previous binding (discouraged)
#v cycle sub-visibility
# stretch SSA/ASS subtitles with anamorphic videos to match historical
#V cycle sub-ass-vsfilter-aspect-compat
# switch between applying no style overrides to SSA/ASS subtitles, and
# overriding them almost completely with the normal subtitle style
#u cycle-values sub-ass-override "force" "no"
#j cycle sub # cycle through subtitles
#J cycle sub down # ...backwards
#SHARP cycle audio # switch audio streams
#_ cycle video
#T cycle ontop # toggle video window ontop of other windows
#s async screenshot # take a screenshot
#S async screenshot video # ...without subtitles
#Ctrl+s async screenshot window # ...with subtitles and OSD, and scaled
#Alt+s screenshot each-frame # automatically screenshot every frame
#w add panscan -0.1 # zoom out with -panscan 0 -fs
#W add panscan +0.1 # in
#e add panscan +0.1 # same as previous binding (discouraged)
# cycle video aspect ratios; "-1" is the container aspect
#A cycle-values video-aspect "16:9" "4:3" "2.35:1" "-1"
#POWER quit
#PLAY cycle pause
#PAUSE cycle pause
#PLAYPAUSE cycle pause
#STOP quit
#FORWARD seek 60
#REWIND seek -60
#NEXT playlist-next
#PREV playlist-prev
#VOLUME_UP add volume 2
#VOLUME_DOWN add volume -2
#MUTE cycle mute
#CLOSE_WIN quit
#CLOSE_WIN {encode} quit 4
#E cycle edition # next edition
#L cycle-values loop-file "inf" "no" # toggle infinite looping
#ctrl+c quit 4
#DEL script-binding osc/visibility # cycle OSC display
#ctrl+h cycle-values hwdec "auto" "no" # cycle hardware decoding
#F8 show_text ${playlist} # show playlist
#F9 show_text ${track-list} # show list of audio/sub streams
# ? add sub-scale +0.1 # increase subtitle font size
# ? add sub-scale -0.1 # decrease subtitle font size
# ? cycle angle # switch DVD/Bluray angle
# ? cycle sub-forced-only # toggle DVD forced subs
# ? cycle program # cycle transport stream programs
# ? stop # stop playback (quit or enter idle mode)

2
release.ps1
View File

@@ -6,7 +6,7 @@ $targetDir = $desktopDir + "\mpv.net-" + $version
if (Test-Path $targetDir) { rd $targetDir -recurse } if (Test-Path $targetDir) { rd $targetDir -recurse }
Copy-Item $scriptDir\mpv.net\bin\Debug $targetDir -recurse Copy-Item $scriptDir\mpv.net\bin\Debug $targetDir -recurse
$addonDir = $targetDir + "\Addons" $addonDir = $targetDir + "\Addons"
remove-item $addonDir -Recurse -Include *mpvnet.exe, *mpvnet.exe.config, *mpvnet.pdb Remove-Item $addonDir -Recurse -Include *mpvnet.exe, *mpvnet.exe.config, *mpvnet.pdb
$7zPath = "C:\Program Files\7-Zip\7z.exe" $7zPath = "C:\Program Files\7-Zip\7z.exe"
$args = "a -t7z -mx9 $targetDir.7z -r $targetDir\*" $args = "a -t7z -mx9 $targetDir.7z -r $targetDir\*"
Start-Process -FilePath $7zPath -ArgumentList $args Start-Process -FilePath $7zPath -ArgumentList $args