[MPlayer-cvslog] r24786 - in trunk/stream: stream_tv.c tv.h

[voroshil]

Author: voroshil
Date: Sun Oct 14 18:44:32 2007
New Revision: 24786

Log:
#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



Modified:
   trunk/stream/stream_tv.c
   trunk/stream/tv.h

Modified: trunk/stream/stream_tv.c
==============================================================================
--- trunk/stream/stream_tv.c	(original)
+++ trunk/stream/stream_tv.c	Sun Oct 14 18:44:32 2007
@@ -36,9 +36,7 @@ tv_param_t stream_tv_defaults = {
     "europe-east", //chanlist
     "pal",         //norm
     0,             //automute
-#if defined(HAVE_TV_V4L2) || defined(HAVE_TV_DSHOW)
     -1,            //normid
-#endif
     NULL,          //device
     NULL,          //driver
     -1,            //width
@@ -51,27 +49,19 @@ tv_param_t stream_tv_defaults = {
     0,             //immediate;
     44100,         //audiorate;
     0,             //audio_id
-#if defined(HAVE_TV_V4L) || defined(HAVE_TV_DSHOW)
     -1,            //amode
     -1,            //volume
-#if defined(HAVE_TV_V4L)
     -1,            //bass
     -1,            //treble
     -1,            //balance
     -1,            //forcechan
     0,             //force_audio
-#endif
     -1,            //buffer_size
-#if defined(HAVE_TV_V4L)
     0,             //mjpeg
     2,             //decimation
     90,            //quality
-#if defined(HAVE_ALSA9) || defined(HAVE_ALSA1X)
     0,             //alsa
-#endif
-#endif
     NULL,          //adevice
-#endif
     0,             //brightness
     0,             //contrast
     0,             //hue
@@ -81,16 +71,13 @@ tv_param_t stream_tv_defaults = {
     0,             //tformat
     100,           //tpage
     0,             //tlang
-
     0,             //scan_autostart
     50,            //scan_threshold
     0.5,            //scan_period
-#ifdef HAVE_TV_DSHOW
     0,             //hidden_video_renderer;
     0,             //hidden_vp_renderer;
     0,             //system_clock;
     0              //normalize_audio_chunks;
-#endif
 };
 
 #define ST_OFF(f) M_ST_OFF(tv_param_t,f)

Modified: trunk/stream/tv.h
==============================================================================
--- trunk/stream/tv.h	(original)
+++ trunk/stream/tv.h	Sun Oct 14 18:44:32 2007
@@ -11,9 +11,7 @@ typedef struct tv_param_s {
     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 @@ typedef struct tv_param_s {
     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 @@ typedef struct tv_param_s {
     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 @@ typedef struct tv_param_s {
       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;