diff options
Diffstat (limited to 'doc/man/en')
| -rw-r--r-- | doc/man/en/xine-config.1 | 46 | ||||
| -rw-r--r-- | doc/man/en/xine.5 | 56 |
2 files changed, 55 insertions, 47 deletions
diff --git a/doc/man/en/xine-config.1 b/doc/man/en/xine-config.1 index 0a2d8bcc6..c43e3890a 100644 --- a/doc/man/en/xine-config.1 +++ b/doc/man/en/xine-config.1 @@ -6,51 +6,47 @@ xine-config - script to get information about the installed version of libxine [\-\-prefix\fI[=DIR]\fP] [\-\-exec\-prefix\fI[=DIR]\fP] [\-\-version] [\-\-libs] [\-\-cflags] [\-\-plugindir] [\-\-skindir] .SH DESCRIPTION .PP -\fIxine-config\fP is a tool that is used to determine +\fIxine\-config is DEPRECATED. Use pkg\-config instead.\fP +.PP +\fIxine\-config\fP is a tool that is used to determine the compiler and linker flags that should be used to compile and link programs that use \fIlibxine\fP. It can also be used to determine -the directories where \fIlibxine\fP expects plugins and skins. -Finally, it's also used internally -by the .m4 macros for GNU autoconf that are included with \fIxine-lib\fP. -. +the directories where \fIlibxine\fP expects plugins. .SH OPTIONS .l -\fIxine-config\fP accepts the following options: +\fIxine-config\fP accepts the following options, passing them on (possibly +modified) to \fIpkg-config libxine\fP: .TP 8 .B \-\-version -Print the currently installed version of \fIlibxine\fP on the standard output. -.TP 8 -.B \-\-libs -Print the linker flags that are necessary to link \fIlibxine\fP to a program. +\-\-modversion .TP 8 -.B \-\-cflags -Print the compiler flags that are necessary to compile a program that uses -\fIlibxine\fP. +.B \-\-libs \fP&\fB \-\-cflags +Passed on unmodified. .TP 8 .B \-\-plugindir +\-\-variable=plugindir +.br Print the directory where \fIlibxine\fP plugins are stored/expected. .TP 8 -.B \-\-skindir -Print the directory in which \fIlibxine\fP skins are stored/expected. -.TP 8 .B \-\-prefix=PREFIX +\-\-define\-variable=prefix=PREFIX +.br If specified, use PREFIX instead of the installation prefix that \fIxine-lib\fP -was built with when computing the output for the \-\-cflags and -\-\-libs options. This option is also used for the exec prefix -if \-\-exec\-prefix was not specified. This option must be specified -before any \-\-libs or \-\-cflags options. +was built with. This option is also used for the exec prefix if +\-\-exec\-prefix was not specified. + .TP 8 .B \-\-exec\-prefix=PREFIX +\-\-define\-variable=exec_prefix=PREFIX +.br If specified, use PREFIX instead of the installation exec prefix that -\fIxine-lib\fP was built with when computing the output for the \-\-cflags -and \-\-libs options. This option must be specified before any -\-\-libs or \-\-cflags options. +\fIxine-lib\fP was built with. .SH SEE ALSO .BR xine-lib (3), .BR xine (1) .SH COPYRIGHT -Copyright \(co 2001 Siggi Langauf/the xine project, based on the man page -for gtk-config, \(co 1998 Owen Taylor +Copyright \(co 2001 Siggi Langauf, \(co 2001-2007 the xine project. Based on +the man page for gtk-config, \(co 1998 Owen Taylor Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, diff --git a/doc/man/en/xine.5 b/doc/man/en/xine.5 index 0c4cedc12..297aff48e 100644 --- a/doc/man/en/xine.5 +++ b/doc/man/en/xine.5 @@ -18,7 +18,8 @@ xine \- a free video player .SH MRL (media resource locator) MRLs are similar to URLs in your web browser. They describe the media -to read from. Valid MRLs may be plain file names or one of the following: +to read from. Valid MRLs may be plain file names or one of the following +(see also the notes below): .TP \(bu Filesystem: .br @@ -31,11 +32,13 @@ to read from. Valid MRLs may be plain file names or one of the following: .TP \(bu CD and DVD: .br -.BI dvd:/[<DVD_image>|<DVD_directory>|<device_name>][/<title>.<part>] +.BI dvd:/[<device_name>][/<title>.<part>] +.br +.BI dvd:/<DVD_image_file_or_directory>[/<title>.<part>] .br .BI vcd://[<CD_image>|<device_name>][@[letter]<number>] .br -.BI vcdo://... +.BI vcdo://<track_number> .br .BI cdda:/[<device>][/<track-number>] .LP @@ -52,6 +55,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 @@ -74,13 +79,13 @@ to read from. Valid MRLs may be plain file names or one of the following: .BR rtsp://<host>... " (requires Real codecs)" .br .LP -\fBNOTE:\fP where a file name is required, the \fIfull path must be -provided\fP - from a shell, you can use \fB$PWD/file\fP if the file -is in the current directory. +Additional input plugins will provide additional MRL types. The ones listed +above are available with stock libxine. -Several MRLs may be specified in order to play a number of consecutive -streams. Additional input plugins will provide additional MRL types. The ones -listed above are available with stock libxine... +\fBNOTE:\fP where a file name is required, the \fIfull path must be +provided\fP - from a shell, you can use \fB"$PWD/file"\fP or +\fB"$(pwd)/file"\fP or \fB"\`pwd\`/file"\fP if the file is in the current +directory. (Which one depends on your shell; all three work in bash.) As of xine-lib 1.1.3, the DVD title number may be 0 (select navigation) and the chapter number may be 0 (full title). @@ -103,11 +108,11 @@ work.) After the optional device name or file name, you can name the kind of unit, preceded by a colon. An MRL which ends in a colon is like not adding it at all: the default entry type and number is used. Items come in 4 flavours: -\fB"Track"\fP, \fB"Entry"\fP, \fB"Playback"\fP and \fB"Segment"\fP. These +"\fBTrack\fP", "\fBEntry\fP", "\fBPlayback\fP" and "\fBSegment\fP". These units are indicated with the capital first letter of each type: \fBT\fP, \fBE\fP, \fBP\fP, \fBS\fP, \fBs\fP. An uppercase \fBS\fP in the MRL display -indicates a NTS segment while a lowercase \fBS\fP indicates a PAL segment. -However when you enter an MRL, the case of these letters is insignificant. +indicates a NTSC segment while a lowercase \fBs\fP indicates a PAL segment. +However, when you enter an MRL, the case of these letters is insignificant. Depending on the Video CD, you might not have any playable segments (\fBS\fP,\fBs\fP) or playback control (\fBP\fP). If you give a MRL that @@ -184,11 +189,12 @@ Play entry 0 of /tmp/ntsc.nrg (Nero file). Works for some simple Nero images. .br .SS DVB .PP -DVB MRLs require that ~/.xine/channels.conf exists and contains valid data. +DVB MRLs require that xine-lib/channels.conf exists in $XDG_CONFIG_HOME/ or +~/.config/ and contains valid data. This can be obtained by generating a tuning file using the LinuxTV DVB apps utility "scan" (or "dvbscan" if you're using a version newer than 1.1.0): .PP -.B scan -o zap /usr/share/doc/dvb-utils/examples/scan/dvb-t/uk-PontopPike +.B scan -o zap /usr/share/doc/dvb-utils/examples/scan/dvb-t/uk-PontopPike >~/.config/xine-lib/channels.conf .PP (This example is for the writer's local transmitter, using a file from the Debian dvb-utils package.) @@ -197,13 +203,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 @@ -213,16 +222,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 @@ -231,13 +240,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 @@ -245,6 +254,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 |