[MPlayer-DOCS] r19574 - in trunk: AUTHORS ChangeLog DOCS/man/en/mplayer.1 DOCS/xml/en/documentation.xml DOCS/xml/en/install.xml DOCS/xml/ru/features.xml DOCS/xml/ru/install.xml cfg-common.h configure help/help_mp-en.h input/input.c input/input.h mp_msg.h mplayer.c stream/Makefile stream/stream.c stream/stream.h stream/stream_radio.c stream/stream_radio.h

[reimar]

Author: reimar
Date: Mon Aug 28 19:05:18 2006
New Revision: 19574

Modified:
   trunk/DOCS/man/en/mplayer.1
   trunk/DOCS/xml/en/documentation.xml
   trunk/DOCS/xml/en/install.xml

Changes in other areas also in this revision:
Added:
   trunk/stream/stream_radio.c
   trunk/stream/stream_radio.h
Modified:
   trunk/AUTHORS
   trunk/ChangeLog
   trunk/DOCS/xml/ru/features.xml
   trunk/DOCS/xml/ru/install.xml
   trunk/cfg-common.h
   trunk/configure
   trunk/help/help_mp-en.h
   trunk/input/input.c
   trunk/input/input.h
   trunk/mp_msg.h
   trunk/mplayer.c
   trunk/stream/Makefile
   trunk/stream/stream.c
   trunk/stream/stream.h

Log:
Radio support, patch by Vladimir Voroshilov (voroshil gmail com)


Modified: trunk/DOCS/man/en/mplayer.1
==============================================================================
--- trunk/DOCS/man/en/mplayer.1	(original)
+++ trunk/DOCS/man/en/mplayer.1	Mon Aug 28 19:05:18 2006
@@ -88,6 +88,13 @@
 .in
 .B mplayer
 'in +\n[.k]u
+.I radio://[channel or frequency][/capture]
+[options]
+.
+.br
+.in
+.B mplayer
+'in +\n[.k]u
 .I pvr://
 [options]
 .
@@ -1542,6 +1549,55 @@
 Can be used with \-vid and \-aid.
 .
 .TP
+.B \-radio <option1:option2:...> (Radio only)
+This options set variaous parameters of radio capture module
+For listening radio with MPlayer use 'radio://<frequency>' 
+(if channels option is not given) or
+'radio://<channel_number>' (if channels option is given) as
+a movie URL. To start grabbing subsystem, please use 
+radio://<frequency or channel>/capture. If capture keyword is not given
+your can listen radio using line-in cable only. Using capture
+to listening is not recommended due to synchronization problems, which
+makes this process uncomfortable.
+.sp 1
+Available options are:
+.RSs
+.IPs device=<value>
+radio device to use (default /dev/radio0)
+.IPs driver=<value>
+radio driver to use (default v4l2 if available, otherwise v4l). Currently supported
+v4l and v4l2 drivers.
+.IPs volume=<0..100>
+sound volume for radio device (default 100)
+.IPs channels=<frequency>\-<name>,<frequency>\-<name>,...
+Set channel list.
+Use _ for spaces in names (or play with quoting ;-).
+The channel names will then be written using OSD, and the slave commands
+radio_step_channel and radio_set_channel will be usable for
+a remote control (see LIRC).
+If given, number in movie URL will be treated as channel position in
+channel list.
+.br
+.I EXAMPLE:
+radio://1, radio://104.4, radio_set_channel 1
+.IPs adevice=<value> (with radio capture enabled)
+Name of device to capture sound from. If not given capture will be
+disabled, even if capture keyword in URL used. For alsa devices use it 
+in form hw=<card>.<device>. If device
+name contain '=' module will use ALSA to capture, otherwise - OSS.
+.IPs arate=<value> (with radio capture enabled)
+Rate in samples per second (default 44100).
+.br
+.I NOTE:
+When using audio capture set also 
+-rawaudio rate=<value> option with the same value as arate. If
+you have problems with sound speed (too quickl) try to play with 
+different values of rate (e.g. 48000,44100,32000,...).
+.IPs achannels=<value> (with radio capture enabled)
+number of audio channels to capture
+.RE
+.
+.TP
 .B \-tv <option1:option2:...> (TV/PVR only)
 This option tunes various properties of the TV capture module.
 For watching TV with MPlayer, use 'tv://' or 'tv://<channel_number>'

Modified: trunk/DOCS/xml/en/documentation.xml
==============================================================================
--- trunk/DOCS/xml/en/documentation.xml	(original)
+++ trunk/DOCS/xml/en/documentation.xml	Mon Aug 28 19:05:18 2006
@@ -185,6 +185,7 @@
 &video.xml;
 &audio.xml;
 &tvinput.xml;
+&radio.xml;
 
 &ports.xml;
 &mencoder.xml;

Modified: trunk/DOCS/xml/en/install.xml
==============================================================================
--- trunk/DOCS/xml/en/install.xml	(original)
+++ trunk/DOCS/xml/en/install.xml	Mon Aug 28 19:05:18 2006
@@ -434,6 +434,11 @@
   read the <link linkend="tv-input">TV input</link> section.
   </para></listitem>
 <listitem><para>
+  If you have a V4L compatible <emphasis role="bold">Radio tuner</emphasis> card,
+  and wish to listen and capture sound with <application>MPlayer</application>,
+  read the <link linkend="radio">Radio</link> section.
+  </para></listitem>
+<listitem><para>
   There is a neat <emphasis role="bold">OSD Menu</emphasis> support ready to be
   used. Check the <link linkend="subosd">OSD menu</link> section.
   </para></listitem>