[Mplayer-cvslog] CVS: main/Gui cfg.c,1.3,1.4 interface.c,1.25,1.26

[Zoltan Ponekker]

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

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


- some cosmetic change in preferences
- add *.wav to file selector
- fix setlocale() bug



Index: cfg.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/cfg.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cfg.c	25 Jul 2002 21:31:36 -0000	1.3
+++ cfg.c	30 Jul 2002 11:50:19 -0000	1.4
@@ -8,6 +8,10 @@
 #include "../mplayer.h"
 #include "../cfgparser.h"
 
+#ifdef USE_I18N
+#include <locale.h>
+#endif
+
 #include "../../libvo/video_out.h"
 
 #include "cfg.h"
@@ -104,7 +108,7 @@
  { "equ_channel_6",&gtkEquChannel6,CONF_TYPE_STRING,0,0,0,NULL },
  
 #if 1
-#define audio_equ_row( i,j ) { "equ_band_"#i#j,&gtkEquChannels[i][j],CONF_TYPE_FLOAT,CONF_RANGE,-5.0,5.0,NULL },
+#define audio_equ_row( i,j ) { "equ_band_"#i#j,&gtkEquChannels[i][j],CONF_TYPE_FLOAT,CONF_RANGE,-15.0,15.0,NULL },
    audio_equ_row( 0,0 ) audio_equ_row( 0,1 ) audio_equ_row( 0,2 ) audio_equ_row( 0,3 ) audio_equ_row( 0,4 ) audio_equ_row( 0,5 ) audio_equ_row( 0,6 ) audio_equ_row( 0,7 ) audio_equ_row( 0,8 ) audio_equ_row( 0,9 )
    audio_equ_row( 1,0 ) audio_equ_row( 1,1 ) audio_equ_row( 1,2 ) audio_equ_row( 1,3 ) audio_equ_row( 1,4 ) audio_equ_row( 1,5 ) audio_equ_row( 1,6 ) audio_equ_row( 1,7 ) audio_equ_row( 1,8 ) audio_equ_row( 1,9 )
    audio_equ_row( 2,0 ) audio_equ_row( 2,1 ) audio_equ_row( 2,2 ) audio_equ_row( 2,3 ) audio_equ_row( 2,4 ) audio_equ_row( 2,5 ) audio_equ_row( 2,6 ) audio_equ_row( 2,7 ) audio_equ_row( 2,8 ) audio_equ_row( 2,9 )
@@ -161,6 +165,10 @@
  char * cfg = get_path( "gui.conf" );
  FILE * f;
  int    i;
+
+#ifdef USE_I18N
+ setlocale( LC_ALL,"" );
+#endif
 
 // -- save configuration 
  if ( (f=fopen( cfg,"wt+" )) )

Index: interface.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/interface.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- interface.c	25 Jul 2002 21:31:36 -0000	1.25
+++ interface.c	30 Jul 2002 11:50:19 -0000	1.26
@@ -378,8 +378,8 @@
 // --- audio opts
 	audio_delay=gtkAODelay;
 	if ( ao_plugin_cfg.plugin_list ) { free( ao_plugin_cfg.plugin_list ); ao_plugin_cfg.plugin_list=NULL; }
-	if ( gtkEnableAudioEqualizer ) gset( &ao_plugin_cfg.plugin_list,"eq" );
 	if ( gtkAONorm ) 	       gset( &ao_plugin_cfg.plugin_list,"volnorm" );
+	if ( gtkEnableAudioEqualizer ) gset( &ao_plugin_cfg.plugin_list,"eq" );
 	if ( gtkAOExtraStereo )
 	 {
 	  gset( &ao_plugin_cfg.plugin_list,"extrastereo" );