Permalink
Browse files

help - keyboard shortcuts finished

  • Loading branch information...
1 parent d1b252e commit 71dd6538c2cbbc7bc4796179e3ea906a367abb9f @Bilalh Bilalh committed with Bilalh Dec 9, 2011
Showing with 33 additions and 13 deletions.
  1. +2 −2 AUTHORS
  2. +15 −5 resources/en.lproj/MPlayer OSX Help/keyboard.html
  3. +16 −6 resources/en.lproj/MPlayer OSX Help/keyboard.txt
View
@@ -38,5 +38,5 @@ Micah Gideon Modell
Adrian Stutz <adrian@sttz.ch>
* Developer (preferences redesign)
-Bilal Hussain <bhterra@gmail.com>
- * Icons for movie, audio and filetypes.
+Bilal Syed Hussain <bhterra@gmail.com>
+ * Icons for movie, audio and filetypes and help.
@@ -1,5 +1,6 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
+<!-- Created from keyboard.txt -->
<head>
<meta http-equiv="content-type" content="text/html;charset=utf-8">
@@ -20,7 +21,7 @@
<table class="dots" width="100%" border="0" cellspacing="0" cellpadding="5" summary="Two column table with heading">
<tr> <td class="blue" colspan="2"> <h5><b>Common </b></h5> </td> </tr>
<tr> <td> p / SPACE </td> <td> Pause (pressing again unpauses). </td> </tr>
- <tr> <td> q / ESC </td> <td> Stop playing and quit. </td> </tr>
+ <tr> <td> q / ESC </td> <td> Stop playing. </td> </tr>
<tr> <td> f </td> <td> Toggle fullscreen </td> </tr>
<tr> <td> # </td> <td> Cycle through the available audio tracks. </td> </tr>
<tr> <td> T </td> <td> Toggle stay-on-top </td> </tr>
@@ -29,7 +30,6 @@
<tr> <td> ← and → </td> <td> Seek backward/forward 10 seconds. </td> </tr>
<tr> <td> ↓ and ↑ </td> <td> Seek backward/forward 1 minute. </td> </tr>
<tr> <td> Pagedown and Pageup </td> <td> Seek backward/forward 10 minutes. </td> </tr>
- <tr> <td> . </td> <td> Step forward. Pressing once will pause movie, every consecutive press will play one frame and then go into pause mode again (any other key unpauses). </td> </tr>
<tr> <td> ! and @ </td> <td> Seek to the beginning of the previous/next chapter. </td> </tr>
<tr> <td class="blue" colspan="2"> <h5><b>Volume</b></h5> </td> </tr>
@@ -39,21 +39,31 @@
<tr> <td class="blue" colspan="2"> <h5><b>Subtitles</b></h5> </td> </tr>
<tr> <td> j </td> <td> Cycle through the available subtitles. </td> </tr>
+ <tr> <td> J </td> <td> Cycle through the available subtitles backwards. </td> </tr>
<tr> <td> y and g </td> <td> Step forward/backward in the subtitle list. </td> </tr>
+ <tr> <td> x and z </td> <td> Adjust subtitle delay by +/- 0.1 seconds. </td> </tr>
+ <tr> <td> <tr> <td class="blue" colspan="2"> <h5><b>Playlists</b></h5> </td> </tr> </td> <td> </td> </tr>
+ <tr> <td> &lt; and &gt; </td> <td> Go backward/forward in the playlist. </td> </tr>
+ <tr> <td> ENTER </td> <td> Go forward in the playlist. </td> </tr>
+ <tr> <td> HOME and END </td> <td> next/previous playtree entry in the parent list. </td> </tr>
+
<tr> <td class="blue" colspan="2"> <h5><b>Information</b></h5> </td> </tr>
<tr> <td> I </td> <td> Show filename on the OSD. </td> </tr>
<tr> <td> P </td> <td> Show current time/total time </td> </tr>
<tr> <td> o </td> <td> Toggle OSD states: none / seek / seek + timer / seek + timer + total time. </td> </tr>
+ <tr> <td> ⇥ (Tab) </td> <td> Cycle timestamp display modes </td> </tr>
- <tr> <td class="blue" colspan="2"> <h5><b>Playback Speed</b></h5> </td> </tr>
+ <tr> <td class="blue" colspan="2"> <h5><b>Delay/Frame Dropping </b></h5> </td> </tr>
+ <tr> <td> + and - </td> <td> Adjust audio delay by +/- 0.1 seconds. </td> </tr>
<tr> <td> d </td> <td> Toggle frame dropping states: none / skip display / skip decoding. </td> </tr>
- <tr> <td> + and - </td> <td> Adjust audio delay by +/- 0.1 seconds. </td> </tr>
+
+ <tr> <td class="blue" colspan="2"> <h5><b>Playback Speed</b></h5> </td> </tr>
<tr> <td> [ and ] </td> <td> Decrease/increase current playback speed by 10%. </td> </tr>
<tr> <td> { and } </td> <td> Halve/double current playback speed. </td> </tr>
<tr> <td> backspace </td> <td> Reset playback speed to normal </td> </tr>
- <tr> <td class="blue" colspan="2"> <h5><b>Video Output</b></h5> </td> </tr>
+ <tr> <td class="blue" colspan="2"> <h5><b>Video Equaliser</b></h5> </td> </tr>
<tr> <td> 1 and 2 </td> <td> Adjust contrast. </td> </tr>
<tr> <td> 3 and 4 </td> <td> Adjust brightness. </td> </tr>
<tr> <td> 5 and 6 </td> <td> Adjust hue. </td> </tr>
@@ -3,19 +3,19 @@
# <tr> <td> $1 </td> <td> $2 </td> </tr>
# replacement regex to make titles
-# ^([A-Z][\w ]+)
+# ^([A-Z][\w /]+)
# <tr> <td class="blue" colspan="2"> <h5><b>$1</b></h5> </td> </tr>
Common
p / SPACE Pause (pressing again unpauses).
-q / ESC Stop playing and quit.
+q / ESC Stop playing.
f Toggle fullscreen
# Cycle through the available audio tracks.
T Toggle stay-on-top
Navigation
← and → Seek backward/forward 10 seconds.
-↓ and ↑ Seek backward/forward 1 minute.
+↓ and ↑ Seek backward/forward 1 minute.
Pagedown and Pageup Seek backward/forward 10 minutes.
. Step forward. Pressing once will pause movie, every consecutive press will play one frame and then go into pause mode again (any other key unpauses).
! and @ Seek to the beginning of the previous/next chapter.
@@ -27,21 +27,31 @@ m Mute sound.
Subtitles
j Cycle through the available subtitles.
+J Cycle through the available subtitles backwards.
y and g Step forward/backward in the subtitle list.
+x and z Adjust subtitle delay by +/- 0.1 seconds.
+
+Playlists
+< and > Go backward/forward in the playlist.
+ENTER Go forward in the playlist.
+HOME and END next/previous playtree entry in the parent list.
Information
I Show filename on the OSD.
P Show current time/total time
o Toggle OSD states: none / seek / seek + timer / seek + timer + total time.
+⇥ (Tab) Cycle timestamp display modes
-Playback Speed
+Delay / Frame Dropping
++ and - Adjust audio delay by +/- 0.1 seconds.
d Toggle frame dropping states: none / skip display / skip decoding.
-+ and - Adjust audio delay by +/- 0.1 seconds.
+
+Playback Speed
[ and ] Decrease/increase current playback speed by 10%.
{ and } Halve/double current playback speed.
backspace Reset playback speed to normal
-Video Output
+Video Equaliser
1 and 2 Adjust contrast.
3 and 4 Adjust brightness.
5 and 6 Adjust hue.

0 comments on commit 71dd653

Please sign in to comment.