# HG changeset patch
# User henry
# Date 1060260015 0
# Node ID dd25723311426a0ad8bc10d01a958e4cc38d927f
# Parent  31f12f99118b2d9759b7ff3e37075ec85fae2b3b
10l - some forgotten ifdefs

diff -r 31f12f99118b -r dd2572331142 cfg-common.h
--- a/cfg-common.h	Thu Aug 07 12:24:35 2003 +0000
+++ b/cfg-common.h	Thu Aug 07 12:40:15 2003 +0000
@@ -304,7 +304,7 @@
 	{"contrast", &tv_param_contrast, CONF_TYPE_INT, CONF_RANGE, -100, 100, NULL},
 	{"hue", &tv_param_hue, CONF_TYPE_INT, CONF_RANGE, -100, 100, NULL},
 	{"saturation", &tv_param_saturation, CONF_TYPE_INT, CONF_RANGE, -100, 100, NULL},
-#ifdef HAVE_TV_V4L
+#if defined(HAVE_TV_V4L) || defined(HAVE_TV_V4L2)
 	{"amode", &tv_param_amode, CONF_TYPE_INT, CONF_RANGE, 0, 3, NULL},
 	{"volume", &tv_param_volume, CONF_TYPE_INT, CONF_RANGE, 0, 65535, NULL},
 	{"bass", &tv_param_bass, CONF_TYPE_INT, CONF_RANGE, 0, 65535, NULL},
diff -r 31f12f99118b -r dd2572331142 libmpdemux/demuxer.c
--- a/libmpdemux/demuxer.c	Thu Aug 07 12:24:35 2003 +0000
+++ b/libmpdemux/demuxer.c	Thu Aug 07 12:40:15 2003 +0000
@@ -146,7 +146,7 @@
 
 extern int demux_tv_fill_buffer(demuxer_t *demux, demux_stream_t *ds);
 extern int demux_open_tv(demuxer_t *demuxer);
-#if defined(USE_TV) && defined(HAVE_TV_V4L)
+#if defined(USE_TV) && (defined(HAVE_TV_V4L) || defined(HAVE_TV_V4L2))
 extern void demux_close_tv(demuxer_t *demuxer);
 #endif
 #endif
@@ -177,7 +177,7 @@
       demux_close_nuv(demuxer); break;
     case DEMUXER_TYPE_MPEG_TY:
       demux_close_ty(demuxer); break;
-#if defined(USE_TV) && defined(HAVE_TV_V4L)
+#if defined(USE_TV) && (defined(HAVE_TV_V4L) || defined(HAVE_TV_V4L2))
     case DEMUXER_TYPE_TV:
 	demux_close_tv(demuxer); break;
 #endif
diff -r 31f12f99118b -r dd2572331142 libmpdemux/tvi_v4l2.c
--- a/libmpdemux/tvi_v4l2.c	Thu Aug 07 12:24:35 2003 +0000
+++ b/libmpdemux/tvi_v4l2.c	Thu Aug 07 12:40:15 2003 +0000
@@ -1619,4 +1619,4 @@
     return(priv->audio_in.blocksize);
 }
 
-#endif /* USE_TV || HAVE_TV_V4L2 */
+#endif /* USE_TV && HAVE_TV_V4L2 */