[MPlayer-cvslog] r24772 - in trunk: DOCS/man/en/mplayer.1 cfg-common.h configure help/help_mp-en.h stream/Makefile stream/stream_tv.c stream/tv.c stream/tv.h stream/tvi_dshow.c stream/tvi_dshow.h

[Reimar Döffinger]

Hello,
On Sat, Oct 13, 2007 at 07:14:40PM +0200, voroshil wrote:
> Modified: trunk/cfg-common.h
> ==============================================================================
> --- trunk/cfg-common.h	(original)
> +++ trunk/cfg-common.h	Sat Oct 13 19:14:39 2007
> @@ -426,7 +426,7 @@ m_option_t tvopts_conf[]={
>  	{"chanlist", &stream_tv_defaults.chanlist, CONF_TYPE_STRING, 0, 0, 0, NULL},
>  	{"norm", &stream_tv_defaults.norm, CONF_TYPE_STRING, 0, 0, 0, NULL},
>  	{"automute", &stream_tv_defaults.automute, CONF_TYPE_INT, CONF_RANGE, 0, 255, NULL},
> -#ifdef HAVE_TV_V4L2
> +#if defined(HAVE_TV_V4L2) || defined(HAVE_TV_DSHOW)
>  	{"normid", &stream_tv_defaults.normid, CONF_TYPE_INT, 0, 0, 0, NULL},
>  #endif
>  	{"width", &stream_tv_defaults.width, CONF_TYPE_INT, 0, 0, 4096, NULL},
> @@ -440,9 +440,12 @@ m_option_t tvopts_conf[]={
>  	{"hue", &stream_tv_defaults.hue, CONF_TYPE_INT, CONF_RANGE, -100, 100, NULL},
>  	{"saturation", &stream_tv_defaults.saturation, CONF_TYPE_INT, CONF_RANGE, -100, 100, NULL},
>  	{"gain", &stream_tv_defaults.gain, CONF_TYPE_INT, CONF_RANGE, -1, 100, NULL},
> -#if defined(HAVE_TV_V4L) || defined(HAVE_TV_V4L2)
> +#if defined(HAVE_TV_V4L) || defined(HAVE_TV_V4L2) || defined(HAVE_TV_DSHOW)
> +	{"buffersize", &stream_tv_defaults.buffer_size, CONF_TYPE_INT, CONF_RANGE, 16, 1024, NULL},
>  	{"amode", &stream_tv_defaults.amode, CONF_TYPE_INT, CONF_RANGE, 0, 3, NULL},
>  	{"volume", &stream_tv_defaults.volume, CONF_TYPE_INT, CONF_RANGE, 0, 65535, NULL},
> +#endif
> +#if defined(HAVE_TV_V4L) || defined(HAVE_TV_V4L2)
>  	{"bass", &stream_tv_defaults.bass, CONF_TYPE_INT, CONF_RANGE, 0, 65535, NULL},
>  	{"treble", &stream_tv_defaults.treble, CONF_TYPE_INT, CONF_RANGE, 0, 65535, NULL},
>  	{"balance", &stream_tv_defaults.balance, CONF_TYPE_INT, CONF_RANGE, 0, 65535, NULL},
> @@ -464,6 +467,16 @@ m_option_t tvopts_conf[]={
>  	{"tlang", &stream_tv_defaults.tlang, CONF_TYPE_INT, CONF_RANGE, -1, 0x7f, NULL},
>  #endif /* HAVE_TV_TELETEXT */
>  	{"audioid", &stream_tv_defaults.audio_id, CONF_TYPE_INT, CONF_RANGE, 0, 9, NULL},

Hmm.. this is not your fault (at least not in this patch) since it was like that before, but the
>        {"adevice", &stream_tv_defaults.adevice, CONF_TYPE_STRING, 0, 0, 0, NULL},
is now unconditional, whereas adevice is under
> #if defined(HAVE_TV_V4L) || defined(HAVE_TV_DSHOW)

in tv.h.
And there are quite a few other #ifdefs that just don't fit.
Could somebody please clean this mess up a bit?
Preferably this would involve reducing the number of ifdefs as well, and
since that needs shuffling the struct members around, in stream_tv.c
things like
>     NULL,          //freq
>     NULL,          //channel
>     "europe-east", //chanlist

should be changed to

>  .freq = NULL,
>  .channel = NULL,
...

first...

Greetings,
Reimar Döffinger