mplayer: mpv overrides in separate subpage

diff --git a/mplayer.eng.inc.pl b/mplayer.eng.inc.pl
index 938c5a89ffad705346a2d2b57b0129b8c2f4131a..930fe97fd6013dc5e4bfea300222ddc4438a11c3 100644 (file)
--- a/mplayer.eng.inc.pl
+++ b/mplayer.eng.inc.pl
@@ -10,10 +10,7 @@ key => {
        '>' => "next file",
        'p' => "pause",
        '.' => "step forward",
-       ',' => "step backward<>s",
        'q' => "stop and quit",
-       'Q' => "save and quit",
-       '_' => "cycle video tr<>ack<>s",
        '+' => "audio delay +<>.1s", # +ctrl in mpv
        '-' => "audio delay -<>.1s", # +ctrl in mpv
        '/' => "volume decrease",
@@ -25,30 +22,22 @@ key => {
        'w' => "pan/sc. decr<>eas<>e",
        'e' => "pan/scan increase",
        'o' => "osd state switch",
-       'O' => "osd mode toggle",
-       'd' => "frame drop mode", # deinterlace in mpv
+       'd' => "frame drop mode",
        'v' => "subtitle visibility",
        'b' => "next sub<>title",
-       'j' => "switch sub<>title",
-       'J' => "prev<>ious 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", # mpv?
-       '^s'=> "actual screen<>shot",
+       'S' => "record screen<>shot<>s\n-vf screenshot",
        'I' => "filename",
        '!' => "chapter back", # also pgdn in mpv
        '@' => "chapter forward", # also pgup in mpv
@@ -56,8 +45,8 @@ key => {
        '2' => "contrast more",
        '3' => "brighter",
        '4' => "darker",
-       '5' => "hue to red", # gamma in mpv
-       '6' => "hue to blue", # gamma in mpv
+       '5' => "hue to red",
+       '6' => "hue to blue",
        '7' => "saturate",
        '8' => "de<>saturate",
 },
@@ -76,7 +65,6 @@ 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 => {
@@ -90,9 +78,7 @@ def => {
                '>' => 'g9',
                'p' => 'g7',
                '.' => 'g7',
-               ',' => 'g7 new',
                'q' => 'g9',
-               'Q' => 'g9 new',
                '+' => 'g6',
                '-' => 'g6',
                '/' => 'g6',
@@ -101,37 +87,27 @@ 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',

diff --git a/mplayer.plp b/mplayer.plp
index 5620792af02b449b4b5713bfeab6890df0939d04..8397498166d7fcb42ac8581d5ab97ceff344f438 100644 (file)
--- a/mplayer.plp
+++ b/mplayer.plp
@@ -1,5 +1,7 @@
 <(common.inc.plp)><:
 
+my $include = $Request eq 'mpv' ? $Request : 'mplayer';
+
 Html({
        title => 'mplayer cheat sheet',
        version => '1.1',
@@ -21,7 +23,7 @@ Html({
 
 <:
 use Shiar_Sheet::Keyboard 2;
-my $info = do 'mplayer.eng.inc.pl' or die $@;
+my $info = do $include or die $@;
 my $keys = Shiar_Sheet::Keyboard->new($info);
 $keys->map($get{map}) or undef $get{map};
 $keys->print_rows($get{rows}, [1,0]);

diff --git a/mpv.eng.inc.pl b/mpv.eng.inc.pl
new file mode 100644 (file)
index 0000000..8047141
--- /dev/null
+++ b/mpv.eng.inc.pl
@@ -0,0 +1,58 @@
+use utf8;
+
+my $legacy = do 'mplayer.eng.inc.pl' or die $@;
+
+{
+key => { %{ $legacy->{key} },
+       ',' => "step backward<>s",
+       'Q' => "save and quit",
+       '_' => "cycle video tr<>ack<>s",
+       '+' => "audio delay +<>.1s", # +ctrl in mpv
+       '-' => "audio delay -<>.1s", # +ctrl in mpv
+       'o' => "osd state switch",
+       'O' => "osd mode toggle",
+       'd' => "deint<>erlace",
+       'j' => "next sub<>title",
+       'J' => "prev<>ious sub<>title",
+       'A' => "aspect override",
+       'u' => "subtitle style",
+       'V' => "subtitle aspect",
+       'l' => "A-B loop",
+       'L' => "infinite looping",
+       'S' => "record screen<>shot<>s\n-vf screenshot", # mpv?
+       '^s'=> "actual screen<>shot",
+       '5' => "gamma decrease",
+       '6' => "gamma increase",
+},
+
+mode => $legacy->{mode},
+
+flag => { %{ $legacy->{flag} },
+       new => ["mpv"      => "Introduced in <em>mpv</em>, not supported in original MPlayer"],
+},
+
+def => {
+       '' => { %{ $legacy->{def}->{''} },
+               'b' => undef,
+               'g' => undef,
+               'y' => undef,
+               'F' => undef,
+               'a' => undef,
+               'c' => undef,
+               'n' => undef,
+               'I' => undef,
+               ',' => 'g7 new',
+               '_' => 'g4 new',
+               'Q' => 'g9 new',
+               'O' => 'g1 new',
+               'P' => '=o new',
+               'J' => 'g2 new',
+               'A' => 'g4 new',
+               'u' => 'g2 new',
+               'V' => 'g2 new',
+               'l' => 'g7 new',
+               'L' => 'g7 new',
+               '^s'=> 'g9 ext new',
+       },
+},
+}