# HG changeset patch # User diego # Date 1035001370 0 # Node ID a1465b7f32218640620c3dba5a4bf23edba70c89 # Parent 2c7d87662ea52c97c6ba852d5bb6f0e8f395a894 Keyboard controls and options are described in the man page, removed the redundant description here, plus small fixes. diff -r 2c7d87662ea5 -r a1465b7f3221 DOCS/documentation.html --- a/DOCS/documentation.html Sat Oct 19 03:53:06 2002 +0000 +++ b/DOCS/documentation.html Sat Oct 19 04:22:50 2002 +0000 @@ -197,9 +197,7 @@
  • 2.5 TV input
    • @@ -209,15 +207,14 @@
  • 3.1 Command line
  • 3.2 Control
  • 3.3 Streaming from network or pipes
    • @@ -693,7 +690,7 @@ mkdir ~/.mplayer cd ~/.mplayer unzip mp-arial-iso-8859-1.zip - ln -s ~/.mplayer/arial-24 font + ln -s ~/.mplayer/iso-8859-1/arial-24 font @@ -936,7 +933,8 @@

    2.5 TV input

    This section is about how to enable watching/grabbing from V4L compatible -TV tuner.

    +TV tuner. See the man page for a description of TV options and keyboard +controls.

    THIS CODE IS CURRENTLY NOT BEING WORKED ON! Do not expect it to work without tweaking/experimenting!

    @@ -962,65 +960,7 @@ -

    2.5.2 Available options

    - -
    -
    on
    -
    Use TV input.
    - -
    noaudio
    -
    No sound, thanks.
    - -
    driver
    -
    dummy - NULL TV input :) Used for testing only, generates dummy - input.
    - v4l - Captures images from standard V4L interface (default - /dev/video0).
    - -
    device
    -
    Specify a device other than the default /dev/video0.
    - -
    input
    -
    Specify from which input of the TV tuner you wish to grab - (e.g. television, s-video, composite, ...)
    - Prints the available ones during init.
    - -
    freq
    -
    Specify the frequency to set the tuner to (e.g. 511.250).
    - -
    outfmt
    -
    Specify the output format the tuner should use to transport images to us - (rgb32, rgb24, yv12, uyvy, i420 (for i420 - you have to pass the -vc rawi420 option, because of a fourcc - conflict)).
    - -
    width
    -
    width of the output window in pixels
    - -
    height
    -
    height of the output window in pixels
    - -
    norm
    -
    available: PAL, SECAM, NTSC
    - -
    channel
    -
    Set the tuner to the given channel.
    - -
    chanlist
    -
    available: us-bcast, us-cable, europe-west, europe-east, etc
    -
    - - -

    2.5.3 Keyboard control

    - - - - - -
      h / k  select previous/next channel
    nchange norm
    bchange channel list
    - - -

    2.5.4 Examples

    +

    2.5.2 Examples

    Dummy output, to AAlib :)
        mplayer -tv on:driver=dummy:width=640:height=480 -vo aa
    @@ -1075,67 +1015,11 @@

    MPlayer has a fully configurable, command driven, control layer which lets you control MPlayer with keyboard, mouse, joystick or remote - control (using LIRC).

    + control (using LIRC). See the man page for the complete list of keyboard + controls.

    -

    3.2.1 Default controls

    - -

    Keyboard controls from terminal:

    - - - - - - - - - - - - - - - - - - - - - - - - - - -
      <- or ->  seek backward/forward 10 seconds
    up or downseek backward/forward 1 minute
    pgup/pgdownseek backward/forward 10 minutes
    < or >seek backward/forward in playlist
    p or SPACEpause movie (press any key)
    q or ESCstop playing and quit program
    + or -adjust audio delay by +/- 0.1 second
    / or *decrease/increase volume
    9 or 0decrease/increase volume
    mmute sound
    ftoggle fullscreen
    w or edecrease/increase panscan range
    otoggle OSD: none / seek / seek+timer
    dtoggle frame dropping
    vtoggle subtitle visibility
    z or xadjust subtitle delay by +/- 0.1 second
    r or tadjust subtitle position
    HOME or ENDgo to next/previous playtree entry in the parent list
    INSERT or DELETEgo to next/previous alternative source (only available in asx playlist)

    (the following keys are valid only when using -vo xv or -vo [vesa|fbdev]:vidix or -vo xvidix -vo (x)mga or -vc divxds (slow).)

    1 or 2adjust contrast
    3 or 4adjust brightness
    5 or 6adjust hue
    7 or 8adjust saturation
    - -

    GUI keyboard controls:

    - - - - - - - - - - - - - - -
      , and .  previous / next file
    gray - or +decrease / increase volume
    enterstart playing
    spacepause
    sstop
    aabout
    lload file
    bskin browser
    etoggle equalizer
    ptoggle playlist
    ftoggle fullscreen
    mtoggle mute
    - -

    Keyboard controls for TV input:

    - - - - - -
      h or l  select previous/next channel
    nchange norm
    bchange channel list
    - - -

    3.2.2 Controls configuration

    +

    3.2.1 Controls configuration

    MPlayer allows you bind any key/button to any MPlayer command using a simple config file. The syntax consist of a key name followed by a @@ -1162,7 +1046,7 @@ -

    3.2.2.1 Key names

    +

    3.2.1.1 Key names

    You can have a full list by running mplayer -input keylist

    @@ -1215,7 +1099,7 @@ -

    3.2.2.2 Commands

    +

    3.2.1.2 Commands

    You can have a full list of known commands by running "mplayer -input cmdlist"

    @@ -1280,7 +1164,7 @@ -

    3.2.3 Control from LIRC

    +

    3.2.2 Control from LIRC

    Linux Infrared Remote Control - use an easy to build home-brewn IR-receiver, an (almost) arbitrary remote control and control your Linux box with it! @@ -1330,7 +1214,7 @@ use the -lircconf <filename> switch to specify another file.

    -

    3.2.4 Slave mode

    +

    3.2.3 Slave mode

    The slave mode allow you to build simple frontend to MPlayer. When enabled (with the -slave switch) MPlayer will read @@ -1575,8 +1459,8 @@ not send messages in other languages or HTML mail! Message size limit is 80k. If you have something bigger put it up for download somewhere. Click the links to subscribe. On the mailing lists, the same rules about writing - and quoting aply as on usenet. Please follow them, it makes the life of - those who read your mails a lot easier. If you dont know them please + and quoting apply as on usenet. Please follow them, it makes the life of + those who read your mails a lot easier. If you do not know them please read HOWTO edit messages or (if you are in a hurry)