From 3155b9939440647b201c4da412b5ef04fc7f7af7 Mon Sep 17 00:00:00 2001
From: Darren Salt <linux@youmustbejoking.demon.co.uk>
Date: Sun, 13 May 2007 15:54:26 +0100
Subject: DVB MRL documentation corrections, additions and tweaks. Add
 documentation for dvba: MRLs. Mention that the service ID is required for
 dvbs:, dvbc: and dvbt:. Replace _ with - in the DVB tuning info descriptions
 (for formatting reasons).

---
 ChangeLog         |  1 +
 doc/man/en/xine.5 | 24 ++++++++++++++++--------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c92214f15..d18e9d330 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,7 @@ xine-lib (1.1.7) (unreleased)
   * Ensure that the ffmpeg video image size is properly initialised.
   * Allow XxMC to switch back to software decoding; don't deinterlace if it's
     not needed for any given frame.
+  * Document dvba: MRLs (ATSC with full tuning info).
 
 xine-lib (1.1.6)
   * Split the DirectFB plugin into X11 and non-X versions.
diff --git a/doc/man/en/xine.5 b/doc/man/en/xine.5
index f705b1b23..43768f8a1 100644
--- a/doc/man/en/xine.5
+++ b/doc/man/en/xine.5
@@ -54,6 +54,8 @@ to read from. Valid MRLs may be plain file names or one of the following:
 .br
 .BI dvbt://<channel_name>:<tuning_parameters>
 .br
+.BI dvba://<channel_name>:<tuning_parameters>
+.br
 .BR pvr:/<tmp_files_path>!<saved_files_path>!<max_page_age> " (for WinTV PVR 250 and 350)"
 .LP
 .TP
@@ -199,13 +201,16 @@ For the dvbc, dvbs and dvbt MRLs, tuning parameters are expected, taking one
 of the following forms:
 .TP
 .B DVB-S
-<frequency>:<polarisation>:<sat_no>:<sym_rate>:<vpid>:<apid>
+<frequency>:<polarisation>:<sat-no>:<sym-rate>:<vpid>:<apid>:<service-id>
 .TP
 .B DVB-C
-<frequency>:<inversion>:<sym_rate>:<fec>:<qam>:<vpid>:<apid>
+<frequency>:<inversion>:<sym-rate>:<fec>:<qam>:<vpid>:<apid>:<service-id>
 .TP
 .B DVB-T
-<frequency>:<inversion>:<bw>:<fec_hp>:<fec_lp>:<qam>:<transmission_mode>:<guardlist>:<hierarchy_info>:<vpid>:<apid>
+<frequency>:<inversion>:<bw>:<fec-hp>:<fec-lp>:<qam>:<transmission-mode>:<guardlist>:<hierarchy-info>:<vpid>:<apid>:<service-id>
+.TP
+.B DVB-A
+<frequency>:<qam>:<vpid>:<apid>:<service-id>
 .PP
 The individual parameters are:
 .TP 20
@@ -215,16 +220,16 @@ number, usually in kHz
 .B polarisation
 `v' or `h'
 .TP 20
-.B sat_no
+.B sat-no
 unsigned long, usually 0
 .TP 20
-.B sym_rate
+.B sym-rate
 symbol rate in MSyms/sec
 .TP 20
 .B inversion
 INVERSION_ON, INVERSION_OFF, INVERSION_AUTO
 .TP 20
-.B fec, fec_hp, fec_lp
+.B fec, fec-hp, fec-lp
 FEC_1_2, FEC_2_3, FEC_3_4 ... FEC_8_9, FEC_AUTO, FEC_NONE
 .TP 20
 .B qam
@@ -233,13 +238,13 @@ QPSK, QAM_128, QAM_16 ...
 .B bw
 BANDWIDTH_6_MHZ, BANDWIDTH_7_MHZ, BANDWIDTH_8_MHZ
 .TP 20
-.B transmission_mode
+.B transmission-mode
 TRANSMISSION_MODE_2K, TRANSMISSION_MODE_8K
 .TP 20
 .B guardlist
 GUARD_INTERVAL_1_4, GUARD_INTERVAL_1_8, GUARD_INTERVAL_1_16, GUARD_INTERVAL_1_32,
 .TP 20
-.B hierarchy_info
+.B hierarchy-info
 HIERARCHY_1, HIERARCHY_2, HIERARCHY_4, HIERARCHY_NONE
 .TP 20
 .B vpid
@@ -247,6 +252,9 @@ video program ID
 .TP 20
 .B apid
 audio program ID
+.TP 20
+.B service-id
+service ID (needed for now/next information etc.)
 .SH SUBTITLE
 .B external subtitle files (any mrl)
 .br
-- 
cgit v1.2.3