diff -Naur MPlayer-20030810/DOCS/en/documentation.html MPlayer-20030810-new/DOCS/en/documentation.html
--- MPlayer-20030810/DOCS/en/documentation.html 2003-08-06 01:07:07.000000000 +0200
+++ MPlayer-20030810-new/DOCS/en/documentation.html 2003-08-10 16:05:41.000000000 +0200
@@ -159,7 +159,7 @@
</LI>
<LI><A HREF="video.html#mpegdec">2.3.1.3 MPEG decoders</A>
<UL>
- <LI><A HREF="video.html#dvb">2.3.1.3.1 DVB</A></LI>
+ <LI><A HREF="video.html#dvb">2.3.1.3.1 DVB output and input</A></LI>
<LI><A HREF="video.html#dxr2">2.3.1.3.2 DXR2</A></LI>
<LI><A HREF="video.html#dxr3">2.3.1.3.3 DXR3/Hollywood+</A></LI>
</UL>
diff -Naur MPlayer-20030810/DOCS/en/mplayer.1 MPlayer-20030810-new/DOCS/en/mplayer.1
--- MPlayer-20030810/DOCS/en/mplayer.1 2003-08-07 14:24:34.000000000 +0200
+++ MPlayer-20030810-new/DOCS/en/mplayer.1 2003-08-10 16:22:19.000000000 +0200
@@ -129,6 +129,12 @@
[options]
.br
.in
+.B mplayer
+'in +\n[.k]u
+.I dvb://channel
+[options]
+.br
+.in
.B mencoder
[options]
.RI [ \ file\ | \ URL\ | \ -\ ]
@@ -348,9 +354,9 @@
.RSs
.IPs "K,J,H,L"
browse up/\:down/\:left/\:right
-.IPs M\ \ \ \
+.IPs M\ \ \ \
jump to main menu
-.IPs S\ \ \ \
+.IPs S\ \ \ \
select
.RE
.PD 1
@@ -390,6 +396,21 @@
With this option MPlayer will also ignore frame duration when playing
only video (you can think of that as infinite fps).
.TP
+.B \-dvbin <options>
+Pass to the DVB input module the following parameters, to override the default ones:
+.PD 0
+.RSs
+.IPs card=<1..4>
+Specifies to use card number 1..4. Default is 1.
+.IPs file=<file>
+Instructs MPlayer to read the channels list from <file>.
+.IPs type=<SAT|TER|CBL>
+Specifies that the card type is SATellitar, TERrestrial or CaBLe. If not specifiied
+the type will be autodetected.
+.RE
+.PD 1
+.
+.TP
.B \-edl <filename>
Enables edit decision list (EDL) actions during playback.
Video will be skipped over and audio will be muted and unmuted according to
@@ -457,7 +478,7 @@
Prints all commands that can be bound.
.IPs js\-dev
Specifies the joystick device to use (default is /dev/\:input/\:js0).
-.IPs file\
+.IPs file\
Read commands from the given file.
Mostly useful with a fifo.
.br
diff -Naur MPlayer-20030810/DOCS/en/video.html MPlayer-20030810-new/DOCS/en/video.html
--- MPlayer-20030810/DOCS/en/video.html 2003-08-05 11:22:20.000000000 +0200
+++ MPlayer-20030810-new/DOCS/en/video.html 2003-08-10 16:25:03.000000000 +0200
@@ -1105,6 +1105,68 @@
for 16:9 TV: -vf dvbscale=1024,scale=-1:0,expand=-1:576:-1:-1:1
</PRE>
+<H4>Using your DVB card for watching Digital TV (DVB input module)</H4>
+
+<P>First you need to pass the parameter <CODE>dvb_shutdown_timeout=0</CODE> to the
+ kernel module <CODE>dvb-core</CODE>, or <CODE>MPlayer</CODE> will die after
+ 10 seconds.</P>
+
+<P>You should also have the programs <CODE>scan</CODE> and
+<CODE>szap/tzap/czap</CODE> installed; they are all included in the drivers
+package.</P>
+
+<P>Verify that your drivers are working properly with a program such as
+<A HREF="http://www.sf.net/projects/dvbtools/"><CODE>dvbstream</CODE></A>
+(that is the base of the DVB input module).</P>
+
+<P>Now you should compile a <CODE>~/.mplayer/channels.conf</CODE> file,
+having the same syntax accepted by <CODE>szap/tzap/czap</CODE>, or have
+<CODE>scan</CODE> compile it for you.</P>
+
+Make sure that in your <CODE>channels.conf</CODE> file are present <B>ONLY</B>
+Free to Air channels, or <CODE>MPlayer</CODE> will hang on the others.</P>
+
+<P>Run</P>
+<PRE>
+ mplayer dvb://
+</PRE>
+
+<P>The command above will show the first of the channels present in your list.</P>
+<P>If you want to watch a specific channel, such as <CODE>R1</CODE>, run</P>
+
+<PRE>
+ mplayer dvb://R1
+</PRE>
+
+<P>
+To change channel press <CODE>'h'</CODE> (next) and <CODE>'k'</CODE> (previous)
+keys, or use the <CODE>OSD</CODE> menu (that requires a working
+<A HREF="documentation.html#subtitles_osd">OSD subsystem</a> compiled in
+<CODE>MPlayer</CODE>).</P>
+
+<P>If your <CODE>~/.mplayer/menu.conf</CODE> contains a <B><dvbsel></b>
+entry, such as the one in the example file <CODE>./etc/dvb-menu.conf</CODE>
+(that you can use to overwrite <CODE>~/.mplayer/menu.conf</CODE>), the main
+menu will show a sub-menu entry that will permit you to choose
+one of the channels present in your <CODE>channels.conf</CODE>.</P>
+
+<P>If you want to save a program to disk you can use</P>
+
+<PRE>
+ mplayer -dumpfile r1.ts -dumpstream dvb://R1
+</PRE>
+
+<P>instead if you want to record it in a different format (re-encoding it) you can run
+a command such as </P>
+
+<PRE>
+ mencoder -o r1.avi -ovc xvid -xvidenctopts bitrate=800 -oac mp3lame -lameopts cbr:br=128 -vf ci dvb://R1
+</PRE>
+
+<P>or use any other of mencoder's options.<BR>
+Read the man page for a list of options that you can pass to the DVB input module.</P>
+
+
<H4>FUTURE</H4>
<P>If you have questions or want to hear feature announcements and take part in
diff -Naur MPlayer-20030810/etc/dvb-menu.conf MPlayer-20030810-new/etc/dvb-menu.conf
--- MPlayer-20030810/etc/dvb-menu.conf 1970-01-01 01:00:00.000000000 +0100
+++ MPlayer-20030810-new/etc/dvb-menu.conf 2003-05-08 22:46:43.000000000 +0200
@@ -0,0 +1,110 @@
+
+<txt name="man" file="manpage.txt"/>
+
+<filesel name="open_file"/>
+<filesel name="open_list" file-action="loadlist '%p'" auto-close="yes"
+ title="Open a playlist: %p" />
+
+<dvbsel title="Lista canali" name="dvbsel" />
+
+
+<pt name="jump_to"/>
+
+<console name="console0" height="80" vspace="0">Welcome to MPlayer</console>
+
+<txt name="man" file="manpage.txt"/>
+
+<pref name="general_pref" title="General">
+ <e name="autoq"/>
+ <e name="autosync" />
+ <e name="framedrop"/>
+ <e name="quiet"/>
+ <e name="softsleep" />
+</pref>
+
+<pref name="demuxer_pref" title="Demuxer">
+ <e name="aid"/>
+ <e name="alang" />
+ <e name="cache"/>
+ <e name="channels"/>
+ <e name="dvdangle" />
+ <e name="forceidx"/>
+ <e name="fps"/>
+ <e name="hr-mp3-seek"/>
+ <e name="idx"/>
+ <e name="mc"/>
+ <e name="ni"/>
+ <e name="nobps"/>
+ <e name="srate"/>
+ <e name="vid"/>
+</pref>
+
+
+<pref name="osd_sub_pref" title="OSD & Subs">
+ <e name="ffactor"/>
+ <e name="noautosub"/>
+ <e name="osdlevel"/>
+ <e name="sid"/>
+ <e name="slang"/>
+ <e name="subdelay"/>
+ <e name="subfps"/>
+ <e name="subpos"/>
+ <e name="unicode"/>
+ <e name="utf8"/>
+ <e name="vobsubid"/>
+</pref>
+
+<pref name="audio_pref" title="Audio">
+ <e name="abs"/>
+ <e name="af"/>
+ <e name="ao"/>
+ <e name="aofile"/>
+ <e name="delay"/>
+ <e name="mixer"/>
+ <e name="nowaveheader"/>
+</pref>
+
+<pref name="video_pref" title="Video">
+ <e name="bpp"/>
+ <e name="brightness"/>
+ <e name="contrast"/>
+ <e name="display"/>
+ <e name="double"/>
+ <e name="dr"/>
+ <e name="fs"/>
+ <e name="geometry"/>
+ <e name="hue"/>
+ <e name="icelayer"/>
+ <e name="noslices"/>
+ <e name="panscan"/>
+ <e name="rootwin"/>
+ <e name="saturation"/>
+ <e name="vm"/>
+ <e name="vo"/>
+ <e name="vop"/>
+ <e name="xineramascreen"/>
+ </pref>
+
+
+<cmdlist name="pref_main" title="Preferences" ptr="<>" >
+ <e name="General ..." ok="set_menu general_pref"/>
+ <e name="Demuxer ..." ok="set_menu demuxer_pref"/>
+ <e name="Osd/Subtitles ..." ok="set_menu osd_sub_pref"/>
+ <e name="Audio ..." ok="set_menu audio_pref"/>
+ <e name="Video ..." ok="set_menu video_pref"/>
+</cmdlist>
+
+<cmdlist name="main" title="MPlayer 0.90" ptr="<>" >
+ <e name="Pause" ok="pause"/>
+ <e name="Prev/Next" ok="pt_step 1" cancel="pt_step -1"/>
+ <e name="Jump to ..." ok="set_menu jump_to"/>
+ <e name="Open ..." ok="set_menu open_file"/>
+ <e name="Open playlist ..." ok="set_menu open_list"/>
+ <e name="DVB" ok="set_menu dvbsel"/>
+ <e name="Help" ok="set_menu man"/>
+ <e name="Pref" ok="set_menu pref_main"/>
+ <e name="Console" ok="set_menu console0"/>
+ <e name="Quit" ok="quit"/>
+</cmdlist>
+
+