aboutsummaryrefslogtreecommitdiffhomepage
path: root/DOCS
diff options
context:
space:
mode:
authorGravatar ben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-05-27 18:39:57 +0000
committerGravatar ben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-05-27 18:39:57 +0000
commitbc212e3500ef776f849a9ee6c04dfaa4994c62f6 (patch)
treedb17bd96a83006cdbc73509954b4a39066749b9f /DOCS
parentcc6c63c03c6eb5e5913c9795bfb13c5284ad24de (diff)
Add a slave command to stop stream playback.
Mostly useful when used with -idle mode. Patch by Mathieu Schroeter ( mathieu dot schroeter at gamesover dot ch ) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26909 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'DOCS')
-rw-r--r--DOCS/man/en/mplayer.12
-rw-r--r--DOCS/man/fr/mplayer.12
-rw-r--r--DOCS/tech/slave.txt3
3 files changed, 7 insertions, 0 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index f5d269b069..0853223412 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -232,6 +232,8 @@ Pressing once will pause movie, every consecutive press will play one frame
and then go into pause mode again (any other key unpauses).
.IPs "q / ESC"
Stop playing and quit.
+.IPs "U\ \ \ \ "
+Stop playing (and quit if \-idle is not used).
.IPs "+ and \-"
Adjust audio delay by +/\- 0.1 seconds.
.IPs "/ and *"
diff --git a/DOCS/man/fr/mplayer.1 b/DOCS/man/fr/mplayer.1
index d0d219b03d..7a045b35f3 100644
--- a/DOCS/man/fr/mplayer.1
+++ b/DOCS/man/fr/mplayer.1
@@ -246,6 +246,8 @@ juste une trame et remettra le film en pause (toute autre touche arrête la
pause).
.IPs "q / ESC"
Stoppe la lecture et quitte.
+.IPs "U\ \ \ \ "
+Stoppe la lecture (et quitte si \-idle n'est pas utilisé).
.IPs "+ et \-"
Ajuste le décalage audio de +/\- 0.1 secondes.
.IPs "/ et *"
diff --git a/DOCS/tech/slave.txt b/DOCS/tech/slave.txt
index 5664ef1066..080f7fa880 100644
--- a/DOCS/tech/slave.txt
+++ b/DOCS/tech/slave.txt
@@ -267,6 +267,9 @@ step_property <property> [value] [direction]
not given or zero. The direction is reversed if direction is less
than zero.
+stop
+ Stop playback.
+
sub_alignment [value]
Toggle/set subtitle alignment.
0 top alignment