summaryrefslogtreecommitdiffstats
path: root/man
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2007-11-21 23:03:19 +0000
committerLennart Poettering <lennart@poettering.net>2007-11-21 23:03:19 +0000
commit6b932f0a50a8459399a8b79eb91132c8bacf22b9 (patch)
treeb26812197d7f00c6a32de29fda7bb3bfd4c26052 /man
parent40db06de5f49c3fa50599e746e63aca00f07c889 (diff)
update man pages a bit
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2070 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'man')
-rw-r--r--man/pacat.1.xml.in25
-rw-r--r--man/pulse-daemon.conf.5.xml.in6
2 files changed, 31 insertions, 0 deletions
diff --git a/man/pacat.1.xml.in b/man/pacat.1.xml.in
index e02ad667..748d136d 100644
--- a/man/pacat.1.xml.in
+++ b/man/pacat.1.xml.in
@@ -145,6 +145,31 @@ USA.
<opt>aux31</opt>.</p></optdesc>
</option>
+ <option>
+ <p><opt>--fix-format</opt></p>
+ <optdesc><p>If passed, the sample format of the stream is changed to the native format of the sink the stream is connected to.</p></optdesc>
+ </option>
+
+ <option>
+ <p><opt>--fix-rate</opt></p>
+ <optdesc><p>If passed, the sampling rate of the stream is changed to the native rate of the sink the stream is connected to.</p></optdesc>
+ </option>
+
+ <option>
+ <p><opt>--fix-channels</opt></p>
+ <optdesc><p>If passed, the number of channels and the channel map of the stream is changed to the native number of channels and the native channel map of the sink the stream is connected to.</p></optdesc>
+ </option>
+
+ <option>
+ <p><opt>--no-remix</opt></p>
+ <optdesc><p>Never upmix or downmix channels.</p></optdesc>
+ </option>
+
+ <option>
+ <p><opt>--no-remap</opt></p>
+ <optdesc><p>Never remap channels. Instead of mapping channels by their name this will match them solely by their index/order.</p></optdesc>
+ </option>
+
</options>
<section name="Authors">
diff --git a/man/pulse-daemon.conf.5.xml.in b/man/pulse-daemon.conf.5.xml.in
index 88bf8f58..2768e24e 100644
--- a/man/pulse-daemon.conf.5.xml.in
+++ b/man/pulse-daemon.conf.5.xml.in
@@ -102,6 +102,12 @@ USA.
</option>
<option>
+ <p><opt>disable-remixing=</opt> Never upmix or downmix channels
+ to different channel maps. Instead, do a simple name-based
+ matching only.</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