From c3bd6847b68e11761f5af54d7a7fdb33efe19d65 Mon Sep 17 00:00:00 2001 From: Miguel Freitas Date: Mon, 10 Mar 2008 23:15:55 -0300 Subject: fix mrl example --- doc/man/en/xine.5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/man') diff --git a/doc/man/en/xine.5 b/doc/man/en/xine.5 index d5b0b5afe..13e5d0597 100644 --- a/doc/man/en/xine.5 +++ b/doc/man/en/xine.5 @@ -265,7 +265,7 @@ Text subtitle files may be appended to the MRL:. This is the normal way to define the subtitle file to use. The frontend will not take any notice of the subtitle file. For example: .br -.I file://home/user/wibble.mpg#subtitles:/home/user/wibble.sub +.I file://home/user/wibble.mpg#subtitle:/home/user/wibble.sub .br (Note that some front ends can detect subtitles files where the name differs as shown in the example.) -- cgit v1.2.3 From 58756f9cb4c8f68fb6ccb0314da33a5462393380 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sun, 30 Mar 2008 14:02:56 +0100 Subject: Document DVB controls and the stream "save:" option. --- doc/man/en/xine.5 | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'doc/man') diff --git a/doc/man/en/xine.5 b/doc/man/en/xine.5 index 13e5d0597..895e3068a 100644 --- a/doc/man/en/xine.5 +++ b/doc/man/en/xine.5 @@ -256,6 +256,23 @@ audio program ID .TP 20 .B service-id service ID (needed for now/next information etc.) +.PP +The following keyboard & mouse inputs may be accepted: +.TP 24 +.B Menu 2 +Start/stop recording +.TP 24 +.B Menu 3 +Toggle zoom +.TP 24 +.B Menu 7 +Toggle now/next display +.TP 24 +.B Previous/Next Chapter +Previous/next channel +.TP 24 +.B Mouse wheel & button 1 +Scroll through channel list & select the highlighted channel .SH SUBTITLE .B external subtitle files (any mrl) .br @@ -295,6 +312,10 @@ Set audio dynamic range compression. .BI : Assign a new value to any config entry. .TP +.BI save: +Save the stream (if allowed) to the named file, relative to the directory +given by the option "media.capture.save_dir". +.TP .B change configuration option 'on the fly': .br You can change a configuration option at any time, using the special -- cgit v1.2.3 From 8aa79496e5e76d76002de1492cc09a2bfae008c9 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Fri, 4 Apr 2008 18:34:53 +0100 Subject: Update xine-config's man page. --- doc/man/en/xine-config.1 | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) (limited to 'doc/man') diff --git a/doc/man/en/xine-config.1 b/doc/man/en/xine-config.1 index accde1088..359ee42e5 100644 --- a/doc/man/en/xine-config.1 +++ b/doc/man/en/xine-config.1 @@ -1,9 +1,16 @@ +.de TQ +.br +.ns +.TP \\$1 +.. .TH XINE 1 2001-08-28 "The xine project" .SH NAME xine-config - script to get information about the installed version of libxine .SH SYNOPSIS .B xine-config -[\-\-prefix\fI[=DIR]\fP] [\-\-exec\-prefix\fI[=DIR]\fP] [\-\-version] [\-\-libs] [\-\-cflags] [\-\-plugindir] [\-\-skindir] +[\-\-prefix\fI[=DIR]\fP] [\-\-exec\-prefix\fI[=DIR]\fP] [\-\-version] +[\-\-libs] [\-\-cflags] [\-\-objcflags] +[\-\-plugindir] [\-\-datadir] [\-\-scriptdir] [\-\-localedir] .SH DESCRIPTION .PP \fIxine-config\fP is a tool that is used to determine @@ -24,11 +31,20 @@ Print the currently installed version of \fIlibxine\fP on the standard output. Print the linker flags that are necessary to link \fIlibxine\fP to a program. .TP 8 .B \-\-cflags -Print the compiler flags that are necessary to compile a program that uses -\fIlibxine\fP. +.TQ 8 +.B \-\-objcflags +Print the compiler flags (for C and Objective C, respectively) that are +necessary to compile a program that uses \fIlibxine\fP. .TP 8 .B \-\-plugindir -Print the directory where \fIlibxine\fP plugins are stored/expected. +.TQ 8 +.B \-\-datadir +.TQ 8 +.B \-\-scriptdir +.TQ 8 +.B \-\-localedir +Print the directory where, respectively, \fIlibxine\fP plugins, data files, +scripts and locale data are stored/expected. .TP 8 .B \-\-prefix=PREFIX If specified, use PREFIX instead of the installation prefix that \fIxine-lib\fP @@ -46,8 +62,8 @@ and \-\-libs options. This option must be specified before any .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-2008 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, -- cgit v1.2.3 From ba4642f6a994fa157d958562183d40c0ed4e6937 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Fri, 4 Apr 2008 18:35:33 +0100 Subject: Escape "-" in "xine-config". --- doc/man/en/xine-config.1 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'doc/man') diff --git a/doc/man/en/xine-config.1 b/doc/man/en/xine-config.1 index 359ee42e5..d8c778475 100644 --- a/doc/man/en/xine-config.1 +++ b/doc/man/en/xine-config.1 @@ -5,15 +5,15 @@ .. .TH XINE 1 2001-08-28 "The xine project" .SH NAME -xine-config - script to get information about the installed version of libxine +xine\-config - script to get information about the installed version of libxine .SH SYNOPSIS -.B xine-config +.B xine\-config [\-\-prefix\fI[=DIR]\fP] [\-\-exec\-prefix\fI[=DIR]\fP] [\-\-version] [\-\-libs] [\-\-cflags] [\-\-objcflags] [\-\-plugindir] [\-\-datadir] [\-\-scriptdir] [\-\-localedir] .SH DESCRIPTION .PP -\fIxine-config\fP is a tool that is used to determine +\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. @@ -22,7 +22,7 @@ by the .m4 macros for GNU autoconf that are included with \fIxine-lib\fP. . .SH OPTIONS .l -\fIxine-config\fP accepts the following options: +\fIxine\-config\fP accepts the following options: .TP 8 .B \-\-version Print the currently installed version of \fIlibxine\fP on the standard output. -- cgit v1.2.3 From 039b044abf0830eebf90e54d575a179a4ac0f0e1 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Fri, 4 Apr 2008 19:51:25 +0100 Subject: More "-" escaping. --- doc/man/en/xine-config.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/man') diff --git a/doc/man/en/xine-config.1 b/doc/man/en/xine-config.1 index 7772860f0..9031714dc 100644 --- a/doc/man/en/xine-config.1 +++ b/doc/man/en/xine-config.1 @@ -22,7 +22,7 @@ the directories where \fIlibxine\fP expects plugins. .SH OPTIONS .l \fIxine\-config\fP accepts the following options, passing them on (possibly -modified) to \fIpkg-config libxine\fP: +modified) to \fIpkg\-config libxine\fP: .TP 8 .B \-\-version \-\-modversion -- cgit v1.2.3 From b1c711f131520ce268b6403bb7e61595300c5b81 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sun, 6 Apr 2008 19:32:21 +0100 Subject: Add a tool to list MIME types & filetype extns known to xine-lib plugins. This is expected to see most use in updating MIME type lists in front ends' desktop files. --- doc/man/en/Makefile.am | 12 ++++++++++-- doc/man/en/xine-config.1 | 6 ++++-- doc/man/en/xine-list.1.in | 40 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+), 4 deletions(-) create mode 100644 doc/man/en/xine-list.1.in (limited to 'doc/man') diff --git a/doc/man/en/Makefile.am b/doc/man/en/Makefile.am index ee0296033..8cdf212a6 100644 --- a/doc/man/en/Makefile.am +++ b/doc/man/en/Makefile.am @@ -1,5 +1,13 @@ include $(top_srcdir)/misc/Makefile.common -man_MANS = xine-config.1 xine.5 +STATICMANS = xine-config.1 xine.5 +DYNAMICMANS = xine-list-@XINE_SERIES@.1 -EXTRA_DIST = $(man_MANS) +man_MANS = $(STATICMANS) $(DYNAMICMANS) + +BUILT_SOURCES = $(DYNAMICMANS) +DISTCLEANFILES = $(DYNAMICMANS) +EXTRA_DIST = $(STATICMANS) $(suffix .in,$(DYNAMICMANS)) + +xine-list-@XINE_SERIES@.1: xine-list.1.in + (echo '.ds xl xine\-list\-@XINE_MAJOR@.@XINE_MINOR@'; cat $<) >$@ diff --git a/doc/man/en/xine-config.1 b/doc/man/en/xine-config.1 index d8c778475..207dc2dea 100644 --- a/doc/man/en/xine-config.1 +++ b/doc/man/en/xine-config.1 @@ -36,6 +36,8 @@ Print the linker flags that are necessary to link \fIlibxine\fP to a program. Print the compiler flags (for C and Objective C, respectively) that are necessary to compile a program that uses \fIlibxine\fP. .TP 8 +.B \-\-bindir +.TQ 8 .B \-\-plugindir .TQ 8 .B \-\-datadir @@ -43,8 +45,8 @@ necessary to compile a program that uses \fIlibxine\fP. .B \-\-scriptdir .TQ 8 .B \-\-localedir -Print the directory where, respectively, \fIlibxine\fP plugins, data files, -scripts and locale data are stored/expected. +Print the directory where, respectively, \fIlibxine\fP binaries, plugins, +data files, scripts and locale data are stored/expected. .TP 8 .B \-\-prefix=PREFIX If specified, use PREFIX instead of the installation prefix that \fIxine-lib\fP diff --git a/doc/man/en/xine-list.1.in b/doc/man/en/xine-list.1.in new file mode 100644 index 000000000..e159852c8 --- /dev/null +++ b/doc/man/en/xine-list.1.in @@ -0,0 +1,40 @@ +.TH XINE 1 2001-08-28 "The xine project" +.SH NAME +\*(xl - get supported filetype information from xine-lib +.SH SYNOPSIS +.B \*(xl +[\fPoptions...\fI] +.SH DESCRIPTION +.PP +\fI\*(xl\fP is a tool that is used to list the MIME type and filename +extension information known and supported by the installed \fIxine-lib\fP. +It is of use in filling in MIME information in front ends' desktop files. +. +.SH OPTIONS +.l +\fIxine\-list\fP accepts the following options: +.TP 8 +.B \-m +.B \-\-mime\-types +List the MIME types known to \fIxine-lib\fP. (This is the default action.) +.TP 8 +.B \-e +.B \-\-extensions +List the file types (filename extensions) known to \fIxine-lib\fP. +.TP 8 +.B \-a +.B \-\-all +List the MIME types known to \fIxine-lib\fP, along with their filename +extensions and descriptions. +.TP 8 +.B \-p +.B \-\-pretty\-print +Add line feeds; print each item on a line of its own. +.SH COPYRIGHT +Copyright \(co 2008 the xine project. + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided +that the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. -- cgit v1.2.3 From c3b403d0e50747042f0f4aa50c7df04bba7da324 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Mon, 7 Apr 2008 23:32:36 +0100 Subject: Correct the filename in xine-list-*.1; unbreak "make dist". --- doc/man/en/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'doc/man') diff --git a/doc/man/en/Makefile.am b/doc/man/en/Makefile.am index 8cdf212a6..9fe87cc11 100644 --- a/doc/man/en/Makefile.am +++ b/doc/man/en/Makefile.am @@ -7,7 +7,7 @@ man_MANS = $(STATICMANS) $(DYNAMICMANS) BUILT_SOURCES = $(DYNAMICMANS) DISTCLEANFILES = $(DYNAMICMANS) -EXTRA_DIST = $(STATICMANS) $(suffix .in,$(DYNAMICMANS)) +EXTRA_DIST = $(STATICMANS) xine-list.1.in xine-list-@XINE_SERIES@.1: xine-list.1.in - (echo '.ds xl xine\-list\-@XINE_MAJOR@.@XINE_MINOR@'; cat $<) >$@ + (echo '.ds xl xine\-list\-@XINE_SERIES@'; cat $<) >$@ -- cgit v1.2.3