[Mplayer-cvslog] CVS: main/libvo video_out.c,1.35,1.36 vo_xv.c,1.43,1.44 vosub_vidix.c,1.16,1.17

[Nick Kurshev]

Update of /cvsroot/mplayer/main/libvo
In directory mplayer:/var/tmp.root/cvs-serv18699/main/libvo

Modified Files:
	video_out.c vo_xv.c vosub_vidix.c 
Log Message:
intense -> intensity

Index: video_out.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/video_out.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- video_out.c	18 Jan 2002 09:11:09 -0000	1.35
+++ video_out.c	23 Jan 2002 16:54:29 -0000	1.36
@@ -54,9 +54,9 @@
 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
 //

Index: vo_xv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xv.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- vo_xv.c	23 Jan 2002 15:16:20 -0000	1.43
+++ vo_xv.c	23 Jan 2002 16:54:29 -0000	1.44
@@ -118,9 +118,9 @@
 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 )
 {

Index: vosub_vidix.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vosub_vidix.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- vosub_vidix.c	20 Jan 2002 13:29:02 -0000	1.16
+++ vosub_vidix.c	23 Jan 2002 16:54:29 -0000	1.17
@@ -166,9 +166,9 @@
 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 @@
 	       "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;
 }