[Mplayer-cvslog] CVS: main/Gui Makefile,1.13,1.14 cfg.c,1.12,1.13

[Zoltan Ponekker]

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

Modified Files:
	Makefile cfg.c 
Log Message:


- add workaround for fuckin locale
- remove tga and bmp filter


Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Makefile	1 Sep 2002 11:28:17 -0000	1.13
+++ Makefile	4 Sep 2002 09:36:02 -0000	1.14
@@ -15,7 +15,7 @@
 CFLAGS = $(OPTIMIZE) $(INCDIR) $(DEBUG) 
 
 SRCS = wm/ws.c wm/wsxdnd.c app.c events.c interface.c cfg.c \
-	bitmap/bitmap.c bitmap/tga/tga.c bitmap/bmp/bmp.c bitmap/png/png.c \
+	bitmap/bitmap.c bitmap/png/png.c \
 	skin/skin.c skin/font.c skin/cut.c \
 	mplayer/mplayer.c mplayer/widgets.c mplayer/play.c \
 	mplayer/gtk/menu.c mplayer/gtk/mb.c mplayer/gtk/about.c mplayer/gtk/pl.c mplayer/gtk/sb.c mplayer/gtk/fs.c mplayer/gtk/opts.c mplayer/gtk/url.c mplayer/gtk/eq.c

Index: cfg.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/cfg.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- cfg.c	31 Aug 2002 09:45:58 -0000	1.12
+++ cfg.c	4 Sep 2002 09:36:02 -0000	1.13
@@ -199,7 +199,25 @@
       {
        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:  fprintf( f,"%s = %f\n",gui_opts[i].name,*( (float *)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_STRING: 
             {
 	     char * tmp = *( (char **)gui_opts[i].p );