# HG changeset patch # User pontscho # Date 1031239365 0 # Node ID 5fa6eb7b0f1a117841687780f42daf25de16ad24 # Parent b21e38a4fbec717335117d4045d180128a1f862c - add fuckin locale fix from Dietrich Clau (Yeah. Nice round:) diff -r b21e38a4fbec -r 5fa6eb7b0f1a Gui/cfg.c --- a/Gui/cfg.c Thu Sep 05 09:38:06 2002 +0000 +++ b/Gui/cfg.c Thu Sep 05 15:22:45 2002 +0000 @@ -132,6 +132,10 @@ char * cfg = get_path( "gui.conf" ); FILE * f; +#ifdef USE_SETLOCALE + setlocale( LC_ALL,"C" ); +#endif + // -- read configuration mp_msg( MSGT_GPLAYER,MSGL_STATUS,"[cfg] read config file: %s\n",cfg ); gui_conf=m_config_new( play_tree_new() ); @@ -177,6 +181,10 @@ } free( cfg ); +#ifdef USE_SETLOCALE + setlocale( LC_ALL,"" ); +#endif + return 0; } @@ -187,7 +195,7 @@ int i; #ifdef USE_SETLOCALE - setlocale( LC_ALL,"" ); + setlocale( LC_ALL,"C" ); #endif // -- save configuration @@ -198,26 +206,8 @@ switch ( gui_opts[i].type ) { case CONF_TYPE_INT: - case CONF_TYPE_FLAG: fprintf( f,"%s = %d\n",gui_opts[i].name,*( (int *)gui_opts[i].p ) ); break; - case CONF_TYPE_FLOAT: - #if 0 - fprintf( f,"%s = %f\n",gui_opts[i].name,*( (float *)gui_opts[i].p ) ); - #else - #warning ugly hakk for fucking locale - { - char tmp[64]; - snprintf( tmp,64,"%f",*( (float *)gui_opts[i].p ) ); - // locale emulator - // { char * c = strchr( tmp,'.' ); if ( c ) *c=','; } - // --- - { int i; - for ( i=0;i < strlen( tmp );i++ ) - if ( ( tmp[i] != '.' )&&( ( tmp[i] < '0' )||( tmp[i] > '9' ) ) ) tmp[i]='.'; - } - fprintf( f,"%s = %s\n",gui_opts[i].name,tmp ); - } - #endif - break; + case CONF_TYPE_FLAG: fprintf( f,"%s = %d\n",gui_opts[i].name,*( (int *)gui_opts[i].p ) ); break; + case CONF_TYPE_FLOAT: fprintf( f,"%s = %f\n",gui_opts[i].name,*( (float *)gui_opts[i].p ) ); break; case CONF_TYPE_STRING: { char * tmp = *( (char **)gui_opts[i].p ); @@ -261,6 +251,10 @@ } free( cfg ); +#ifdef USE_SETLOCALE + setlocale( LC_ALL,"" ); +#endif + return 0; }