Mercurial > mplayer.hg
diff stream/tv.h @ 24758:8383cea01fff
#ifdef's in tv.c and tv.h becomes more and more hard to maintain.
I've decided to remove all of them and control options only through cfg-common.h
author | voroshil |
---|---|
date | Sun, 14 Oct 2007 16:44:32 +0000 |
parents | d81eef9beb1b |
children | c6c7a09bf439 |
line wrap: on
line diff
--- a/stream/tv.h Sun Oct 14 12:11:28 2007 +0000 +++ b/stream/tv.h Sun Oct 14 16:44:32 2007 +0000 @@ -11,9 +11,7 @@ char *chanlist; char *norm; int automute; -#if defined(HAVE_TV_V4L2) || defined(HAVE_TV_DSHOW) int normid; -#endif char *device; char *driver; int width; @@ -26,27 +24,19 @@ int immediate; int audiorate; int audio_id; -#if defined(HAVE_TV_V4L) || defined(HAVE_TV_DSHOW) int amode; int volume; -#if defined(HAVE_TV_V4L) int bass; int treble; int balance; int forcechan; int force_audio; -#endif int buffer_size; -#if defined(HAVE_TV_V4L) int mjpeg; int decimation; int quality; -#if defined(HAVE_ALSA9) || defined(HAVE_ALSA1X) int alsa; -#endif -#endif char* adevice; -#endif int brightness; int contrast; int hue; @@ -60,8 +50,6 @@ int scan; int scan_threshold; float scan_period; - -#ifdef HAVE_TV_DSHOW /** Terminate stream with video renderer instead of Null renderer Will help if video freezes but audio does not. @@ -88,7 +76,6 @@ It will create audio chunks with time length equal to one video frame time. */ int normalize_audio_chunks; -#endif } tv_param_t; extern tv_param_t stream_tv_defaults;