diff options
Diffstat (limited to 'man')
-rw-r--r-- | man/Makefile.am | 115 | ||||
-rw-r--r-- | man/pacat.1.xml.in | 6 | ||||
-rw-r--r-- | man/pulse-client.conf.5.xml.in | 19 | ||||
-rw-r--r-- | man/pulse-daemon.conf.5.xml.in | 65 | ||||
-rw-r--r-- | man/pulseaudio.1.xml.in | 2 |
5 files changed, 85 insertions, 122 deletions
diff --git a/man/Makefile.am b/man/Makefile.am index b0536d84..9b229f52 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -17,9 +17,10 @@ pulseconfdir=$(sysconfdir)/pulse -if BUILD_MANPAGES +CLEANFILES = \ + $(noinst_DATA) -man_MANS = \ +dist_man_MANS = \ pulseaudio.1 \ esdcompat.1 \ pax11publish.1 \ @@ -49,115 +50,18 @@ noinst_DATA = \ pulse-client.conf.5.xml \ default.pa.5.xml -CLEANFILES = \ - $(noinst_DATA) - -pulseaudio.1.xml: pulseaudio.1.xml.in Makefile - sed -e 's,@pulseconfdir\@,$(pulseconfdir),g' \ - -e 's,@PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),g' \ - -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' $< > $@ - -esdcompat.1.xml: esdcompat.1.xml.in Makefile - sed -e 's,@pulseconfdir\@,$(pulseconfdir),g' \ - -e 's,@PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),g' \ - -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' $< > $@ - -pax11publish.1.xml: pax11publish.1.xml.in Makefile - sed -e 's,@pulseconfdir\@,$(pulseconfdir),g' \ - -e 's,@PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),g' \ - -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' $< > $@ - -paplay.1.xml: paplay.1.xml.in Makefile - sed -e 's,@pulseconfdir\@,$(pulseconfdir),g' \ - -e 's,@PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),g' \ - -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' $< > $@ - -pacat.1.xml: pacat.1.xml.in Makefile - sed -e 's,@pulseconfdir\@,$(pulseconfdir),g' \ - -e 's,@PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),g' \ - -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' $< > $@ - -pacmd.1.xml: pacmd.1.xml.in Makefile - sed -e 's,@pulseconfdir\@,$(pulseconfdir),g' \ - -e 's,@PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),g' \ - -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' $< > $@ - -pactl.1.xml: pactl.1.xml.in Makefile - sed -e 's,@pulseconfdir\@,$(pulseconfdir),g' \ - -e 's,@PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),g' \ - -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' $< > $@ - -pasuspender.1.xml: pasuspender.1.xml.in Makefile - sed -e 's,@pulseconfdir\@,$(pulseconfdir),g' \ - -e 's,@PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),g' \ - -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' $< > $@ - -padsp.1.xml: padsp.1.xml.in Makefile - sed -e 's,@pulseconfdir\@,$(pulseconfdir),g' \ - -e 's,@PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),g' \ - -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' $< > $@ - -pabrowse.1.xml: pabrowse.1.xml.in Makefile - sed -e 's,@pulseconfdir\@,$(pulseconfdir),g' \ - -e 's,@PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),g' \ - -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' $< > $@ - -pulse-daemon.conf.5.xml: pulse-daemon.conf.5.xml.in Makefile - sed -e 's,@pulseconfdir\@,$(pulseconfdir),g' \ - -e 's,@PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),g' \ - -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' $< > $@ +if BUILD_MANPAGES -pulse-client.conf.5.xml: pulse-client.conf.5.xml.in Makefile - sed -e 's,@pulseconfdir\@,$(pulseconfdir),g' \ - -e 's,@PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),g' \ - -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' $< > $@ +CLEANFILES += \ + $(dist_man_MANS) -default.pa.5.xml: default.pa.5.xml.in Makefile +%.xml: %.xml.in Makefile sed -e 's,@pulseconfdir\@,$(pulseconfdir),g' \ -e 's,@PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),g' \ -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' $< > $@ -CLEANFILES += \ - $(man_MANS) - -pulseaudio.1: pulseaudio.1.xml Makefile - perl xmltoman $< > $@ || rm -f $@ - -esdcompat.1: esdcompat.1.xml Makefile - perl xmltoman $< > $@ || rm -f $@ - -pax11publish.1: pax11publish.1.xml Makefile - perl xmltoman $< > $@ || rm -f $@ - -paplay.1: paplay.1.xml Makefile - perl xmltoman $< > $@ || rm -f $@ - -pacat.1: pacat.1.xml Makefile - perl xmltoman $< > $@ || rm -f $@ - -pacmd.1: pacmd.1.xml Makefile - perl xmltoman $< > $@ || rm -f $@ - -pactl.1: pactl.1.xml Makefile - perl xmltoman $< > $@ || rm -f $@ - -pasuspender.1: pasuspender.1.xml Makefile - perl xmltoman $< > $@ || rm -f $@ - -padsp.1: padsp.1.xml Makefile - perl xmltoman $< > $@ || rm -f $@ - -pabrowse.1: pabrowse.1.xml Makefile - perl xmltoman $< > $@ || rm -f $@ - -pulse-daemon.conf.5: pulse-daemon.conf.5.xml Makefile - perl xmltoman $< > $@ || rm -f $@ - -pulse-client.conf.5: pulse-client.conf.5.xml Makefile - perl xmltoman $< > $@ || rm -f $@ - -default.pa.5: default.pa.5.xml Makefile - perl xmltoman $< > $@ || rm -f $@ +%: %.xml Makefile + perl $(srcdir)/xmltoman $< > $@ || rm -f $@ xmllint: $(noinst_DATA) for f in $(noinst_DATA) ; do \ @@ -167,7 +71,6 @@ xmllint: $(noinst_DATA) endif EXTRA_DIST = \ - $(man_MANS) \ pulseaudio.1.xml.in \ esdcompat.1.xml.in \ pax11publish.1.xml.in \ diff --git a/man/pacat.1.xml.in b/man/pacat.1.xml.in index 7b0d72b9..68a3a12a 100644 --- a/man/pacat.1.xml.in +++ b/man/pacat.1.xml.in @@ -108,9 +108,11 @@ USA. <optdesc><p>Capture or play back audio with the specified sample format. Specify one of <opt>u8</opt>, <opt>s16le</opt>, - <opt>s16be</opt>, <opt>float32le</opt>, <opt>float32be</opt>, + <opt>s16be</opt>, <opt>s32le</opt>, + <opt>s32be</opt>, <opt>float32le</opt>, <opt>float32be</opt>, <opt>ulaw</opt>, <opt>alaw</opt>. Depending on the endianess of - the CPU the formats <opt>s16ne</opt>, <opt>s16re</opt>, + the CPU the + formats <opt>s16ne</opt>, <opt>s16re</opt>, <opt>s32ne</opt>, <opt>s32re</opt>, <opt>float32ne</opt>, <opt>float32re</opt> (for native, resp. reverse endian) are available as aliases. Defaults to s16ne.</p></optdesc> diff --git a/man/pulse-client.conf.5.xml.in b/man/pulse-client.conf.5.xml.in index ae8de1f8..26e38908 100644 --- a/man/pulse-client.conf.5.xml.in +++ b/man/pulse-client.conf.5.xml.in @@ -31,15 +31,15 @@ USA. <description> <p>The PulseAudio client library reads configuration directives from - a file <file>~/.pulse/client.conf</file> on startup, and when that + a file <file>~/.pulse/client.conf</file> on startup and when that file doesn't exist from <file>@pulseconfdir@/client.conf</file>.</p> <p>The configuration file is a simple collection of variable declarations. If the configuration file parser encounters either ; - or # for it ignores the rest of the line until its end.</p> + or # it ignores the rest of the line until its end.</p> - <p>For the settings that take a boolean argument, the values + <p>For the settings that take a boolean argument the values <opt>true</opt>, <opt>yes</opt>, <opt>on</opt> and <opt>1</opt> are equivalent, resp. <opt>false</opt>, <opt>no</opt>, <opt>off</opt>, <opt>0</opt>.</p> @@ -69,7 +69,7 @@ USA. <option> <p><opt>autospawn=</opt> Autospawn a PulseAudio daemon when - needed. Takes a boolean value, defaults to "no".</p> + needed. Takes a boolean value, defaults to "yes".</p> </option> <option> @@ -81,7 +81,7 @@ USA. <option> <p><opt>extra-arguments=</opt> Extra arguments to pass to the PulseAudio daemon when autospawning. Defaults to - <opt>--log-target=syslog --exit-idle-time=5</opt> + <opt>--log-target=syslog</opt> </p> </option> @@ -97,6 +97,15 @@ USA. <opt>no</opt>.</p> </option> + <option> + <p><opt>shm-size-bytes=</opt> Sets the shared memory segment + size for clients, in bytes. If left unspecified or is set to 0 + it will default to some system-specific default, usually 64 + MiB. Please note that usually there is no need to change this + value, unless you are running an OS kernel that does not do + memory overcommit.</p> + </option> + </section> <section name="Authors"> diff --git a/man/pulse-daemon.conf.5.xml.in b/man/pulse-daemon.conf.5.xml.in index 50e24559..a516ee3f 100644 --- a/man/pulse-daemon.conf.5.xml.in +++ b/man/pulse-daemon.conf.5.xml.in @@ -31,7 +31,7 @@ USA. <description> <p>The PulseAudio sound server reads configuration directives from - a file <file>~/.pulse/daemon.conf</file> on startup, and when that + a file <file>~/.pulse/daemon.conf</file> on startup and when that file doesn't exist from <file>@pulseconfdir@/daemon.conf</file>. Please note that the server also reads a configuration script on startup @@ -40,9 +40,9 @@ USA. <p>The configuration file is a simple collection of variable declarations. If the configuration file parser encounters either ; - or # for it ignores the rest of the line until its end.</p> + or # it ignores the rest of the line until its end.</p> - <p>For the settings that take a boolean argument, the values + <p>For the settings that take a boolean argument the values <opt>true</opt>, <opt>yes</opt>, <opt>on</opt> and <opt>1</opt> are equivalent, resp. <opt>false</opt>, <opt>no</opt>, <opt>off</opt>, <opt>0</opt>.</p> @@ -77,6 +77,11 @@ USA. </option> <option> + <p><opt>disallow-exit=</opt> Disallow exit on user + request. Defaults to <opt>no</opt>.</p> + </option> + + <option> <p><opt>resample-method=</opt> The resampling algorithm to use. Use one of <opt>src-sinc-best-quality</opt>, <opt>src-sinc-medium-quality</opt>, <opt>src-sinc-fastest</opt>, @@ -106,6 +111,16 @@ USA. </option> <option> + <p><opt>disable-lfe-remixing=</opt> When upmixing or downmixing + ignore LFE channels. When this option is on the output LFE + channel will only get a signal when an input LFE channel is + available as well. If no input LFE channel is available the + output LFE channel will always be 0. If no output LFE channel is + available the signal on the input LFE channel will be + ignored. Defaults to "on".</p> + </option> + + <option> <p><opt>use-pid-file=</opt> Create a PID file in <file>/tmp/pulse-$USER/pid</file>. Of this is enabled you may use commands like <opt>--kill</opt> or <opt>--check</opt>. If @@ -141,6 +156,15 @@ USA. argument takes precedence.</p> </option> + <option> + <p><opt>shm-size-bytes=</opt> Sets the shared memory segment + size for the daemon, in bytes. If left unspecified or is set to 0 + it will default to some system-specific default, usually 64 + MiB. Please note that usually there is no need to change this + value, unless you are running an OS kernel that does not do + memory overcommit.</p> + </option> + </section> <section name="Scheduling"> @@ -230,9 +254,17 @@ USA. default script file. The default behaviour is to load <file>~/.pulse/default.pa</file>, and if that file does not exist fall back to the system wide installed version - <file>@pulseconfdir@/default.pa</file>. If <opt>-n</opt> is - passed on the command line the default configuration script is - ignored.</p> + <file>@pulseconfdir@/default.pa</file>. If run in system-wide + mode the file <file>@pulseconfdir@/system.pa</file> is used + instead. If <opt>-n</opt> is passed on the command line + or <opt>default-script-file=</opt> is disabled the default + configuration script is ignored.</p> + </option> + + <option> + <p><opt>default-script-file=</opt> Load the default + configuration script file as specified + in <opt>default-script-file=</opt>. Defaults to "yes".</p> </option> </section> @@ -272,6 +304,9 @@ USA. <p><opt>rlimit-as</opt> Defaults to -1.</p> </option> <option> + <p><opt>rlimit-rss</opt> Defaults to -1.</p> + </option> + <option> <p><opt>rlimit-core</opt> Defaults to -1.</p> </option> <option> @@ -290,6 +325,15 @@ USA. <p><opt>rlimit-nproc</opt> Defaults to -1.</p> </option> <option> + <p><opt>rlimit-locks</opt> Defaults to -1.</p> + </option> + <option> + <p><opt>rlimit-sigpending</opt> Defaults to -1.</p> + </option> + <option> + <p><opt>rlimit-msgqueue</opt> Defaults to -1.</p> + </option> + <option> <p><opt>rlimit-memlock</opt> Defaults to 16 KiB. Please note that the JACK client libraries may require more locked memory.</p> @@ -307,6 +351,9 @@ USA. <opt>realtime-scheduling</opt> is enabled. The JACK client libraries require a real-time prority of 9 by default. </p> </option> + <option> + <p><opt>rlimit-rttime</opt> Defaults to 1000000.</p> + </option> </section> @@ -319,9 +366,11 @@ USA. <option> <p><opt>default-sample-format=</opt> The default sampling format. Specify one of <opt>u8</opt>, <opt>s16le</opt>, - <opt>s16be</opt>, <opt>float32le</opt>, <opt>float32be</opt>, + <opt>s16be</opt>, <opt>s32le</opt>, + <opt>s32be</opt>, <opt>float32le</opt>, <opt>float32be</opt>, <opt>ulaw</opt>, <opt>alaw</opt>. Depending on the endianess of - the CPU the formats <opt>s16ne</opt>, <opt>s16re</opt>, + the CPU the + formats <opt>s16ne</opt>, <opt>s16re</opt>, <opt>s32ne</opt>, <opt>s32re</opt>, <opt>float32ne</opt>, <opt>float32re</opt> (for native, resp. reverse endian) are available as aliases.</p> </option> diff --git a/man/pulseaudio.1.xml.in b/man/pulseaudio.1.xml.in index 0e008c3d..df828242 100644 --- a/man/pulseaudio.1.xml.in +++ b/man/pulseaudio.1.xml.in @@ -127,7 +127,7 @@ USA. </option> <option> - <p><opt>-D | --daemon</opt><arg>[=BOOL]</arg></p> + <p><opt>-D | --daemonize</opt><arg>[=BOOL]</arg></p> <optdesc><p>Daemonize after startup, i.e. detach from the terminal.</p></optdesc> |