[Mplayer-cvslog] CVS: main cfg-mplayer.h,1.157,1.158

[Alex Beregszaszi]

Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv3957

Modified Files:
	cfg-mplayer.h 
Log Message:
eq handling reworked

Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- cfg-mplayer.h	8 Jul 2002 07:20:37 -0000	1.157
+++ cfg-mplayer.h	24 Jul 2002 17:25:13 -0000	1.158
@@ -47,17 +47,14 @@
 extern int vo_vsync;
 extern int vo_fsmode;
 extern int vo_dbpp;
-/* gamma correction */
+extern int vo_directrendering;
+extern int vd_use_slices;
+extern float vo_panscan;
+/* only used by startup (setting these values from configfile) */
 extern int vo_gamma_brightness;
 extern int vo_gamma_saturation;
 extern int vo_gamma_contrast;
 extern int vo_gamma_hue;
-extern int vo_gamma_red_intensity;
-extern int vo_gamma_green_intensity;
-extern int vo_gamma_blue_intensity;
-extern int vo_directrendering;
-extern int vd_use_slices;
-extern float vo_panscan;
 
 #ifdef USE_OSD
 extern int osd_level;
@@ -254,14 +251,10 @@
 	{"xineramascreen", &xinerama_screen, CONF_TYPE_INT, CONF_RANGE, 0, 32, NULL},
 #endif
 
-	// dunno what, imho not used, or vidix stuff?
-	{"brightness",&vo_gamma_brightness, CONF_TYPE_INT, CONF_RANGE, -1000, 1000, NULL},
-	{"saturation",&vo_gamma_saturation, CONF_TYPE_INT, CONF_RANGE, -1000, 1000, NULL},
-	{"contrast",&vo_gamma_contrast, CONF_TYPE_INT, CONF_RANGE, -1000, 1000, NULL},
-	{"hue",&vo_gamma_hue, CONF_TYPE_INT, CONF_RANGE, -1000, 1000, NULL},
-	{"red_intensity",&vo_gamma_red_intensity, CONF_TYPE_INT, CONF_RANGE, -1000, 1000, NULL},
-	{"green_intensity",&vo_gamma_green_intensity, CONF_TYPE_INT, CONF_RANGE, -1000, 1000, NULL},
-	{"blue_intensity",&vo_gamma_blue_intensity, CONF_TYPE_INT, CONF_RANGE, -1000, 1000, NULL},
+	{"brightness",&vo_gamma_brightness, CONF_TYPE_INT, CONF_RANGE, -100, 100, NULL},
+	{"saturation",&vo_gamma_saturation, CONF_TYPE_INT, CONF_RANGE, -100, 100, NULL},
+	{"contrast",&vo_gamma_contrast, CONF_TYPE_INT, CONF_RANGE, -100, 100, NULL},
+	{"hue",&vo_gamma_hue, CONF_TYPE_INT, CONF_RANGE, -100, 100, NULL},
 
 	// direct rendering (decoding to video out buffer)
 	{"dr", &vo_directrendering, CONF_TYPE_FLAG, 0, 0, 1, NULL},