[MPlayer-dev-eng] [PATCH] Teletext support try3 (2/5, docs)

[Vladimir Voroshilov]

2007/7/20, Diego Biurrun <diego at biurrun.de>:
> On Thu, Jul 19, 2007 at 01:20:05AM +0700, Vladimir Voroshilov wrote:
> > 2007/7/19, Diego Biurrun <diego at biurrun.de>:
> > +++ DOCS/tech/slave.txt	(working copy)
> > @@ -322,6 +322,14 @@
> >
> > +teletext_add_digit <value>
> > +    On/off teletext page number editing mode and append given digit to
> > +    previously entered one.
>
> "On/off" is bad, you should use a verb there.  "Enter/leave" or
> "enable/disable" or similar come to mind.

"Enter/leave" sounds better.


> Please keep lines below 80 characters.

Fixed.


> > --- DOCS/man/en/mplayer.1	(revision 23806)
> > +++ DOCS/man/en/mplayer.1	(working copy)
> > @@ -1865,6 +1880,21 @@
> > +.IPs tpage=<100-899> (default: 100)
> > +Specify initial TV teletext page number .
>
> extra space

Fixed.

Updated patch is attached.

-- 
Regards,
Vladimir Voroshilov     mailto:voroshil at gmail.com
JID: voroshil at gmail.com, voroshil at jabber.ru
ICQ: 95587719
-------------- next part --------------
Index: Changelog
===================================================================
--- Changelog	(revision 23787)
+++ Changelog	(working copy)
@@ -53,6 +53,7 @@
     * support H.264 over RTSP
     * "device" and "adevice" suboptions now works for *BSD BT848 tv driver too
     * dvdnav:// now depends on mplayer's fork of libdvdnav
+    * teletext support for tv:// (v4l and v4l2 only)
 
     FFmpeg/libavcodec:
     * Intel Music coder audio decoder
Index: DOCS/tech/slave.txt
===================================================================
--- DOCS/tech/slave.txt	(revision 23787)
+++ DOCS/tech/slave.txt	(working copy)
@@ -322,6 +322,14 @@
     Toggle vsync (1 == on, 0 == off). If [value] is not provided,
     vsync status is inverted.
 
+teletext_add_digit <value>
+    Enter/leave teletext page number editing mode and append given digit to
+    previously entered one.
+    0..9 - Append apropriate digit. (Enables editing mode if called from normal
+           mode, and switches to normal mode when third digit is entered.)
+    -    - Delete last digit from page number. (Backspace emulation, works only
+           in page number editing mode.)
+
 tv_step_channel <channel>
     Select next/previous TV channel.
 
@@ -457,4 +465,13 @@
 tv_contrast        int       -100    100     X   X   X
 tv_saturation      int       -100    100     X   X   X
 tv_hue             int       -100    100     X   X   X
+teletext_page      int       0       799     X   X   X
+teletext_subpage   int       0       64      X   X   X
+teletext_mode      flag      0       1       X   X   X    0 - off, 1 - on
+teletext_format    int       0       3       X   X   X    0 - opaque,
+                                                          1 - transparent, 
+                                                          2 - opaque inverted,
+                                                          3 - transp. inv.
+teletext_half_page int       0       2       X   X   X    0 - off, 1 - top half,
+                                                          2- bottom half
 
Index: DOCS/tech/MAINTAINERS
===================================================================
--- DOCS/tech/MAINTAINERS	(revision 23787)
+++ DOCS/tech/MAINTAINERS	(working copy)
@@ -78,6 +78,7 @@
     * libmpdemux: Roberto Togni, Nico Sabbi
     * libmpcodecs: Roberto Togni
     * TV input/capture: Vladimir Voroshilov
+    * TV teletext: Vladimir Voroshilov
     * network streaming: Roberto Togni, Nico Sabbi, Benjamin Zores
     * DVD/VOB subtitles: None
     * config files & commandline parser: Alban Bedel
Index: DOCS/man/en/mplayer.1
===================================================================
--- DOCS/man/en/mplayer.1	(revision 23787)
+++ DOCS/man/en/mplayer.1	(working copy)
@@ -423,6 +423,21 @@
 .PP
 .RS
 .
+(The following keys are only valid if teletext support is enabled during
+compilation: They are used for controlling TV teletext.)
+.RE
+.PP
+.PD 0
+.RS
+.IPs "X"
+Switch teletext on/\:off.
+.IPs "Q and W"
+Go to next/\:prev teletext page.
+.RE
+.PD 1
+.PP
+.RS
+.
 .TP
 .B mouse control
 .PD 0
@@ -1865,6 +1880,21 @@
 .IPs quality=<0\-100>
 Choose the quality of the JPEG compression
 (< 60 recommended for full size).
+.IPs tdevice=<value>  (default: none)
+Specify TV teletext device (example: /dev/\:vbi0).
+.IPs tformat=<format> (default: 0)
+Specify TV teletext display format:
+.RSss
+0: opaque
+.br
+1: transparent
+.br
+2: opaque with inverted colors
+.br
+3: transparent with inverted colors
+.REss
+.IPs tpage=<100-899> (default: 100)
+Specify initial TV teletext page number.
 .RE
 .
 .TP