[Mplayer-cvslog] CVS: main/Gui cfg.c,1.5,1.6 cfg.h,1.1,1.2 interface.c,1.31,1.32

[Zoltan Ponekker]

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

Modified Files:
	cfg.c cfg.h interface.c 
Log Message:


- fix equ handling
- fix dvd pos bar
- fix 10l bug in evLoadPlay bugfix :)
- mittomen


Index: cfg.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/cfg.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cfg.c	4 Aug 2002 17:23:58 -0000	1.5
+++ cfg.c	5 Aug 2002 01:14:13 -0000	1.6
@@ -18,7 +18,6 @@
 // --- params
 
 int    gtkEnableAudioEqualizer = 0;
-int    gtkEnableVideoEqualizer = 0;
 
 char * gtkVODriver = NULL;
 int    gtkVODoubleBuffer = 1;
@@ -61,7 +60,6 @@
 static config_t gui_opts[] =
 {
  { "enable_audio_equ",&gtkEnableAudioEqualizer,CONF_TYPE_FLAG,0,0,1,NULL },
- { "enable_video_equ",&gtkEnableVideoEqualizer,CONF_TYPE_FLAG,0,0,1,NULL },
  
  { "vo_driver",&gtkVODriver,CONF_TYPE_STRING,0,0,0,NULL },
  { "vo_panscan",&vo_panscan,CONF_TYPE_FLOAT,CONF_RANGE,0.0,1.0,NULL },

Index: cfg.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/cfg.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cfg.h	23 Jul 2002 16:46:51 -0000	1.1
+++ cfg.h	5 Aug 2002 01:14:13 -0000	1.2
@@ -3,7 +3,6 @@
 #define __CFG_H
 
 extern int gtkEnableAudioEqualizer;
-extern int gtkEnableVideoEqualizer;
 
 extern char * gtkVODriver;
 extern int    gtkVODoubleBuffer;

Index: interface.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/interface.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- interface.c	4 Aug 2002 19:23:56 -0000	1.31
+++ interface.c	5 Aug 2002 01:14:13 -0000	1.32
@@ -87,7 +87,8 @@
  gtkAOOSSDevice=strdup( PATH_DEV_DSP );
    
  gtkInit();
-    
+ wsXInit( (void *)mDisplay );
+     
  cfg_read(); 
  appInit( (void*)mDisplay );
        
@@ -298,6 +299,18 @@
 	}
 	break;
    case guiSetValues:
+// -- video
+	if ( arg )
+	 {
+	  if ( vo_gamma_brightness == 1000 )
+	   { vo_gamma_brightness=0; get_video_colors( (void *)arg,"brightness",&vo_gamma_brightness ); }
+	  if ( vo_gamma_contrast == 1000 )
+	   { vo_gamma_contrast=0; get_video_colors( (void *)arg,"contrast",&vo_gamma_contrast ); }
+	  if ( vo_gamma_hue == 1000 )
+	   { vo_gamma_hue=0; get_video_colors( (void *)arg,"hue",&vo_gamma_hue ); }
+	  if ( vo_gamma_saturation  == 1000 )
+	   { vo_gamma_saturation=0; get_video_colors( (void *)arg,"saturation",&vo_gamma_saturation ); }
+	 }
 // -- audio
         if ( audio_out )
 	{