intense -> intensity

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4318 b3059339-0415-0410-9bf9-f77b7e298cf2

4 files changed, 34 insertions, 30 deletions

diff --git a/cfg-mplayer.h b/cfg-mplayer.h
index 50a68dad70..fb8ac9a0f0 100644
--- a/cfg-mplayer.h
+++ b/cfg-mplayer.h
@@ -44,9 +44,9 @@ 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_intense;
-extern int vo_gamma_green_intense;
-extern int vo_gamma_blue_intense;
+extern int vo_gamma_red_intensity;
+extern int vo_gamma_green_intensity;
+extern int vo_gamma_blue_intensity;
 #endif
 
 #ifdef USE_SUB
@@ -253,9 +253,9 @@ static config_t mplayer_opts[]={
 	{"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_intense",&vo_gamma_red_intense, CONF_TYPE_INT, CONF_RANGE, -1000, 1000, NULL},
-	{"green_intense",&vo_gamma_green_intense, CONF_TYPE_INT, CONF_RANGE, -1000, 1000, NULL},
-	{"blue_intense",&vo_gamma_blue_intense, 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},
 #endif
 
 #ifdef HAVE_AA
diff --git a/libvo/video_out.c b/libvo/video_out.c
index 1e2eac5b13..fee4b188b6 100644
--- a/libvo/video_out.c
+++ b/libvo/video_out.c
@@ -54,9 +54,9 @@ int vo_gamma_brightness=0;
 int vo_gamma_saturation=0;
 int vo_gamma_contrast=0;
 int vo_gamma_hue=0;
-int vo_gamma_red_intense=0;
-int vo_gamma_green_intense=0;
-int vo_gamma_blue_intense=0;
+int vo_gamma_red_intensity=0;
+int vo_gamma_green_intensity=0;
+int vo_gamma_blue_intensity=0;
 //
 // Externally visible list of all vo drivers
 //
diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c
index 31b2669240..c70d924aeb 100644
--- a/libvo/vo_xv.c
+++ b/libvo/vo_xv.c
@@ -118,9 +118,9 @@ 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_intense;
-extern int vo_gamma_green_intense;
-extern int vo_gamma_blue_intense;
+extern int vo_gamma_red_intensity;
+extern int vo_gamma_green_intensity;
+extern int vo_gamma_blue_intensity;
 
 static void set_gamma_correction( unsigned int xv_port )
 {
diff --git a/libvo/vosub_vidix.c b/libvo/vosub_vidix.c
index 24af5bedd9..b8b757ab3d 100644
--- a/libvo/vosub_vidix.c
+++ b/libvo/vosub_vidix.c
@@ -166,9 +166,9 @@ 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_intense;
-extern int vo_gamma_green_intense;
-extern int vo_gamma_blue_intense;
+extern int vo_gamma_red_intensity;
+extern int vo_gamma_green_intensity;
+extern int vo_gamma_blue_intensity;
 
 static vidix_video_eq_t vid_eq;
 
@@ -189,26 +189,30 @@ int vidix_start(void)
 	       "vosub_vidix: vo_gamma_saturation=%i\n"
 	       "vosub_vidix: vo_gamma_contrast=%i\n"
 	       "vosub_vidix: vo_gamma_hue=%i\n"
-	       "vosub_vidix: vo_gamma_red_intense=%i\n"
-	       "vosub_vidix: vo_gamma_green_intense=%i\n"
-	       "vosub_vidix: vo_gamma_blue_intense=%i\n"
+	       "vosub_vidix: vo_gamma_red_intensity=%i\n"
+	       "vosub_vidix: vo_gamma_green_intensity=%i\n"
+	       "vosub_vidix: vo_gamma_blue_intensity=%i\n"
 	       ,vo_gamma_brightness
 	       ,vo_gamma_saturation
 	       ,vo_gamma_contrast
 	       ,vo_gamma_hue
-	       ,vo_gamma_red_intense
-	       ,vo_gamma_green_intense
-	       ,vo_gamma_blue_intense);
+	       ,vo_gamma_red_intensity
+	       ,vo_gamma_green_intensity
+	       ,vo_gamma_blue_intensity);
+	}
+        /* To use full set of vid_eq.cap */
+	if(vdlPlaybackGetEq(vidix_handler,&vid_eq) == 0)
+	{
+		vid_eq.brightness = vo_gamma_brightness;
+		vid_eq.saturation = vo_gamma_saturation;
+		vid_eq.contrast = vo_gamma_contrast;
+		vid_eq.hue = vo_gamma_hue;
+		vid_eq.red_intensity = vo_gamma_red_intensity;
+		vid_eq.green_intensity = vo_gamma_green_intensity;
+		vid_eq.blue_intensity = vo_gamma_blue_intensity;
+		vid_eq.flags = VEQ_FLG_ITU_R_BT_601;
+		vdlPlaybackSetEq(vidix_handler,&vid_eq);
 	}
-	vid_eq.brightness = vo_gamma_brightness;
-	vid_eq.saturation = vo_gamma_saturation;
-	vid_eq.contrast = vo_gamma_contrast;
-	vid_eq.hue = vo_gamma_hue;
-	vid_eq.red_intense = vo_gamma_red_intense;
-	vid_eq.green_intense = vo_gamma_green_intense;
-	vid_eq.blue_intense = vo_gamma_blue_intense;
-	vid_eq.flags = VEQ_FLG_ITU_R_BT_601;
-	vdlPlaybackSetEq(vidix_handler,&vid_eq);
     }
     return 0;
 }