comparison Gui/cfg.c @ 14542:4a6b79a1ad52

remove all setlocale calls, they break the behaviour of sscanf and strcasecmp, especially with tr_TR locale - and do not seem to be good for anything.

14541:bef9d6dc2333

#include "../mp_msg.h"
#include "../help_mp.h"
#include "../mplayer.h"
#include "../m_config.h"
#include "../m_option.h"

#ifdef USE_SETLOCALE
#include <locale.h>
#endif

#include "../../libvo/video_out.h"

#include "cfg.h"
#include "app.h"

int cfg_read( void )
{
 char * cfg = get_path( "gui.conf" );
 FILE * f;

#ifdef USE_SETLOCALE
 setlocale( LC_ALL,"C" );
#endif

// -- read configuration
 mp_msg( MSGT_GPLAYER,MSGL_V,"[cfg] reading config file: %s\n",cfg );
 gui_conf=m_config_new();
 m_config_register_options( gui_conf,gui_opts );
 if ( m_config_parse_config_file( gui_conf,cfg ) < 0 ) 

    }
   fclose( f );
  }
 free( cfg );

#ifdef USE_SETLOCALE
 setlocale( LC_ALL,"" );
#endif

 return 0;
}

int cfg_write( void )
{
 char * cfg = get_path( "gui.conf" );
 FILE * f;
 int    i;

#ifdef USE_SETLOCALE
 setlocale( LC_ALL,"C" );
#endif

// -- save configuration 
 if ( (f=fopen( cfg,"wt+" )) )
  {
   for ( i=0;gui_opts[i].name;i++ )

     if( fsHistory[i] ) fprintf( f,"%s\n",fsHistory[i] );
   fclose( f );
  }
 free( cfg );

#ifdef USE_SETLOCALE
 setlocale( LC_ALL,"" );
#endif

 return 0;
}

14542:4a6b79a1ad52

#include "../mp_msg.h"
#include "../help_mp.h"
#include "../mplayer.h"
#include "../m_config.h"
#include "../m_option.h"

#include "../../libvo/video_out.h"

#include "cfg.h"
#include "app.h"

int cfg_read( void )
{
 char * cfg = get_path( "gui.conf" );
 FILE * f;

// -- read configuration
 mp_msg( MSGT_GPLAYER,MSGL_V,"[cfg] reading config file: %s\n",cfg );
 gui_conf=m_config_new();
 m_config_register_options( gui_conf,gui_opts );
 if ( m_config_parse_config_file( gui_conf,cfg ) < 0 ) 

    }
   fclose( f );
  }
 free( cfg );

 return 0;
}

int cfg_write( void )
{
 char * cfg = get_path( "gui.conf" );
 FILE * f;
 int    i;

// -- save configuration 
 if ( (f=fopen( cfg,"wt+" )) )
  {
   for ( i=0;gui_opts[i].name;i++ )

     if( fsHistory[i] ) fprintf( f,"%s\n",fsHistory[i] );
   fclose( f );
  }
 free( cfg );

 return 0;
}