[Mplayer-cvslog] CVS: main/Gui cfg.c,1.4,1.5 interface.c,1.29,1.30

[Zoltan Ponekker]

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

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


- fix fuckin' locale (?:)
- fix msg box layer handling


Index: cfg.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/cfg.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cfg.c	30 Jul 2002 11:50:19 -0000	1.4
+++ cfg.c	4 Aug 2002 17:23:58 -0000	1.5
@@ -8,10 +8,6 @@
 #include "../mplayer.h"
 #include "../cfgparser.h"
 
-#ifdef USE_I18N
-#include <locale.h>
-#endif
-
 #include "../../libvo/video_out.h"
 
 #include "cfg.h"
@@ -165,10 +161,6 @@
  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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- interface.c	4 Aug 2002 11:09:13 -0000	1.29
+++ interface.c	4 Aug 2002 17:23:58 -0000	1.30
@@ -79,11 +79,18 @@
 void guiInit( void )
 {
  memset( &guiIntfStruct,0,sizeof( guiIntfStruct ) );
+ guiIntfStruct.Balance=50.0f;
+ guiIntfStruct.StreamType=-1;
+
  memset( &gtkEquChannels,0,sizeof( gtkEquChannels ) );
  gtkAOOSSMixer=strdup( PATH_DEV_MIXER );
  gtkAOOSSDevice=strdup( PATH_DEV_DSP );
-// cfg_read(); // !!! moved to Gui/mplayer/mplayer.c::mplInit() after gtkInit()
+   
+ gtkInit();
+    
+ cfg_read(); 
  appInit( (void*)mDisplay );
+       
  if ( plCurrent && !filename ) mplSetFileName( plCurrent->path,plCurrent->name );
 #if defined( USE_OSD ) || defined( USE_SUB )
  guiLoadFont();