mplayer: include distinct mpv additions

diff --git a/mplayer.eng.inc.pl b/mplayer.eng.inc.pl
index 1c2e170998a4ccac398c29a85044e76e85f82cec..938c5a89ffad705346a2d2b57b0129b8c2f4131a 100644 (file)
--- a/mplayer.eng.inc.pl
+++ b/mplayer.eng.inc.pl
@@ -10,9 +10,12 @@ key => {
        '>' => "next file",
        'p' => "pause",
        '.' => "step forward",
+       ',' => "step backward<>s",
        'q' => "stop and quit",
-       '+' => "audio delay +<>.1s",
-       '-' => "audio delay -<>.1s",
+       'Q' => "save and quit",
+       '_' => "cycle video tr<>ack<>s",
+       '+' => "audio delay +<>.1s", # +ctrl in mpv
+       '-' => "audio delay -<>.1s", # +ctrl in mpv
        '/' => "volume decrease",
        '*' => "volume increase",
        'm' => "mute sound",
@@ -22,31 +25,39 @@ key => {
        'w' => "pan/sc. decr<>eas<>e",
        'e' => "pan/scan increase",
        'o' => "osd state switch",
-       'd' => "frame drop mode",
+       'O' => "osd mode toggle",
+       'd' => "frame drop mode", # deinterlace in mpv
        'v' => "subtitle visibility",
        'b' => "next sub<>title",
-       'j' => "prev<>ious sub<>title",
+       'j' => "switch sub<>title",
+       'J' => "prev<>ious sub<>title",
        'g' => "back in sub<>title<>s list",
        'y' => "forward in sub<>title<>s list",
        'F' => "forced subtitles",
        'a' => "align subtitles",
+       'A' => "aspect override",
        'c' => "cycle fs mode",
        'n' => "restore video mode",
        'x' => "subtitle delay +<>.1<>s",
        'z' => "subtitle delay -<>.1<>s",
        'r' => "subtitles up",
        't' => "subtitles down",
+       'u' => "subtitle style",
+       'V' => "subtitle aspect",
+       'l' => "A-B loop",
+       'L' => "infinite looping",
        's' => "screen<>shot\n-vf screenshot",
-       'S' => "record screen<>shot<>s\n-vf screenshot",
+       'S' => "record screen<>shot<>s\n-vf screenshot", # mpv?
+       '^s'=> "actual screen<>shot",
        'I' => "filename",
-       '!' => "chapter back",
-       '@' => "chapter forward",
+       '!' => "chapter back", # also pgdn in mpv
+       '@' => "chapter forward", # also pgup in mpv
        '1' => "contrast less",
        '2' => "contrast more",
        '3' => "brighter",
        '4' => "darker",
-       '5' => "hue to red",
-       '6' => "hue to blue",
+       '5' => "hue to red", # gamma in mpv
+       '6' => "hue to blue", # gamma in mpv
        '7' => "saturate",
        '8' => "de<>saturate",
 },
@@ -65,6 +76,7 @@ flag => {
 
        arg => ["key<arg>" => "Commands with a dot need an argument afterwards."],
        ext => ["optional" => "Some features depend on setup and/or parameters."],
+       new => ["mpv"      => "Changed in <em>mpv</em>, not supported in MPlayer"],
 },
 
 def => {
@@ -78,7 +90,9 @@ def => {
                '>' => 'g9',
                'p' => 'g7',
                '.' => 'g7',
+               ',' => 'g7 new',
                'q' => 'g9',
+               'Q' => 'g9 new',
                '+' => 'g6',
                '-' => 'g6',
                '/' => 'g6',
@@ -87,27 +101,37 @@ def => {
                '0' => '=*',
                'm' => 'g6',
                '#' => 'g6',
+               '_' => 'g4 new',
                'f' => 'g4',
                'T' => 'g4',
                'w' => 'g4',
                'e' => 'g4',
                'o' => 'g1',
+               'O' => 'g1 new',
+               'P' => '=o new',
                'd' => 'g4',
                'v' => 'g2',
                'b' => 'g2',
                'j' => 'g2',
+               'J' => 'g2 new',
                'y' => 'g2',
                'g' => 'g2',
                'F' => 'g2',
                'a' => 'g2',
+               'A' => 'g4 new',
                'c' => 'g4 ext',
                'n' => 'g4 ext',
                'x' => 'g2',
                'z' => 'g2',
                'r' => 'g2',
                't' => 'g2',
+               'u' => 'g2 new',
+               'V' => 'g2 new',
+               'l' => 'g7 new',
+               'L' => 'g7 new',
                's' => 'g9 ext',
                'S' => 'g9 ext',
+               '^s'=> 'g9 ext new',
                'I' => 'g1',
                '!' => 'g7',
                '@' => 'g7',