From 2585d1e148c0fa984b7255d558d4300613bc1388 Mon Sep 17 00:00:00 2001
From: voroshil <voroshil@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 14 Oct 2007 16:44:32 +0000
Subject: #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

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24786 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 stream/tv.h | 13 -------------
 1 file changed, 13 deletions(-)

(limited to 'stream/tv.h')

diff --git a/stream/tv.h b/stream/tv.h
index acd78f108f..7dc87c53f2 100644
--- a/stream/tv.h
+++ b/stream/tv.h
@@ -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;
-- 
cgit v1.2.3