[MPlayer-cvslog] 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

[Diego Biurrun]

Please keep mplayer-cvslog CCed at least, thanks.

On Wed, Aug 30, 2006 at 01:38:34AM +0700, Vladimir Voroshilov wrote:
> Diego Biurrun wrote: 
> > On Mon, Aug 28, 2006 at 07:05:21PM +0200, reimar wrote:
> > > 
> > > --- trunk/configure	(original)
> > > +++ trunk/configure	Mon Aug 28 19:05:18 2006
> > One-space indentation - ugh ..
> radio_one_space_fix.patch

Applied.

> > > --- trunk/input/input.c	(original)
> > > +++ trunk/input/input.c	Mon Aug 28 19:05:18 2006
> > > @@ -47,6 +47,11 @@
> > >  /// is the default value wich is used for optional arguments
> > >  
> > >  static mp_cmd_t mp_cmds[] = {
> > > +#ifdef USE_RADIO
> > > +  { MP_CMD_RADIO_STEP_CHANNEL, "radio_step_channel", 1,  { { MP_CMD_ARG_INT ,{0}}, {-1,{0}} }},
> > > +  { MP_CMD_RADIO_SET_CHANNEL, "radio_set_channel", 1, { { MP_CMD_ARG_STRING, {0}}, {-1,{0}}  }},
> > > +  { MP_CMD_RADIO_SET_FREQ, "radio_set_freq", 1, { {MP_CMD_ARG_FLOAT,{0}}, {-1,{0}} } },
> > 
> > These need to be documented in DOCS/tech/slave.txt.
> radio_slave.txt.patch

Applied.

> > > --- (empty file)
> > > +++ trunk/stream/stream_radio.c	Mon Aug 28 19:05:18 2006
> > > @@ -0,0 +1,1108 @@
> > > +
> > > +#include "config.h"
> > 
> > This is ugly, it should go along with the other #include lines below the
> > license header..
> radio_v4l_check.patch

Applied.

> > > +#if !defined(HAVE_ALSA9) && !defined(HAVE_ALSA1X) && !defined(USE_OSS_AUDIO) && defined(USE_RADIO_CAPTURE)
> > > +#warning "Neither alsa1x, alsa9 nor oss found. Radio capture disabled"
> > > +#undef USE_RADIO_CAPTURE
> > > +#endif
> > > +
> > > +#if !defined(HAVE_RADIO_V4L) && !defined(HAVE_RADIO_V4L2)
> > > +#error "This driver requires V4L1 or V4L2!"
> > > +#endif
> > 
> > This is superfluous, the driver should not be compiled if these are not
> > present.
> > 
> radio_v4l_check.patch

Applied, but you should also remove the first test that disables radio
capture, this belongs in configure as well.

Diego