[MPlayer-DOCS] r31980 - in trunk/DOCS/xml: cs/documentation.xml cs/radio.xml cs/usage.xml de/documentation.xml de/radio.xml de/usage.xml en/documentation.xml en/radio.xml en/usage.xml es/radio.xml es/usage.xml fr...

[diego]

Author: diego
Date: Thu Aug 19 01:10:10 2010
New Revision: 31980

Log:
Merge radio chapter into the usage chapter.
This improves the overall structure of the documentation.

Deleted:
   trunk/DOCS/xml/en/radio.xml
Modified:
   trunk/DOCS/xml/en/documentation.xml
   trunk/DOCS/xml/en/usage.xml

Changes in other areas also in this revision:
Deleted:
   trunk/DOCS/xml/cs/radio.xml
   trunk/DOCS/xml/de/radio.xml
   trunk/DOCS/xml/es/radio.xml
   trunk/DOCS/xml/fr/radio.xml
   trunk/DOCS/xml/hu/radio.xml
   trunk/DOCS/xml/it/radio.xml
   trunk/DOCS/xml/pl/radio.xml
   trunk/DOCS/xml/ru/radio.xml
   trunk/DOCS/xml/zh_CN/radio.xml
Modified:
   trunk/DOCS/xml/cs/documentation.xml
   trunk/DOCS/xml/cs/usage.xml
   trunk/DOCS/xml/de/documentation.xml
   trunk/DOCS/xml/de/usage.xml
   trunk/DOCS/xml/es/usage.xml
   trunk/DOCS/xml/fr/documentation.xml
   trunk/DOCS/xml/fr/usage.xml
   trunk/DOCS/xml/hu/documentation.xml
   trunk/DOCS/xml/hu/usage.xml
   trunk/DOCS/xml/it/documentation.xml
   trunk/DOCS/xml/it/usage.xml
   trunk/DOCS/xml/pl/documentation.xml
   trunk/DOCS/xml/pl/usage.xml
   trunk/DOCS/xml/ru/documentation.xml
   trunk/DOCS/xml/ru/usage.xml
   trunk/DOCS/xml/zh_CN/documentation.xml
   trunk/DOCS/xml/zh_CN/usage.xml

Modified: trunk/DOCS/xml/en/documentation.xml
==============================================================================
--- trunk/DOCS/xml/en/documentation.xml	Thu Aug 19 00:42:27 2010	(r31979)
+++ trunk/DOCS/xml/en/documentation.xml	Thu Aug 19 01:10:10 2010	(r31980)
@@ -166,7 +166,6 @@ can be distributed under the terms of th
 &install.xml;
 
 &usage.xml;
-&radio.xml;
 &video.xml;
 &ports.xml;
 &mencoder.xml;

Modified: trunk/DOCS/xml/en/usage.xml
==============================================================================
--- trunk/DOCS/xml/en/usage.xml	Thu Aug 19 00:42:27 2010	(r31979)
+++ trunk/DOCS/xml/en/usage.xml	Thu Aug 19 01:10:10 2010	(r31980)
@@ -1521,4 +1521,98 @@ Here is an example for Russian:
 </sect2>
 
 </sect1>
+
+<!-- ********** -->
+
+<sect1 id="radio">
+<title>Radio</title>
+
+<para>
+This section is about how to enable listening to radio from
+a V4L-compatible radio tuner. See the man page for a
+description of radio options and keyboard controls.
+</para>
+
+<!-- ********** -->
+
+<sect2 id="radio-tips">
+<title>Usage tips</title>
+
+<para>
+The full listing of the options is available in the manual page.
+Here are just a few tips:
+
+<itemizedlist>
+<listitem><para>
+  Make sure your tuner works with another radio software in Linux, for
+  example <application>XawTV</application>.
+</para></listitem>
+<listitem><para>
+  Use the <option>channels</option> option. An example:
+  <screen>-radio channels=104.4-Sibir,103.9-Maximum</screen>
+  Explanation: With this option, only the 104.4 and 103.9 radio stations
+  will be usable. There will be a nice OSD text upon channel switching,
+  displaying the channel's name. Spaces in the channel name must be
+  replaced by the "_" character.
+</para></listitem>
+<listitem><para>
+  There are several ways of capturing audio. You can grab the sound either using
+  your sound card via an external cable connection between video card and
+  line-in, or using the built-in ADC in the saa7134 chip. In the latter case,
+  you have to load the <systemitem>saa7134-alsa</systemitem> or
+  <systemitem>saa7134-oss</systemitem> driver.
+</para></listitem>
+<listitem><para>
+  <application>MEncoder</application> cannot be used for audio capture,
+  because it requires a video stream to work. So your can either use
+  <application>arecord</application> from ALSA project or
+  use <option>-ao pcm:file=file.wav</option>. In the latter case you
+  will not hear any sound (unless you are using a line-in cable and
+  have switched line-in mute off).
+</para></listitem>
+</itemizedlist>
+</para>
+</sect2>
+
+<!-- ********** -->
+
+<sect2 id="radio-examples">
+<title>Examples</title>
+
+<informalexample><para>
+Input from standard V4L (using line-in cable, capture switched off):
+<screen>mplayer radio://104.4</screen>
+</para></informalexample>
+
+<informalexample><para>
+Input from standard V4L (using line-in cable, capture switched off,
+V4Lv1 interface):
+<screen>mplayer -radio driver=v4l radio://104.4</screen>
+</para></informalexample>
+
+<informalexample><para>
+Playing second channel from channel list:
+<screen>mplayer -radio channels=104.4=Sibir,103.9=Maximm radio://2</screen>
+</para></informalexample>
+
+<informalexample>
+<para>
+Passing sound over the PCI bus from the radio card's internal ADC.
+In this example the tuner is used as a second sound card
+(ALSA device hw:1,0). For saa7134-based cards either the
+<systemitem>saa7134-alsa</systemitem> or <systemitem>saa7134-oss</systemitem>
+module must be loaded.
+<screen>
+mplayer -rawaudio rate=32000 radio://2/capture \
+    -radio adevice=hw=1.0:arate=32000:channels=104.4=Sibir,103.9=Maximm
+</screen>
+<note><para>
+When using ALSA device names colons must be replaced
+by equal signs, commas by periods.
+</para></note>
+</para>
+</informalexample>
+</sect2>
+
+</sect1>
 </chapter>