summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Courtier-Dutton <jcdutton@users.sourceforge.net>2004-04-30 13:15:51 +0000
committerJames Courtier-Dutton <jcdutton@users.sourceforge.net>2004-04-30 13:15:51 +0000
commit3cd67be591fe75f289d4f33d11589cfa3c2e72cd (patch)
tree93208f13750d7374d3ae657d10d969d855a3e4a1
parent2390f7cd1303e7ae48d29a94b95c4f789a6b22c3 (diff)
downloadxine-lib-3cd67be591fe75f289d4f33d11589cfa3c2e72cd.tar.gz
xine-lib-3cd67be591fe75f289d4f33d11589cfa3c2e72cd.tar.bz2
Update docs regarding "speaker_arrangement" config entry changes.
CVS patchset: 6468 CVS date: 2004/04/30 13:15:51
-rw-r--r--doc/README.config_en15
-rw-r--r--doc/faq/faq.sgml8
2 files changed, 11 insertions, 12 deletions
diff --git a/doc/README.config_en b/doc/README.config_en
index a1afb82d9..18c833dae 100644
--- a/doc/README.config_en
+++ b/doc/README.config_en
@@ -61,11 +61,12 @@ audio.esd_latency latency between time of audio sample
use this to manually adjust a/v sync
for esd output
-audio.five_lfe_channel 1/0 : enable 5.1-channel playback
-
-audio.five_channel 1/0 : enable 5-channel playback
-
-audio.four_channel 1/0 : enable 4-channel playback
+audio.speaker_arrangement audio speaker arrangement.
+ (e.g. Mono, Stereo, Headphones, A52_Passthru, Surround21,
+ Surround3, Surround4, Surround41, Surround5, Surround51,
+ Surround6, Surround61, Surround71.)
+ Not supported yet: Headphones, Surround21, Surround3,
+ Surround6, Surround61, Surround71.
audio.mixer_name Name of mixer device.
@@ -130,8 +131,6 @@ codec.a52_dynrng 1/0: enable a/52 dynamic range compression
codec.a52_level 0..~200% : a/52 volume control
-codec.a52_pass_through 1/0 : enable a/52 output via spdif port
-
codec.a52_surround_downmix Enable audio downmixing to 2.0 surround stereo.
(0) off [default]
(1) on
@@ -278,4 +277,4 @@ video.num_buffers Number of video buffers (8k each) xine
---
version of this file:
- $Id: README.config_en,v 1.4 2003/10/12 19:07:40 mroi Exp $
+ $Id: README.config_en,v 1.5 2004/04/30 13:15:51 jcdutton Exp $
diff --git a/doc/faq/faq.sgml b/doc/faq/faq.sgml
index 640316f87..db046f168 100644
--- a/doc/faq/faq.sgml
+++ b/doc/faq/faq.sgml
@@ -1216,9 +1216,9 @@
the complicated way by editing the config file yourself which is located
in your home directory in <filename>.gxine</filename> or <filename>.xine</filename>:
<programlisting>
-&nbsp;&nbsp;&nbsp;audio.four_channel:1
-&nbsp;&nbsp;&nbsp;audio.five_channel:1
-&nbsp;&nbsp;&nbsp;audio.five_lfe_channel:0</programlisting>
+&nbsp;&nbsp;&nbsp;audio.speaker_arrangement:4
+&nbsp;&nbsp;&nbsp;audio.speaker_arrangement:4.1
+&nbsp;&nbsp;&nbsp;audio.speaker_arrangement:5.1</programlisting>
</para>
</sect2>
@@ -1229,7 +1229,7 @@
surround (see above). You can either use the config dialog or edit
the config file (<filename>~/.xine/config</filename> or <filename>~/.gxine/config</filename>)
yourself:
- <programlisting>&nbsp;&nbsp;&nbsp;audio.a52_pass_through:1</programlisting>
+ <programlisting>&nbsp;&nbsp;&nbsp;audio.speaker_arrangement:A52_Passthru</programlisting>
</para>
</sect2>