# HG changeset patch # User gabucino # Date 1019304350 0 # Node ID 0b5c0fa7bea073574c26cf913529db30da786584 # Parent b019307da656d9748f516e1797deb6d1cc3ca1cd applied Holm's patch diff -r b019307da656 -r 0b5c0fa7bea0 DOCS/mplayer.1 --- a/DOCS/mplayer.1 Sat Apr 20 12:00:38 2002 +0000 +++ b/DOCS/mplayer.1 Sat Apr 20 12:05:50 2002 +0000 @@ -155,10 +155,6 @@ .B \-cdrom\-device\ Override default CDROM drive name /dev/cdrom .TP -.B \-conf\ -Get input bindings from an alternative input.conf file (default: -~/.mplayer/input.conf). -.TP .B \-dr Turns on direct rendering (not supported by all codecs and video outputs) (default is off). @@ -370,9 +366,6 @@ Currently this option is only honoured for AC3 audio. .TP -.B \-config -Specifies where to search for config file -.TP .B \-contrast <\-1000\ \-\ 1000> Adjust contrast of video output (default 0). Works in similar manner as brightness. .TP @@ -484,6 +477,9 @@ bound to cmdlist prints all commands that can be bound + js-dev specifies the joystick device + to use + (default is /dev/input/js0) .I NOTE: Autorepeat is currently only supported by joysticks. @@ -810,7 +806,9 @@ .SH "SLAVE MODE PROTOCOL" If the \-slave switch is given, playback is controlled by a -line\-based protocol with the following tokens: +line\-based protocol. If the new input is enabled (default) +each line must contain one command otherwise one of the +following tokens: .TP stop pause playback .br