Mercurial > mplayer.hg
diff stream/tv.h @ 23882:d5be90343fac
Removing global variables from tv://
Step 1: introducing new structure, fixing tv:// stream
author | voroshil |
---|---|
date | Sun, 29 Jul 2007 10:11:24 +0000 |
parents | 5a5c7866921f |
children | d65439444b75 |
line wrap: on
line diff
--- a/stream/tv.h Sun Jul 29 03:55:12 2007 +0000 +++ b/stream/tv.h Sun Jul 29 10:11:24 2007 +0000 @@ -47,6 +47,52 @@ extern int tv_param_hue; extern int tv_param_saturation; +typedef struct tv_param_s { + char *freq; + char *channel; + char *chanlist; + char *norm; + int automute; +#ifdef HAVE_TV_V4L2 + int normid; +#endif + char *device; + char *driver; + int width; + int height; + int input; + int outfmt; + float fps; + char **channels; + int noaudio; + int immediate; + int audiorate; + int audio_id; +#if defined(HAVE_TV_V4L) + int amode; + int volume; + int bass; + int treble; + int balance; + int forcechan; + int force_audio; + int buffer_size; + int mjpeg; + int decimation; + int quality; +#if defined(HAVE_ALSA9) || defined(HAVE_ALSA1X) + int alsa; +#endif + char* adevice; +#endif + int brightness; + int contrast; + int hue; + int saturation; +} tv_param_t; + +extern tv_param_t stream_tv_defaults; + typedef struct tvi_info_s { struct tvi_handle_s * (*tvi_init)(char *device,char *adevice); @@ -78,6 +124,7 @@ int chanlist; const struct CHANLIST *chanlist_s; int channel; + tv_param_t * tv_param; } tvi_handle_t; typedef struct tv_channels_s {