- add workaround for fuckin locale

- remove tga and bmp filter


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7266 b3059339-0415-0410-9bf9-f77b7e298cf2

6 files changed, 36 insertions, 154 deletions

diff --git a/Gui/Makefile b/Gui/Makefile
index e894e48ad9..a678fda70d 100644
--- a/Gui/Makefile
+++ b/Gui/Makefile
@@ -15,7 +15,7 @@ endif
 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
diff --git a/Gui/bitmap.c b/Gui/bitmap.c
index 24c8e73006..fcb4c3d2e8 100644
--- a/Gui/bitmap.c
+++ b/Gui/bitmap.c
@@ -5,13 +5,6 @@
 
 #include "bitmap.h"
 
-#define BMP 1
-#define TGA 2
-#define PNG 3
-#define TGAPACKED 4
-
-extern char * strcat( char * dest,const char * src );
-
 int conv24to32( txSample * bf )
 {
  unsigned char * tmpImage;
@@ -74,7 +67,7 @@ unsigned char tmp[512];
 unsigned char * fExist( unsigned char * fname )
 {
  FILE          * fl;
- unsigned char   ext[][6] = { ".tga\0",".TGA\0",".png\0",".PNG\0",".bmp\0",".BMP\0"  };
+ unsigned char   ext[][6] = { ".png\0",".PNG\0" };
  int             i;
 
  fl=fopen( fname,"rb" );
@@ -83,10 +76,9 @@ unsigned char * fExist( unsigned char * fname )
    fclose( fl );
    return fname;
   }
- for ( i=0;i<10;i++ )
+ for ( i=0;i<2;i++ )
   {
-   strcpy( tmp,fname );
-   strcat( tmp,ext[i] );
+   sprintf( tmp,"%s%s",fname,ext[i] );
    fl=fopen( tmp,"rb" );
    if ( fl != NULL )
     {
@@ -97,80 +89,22 @@ unsigned char * fExist( unsigned char * fname )
  return NULL;
 }
 
-int aComp( unsigned char * b1,unsigned char * b2,int size )
-{
- int i;
- for( i=0;i<size;i++ ) if ( b1[i] != b2[i] ) return 0;
- return 1;
-}
-
-int GetFileType( char * fname )
-{
- FILE * fl;
- unsigned char buffer[10];
- unsigned char  bmp[2] = { 0x42,0x4d };
- unsigned char  tga[7] = { 0x00,0x02,0x00,0x00,0x00,0x00,0x00 };
- unsigned char ptga[7] = { 0x00,0x0a,0x00,0x00,0x00,0x00,0x00 };
- unsigned char  png[8] = { 0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a };
-
- if ( ( fl=fopen( fname,"rb" ) ) == NULL ) return -1;
- fread( buffer,1,10,fl );
- fclose( fl );
-
- if ( aComp( buffer,bmp,2 ) ) return BMP;        // --- bmp
- if ( aComp( &buffer[1],tga,8 ) ) return TGA;        // --- tga
- if ( aComp( &buffer[1],ptga,7 ) ) return TGAPACKED; // --- tga
- if ( aComp( buffer,png,8 ) ) return PNG;        // --- png
- return 0;                                       // --- others
-}
-
 int bpRead( char * fname, txSample * bf )
 {
- int bgr = 0;
- int i;
-
  fname=fExist( fname );
  if ( fname == NULL ) return -2;
- switch ( GetFileType( fname ) )
+ if ( pngRead( fname,bf ) ) 
   {
-   case BMP:
-        i=bmpRead( fname,bf );
-        switch ( i )
-         {
-          case 0:  break;
-          case 3:  return -1;
-          default: return -3;
-         }
-        break;
-   case TGA:
-        i=tgaRead( fname,bf );
-        switch ( i )
-         {
-          case 0:  break;
-          case 3:  return -1;
-          default: return -4;
-         }
-        break;
-   case PNG:
-        if ( pngRead( fname,bf ) ) return -5;
-        bgr=1;
-        break;
-   case TGAPACKED:
-        mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[bitmap] sorry, packed TGA not supported.\n" );
-        return -6;
-   default:
-     {
-      mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[bitmap] Unknown file type ( %s ).\n",fname );
-      return -7;
-     }
+   mp_dbg( MSGT_GPLAYER,MSGL_FATAL,"[bitmap] Unknown file type ( %s ).\n",fname );
+   return -5;
   }
  if ( bf->BPP < 24 )
   {
-    mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[bitmap] sorry, 16 or less bitmaps not supported.\n" );
+   mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[bitmap] sorry, 16 or less bitmaps not supported.\n" );
    return -1;
   }
  if ( conv24to32( bf ) ) return -8;
- if ( bgr ) bgr2rgb( bf );
+ bgr2rgb( bf );
  Normalize( bf );
  return 0;
 }
diff --git a/Gui/bitmap.h b/Gui/bitmap.h
index 913f2636a2..7ce7f2cdcd 100644
--- a/Gui/bitmap.h
+++ b/Gui/bitmap.h
@@ -11,8 +11,6 @@ typedef struct _txSample
  char *        Image;
 } txSample;
 
-#include "tga/tga.h"
-#include "bmp/bmp.h"
 #include "png/png.h"
 #include "../../mp_msg.h"
 
diff --git a/Gui/bitmap/bitmap.c b/Gui/bitmap/bitmap.c
index 24c8e73006..fcb4c3d2e8 100644
--- a/Gui/bitmap/bitmap.c
+++ b/Gui/bitmap/bitmap.c
@@ -5,13 +5,6 @@
 
 #include "bitmap.h"
 
-#define BMP 1
-#define TGA 2
-#define PNG 3
-#define TGAPACKED 4
-
-extern char * strcat( char * dest,const char * src );
-
 int conv24to32( txSample * bf )
 {
  unsigned char * tmpImage;
@@ -74,7 +67,7 @@ unsigned char tmp[512];
 unsigned char * fExist( unsigned char * fname )
 {
  FILE          * fl;
- unsigned char   ext[][6] = { ".tga\0",".TGA\0",".png\0",".PNG\0",".bmp\0",".BMP\0"  };
+ unsigned char   ext[][6] = { ".png\0",".PNG\0" };
  int             i;
 
  fl=fopen( fname,"rb" );
@@ -83,10 +76,9 @@ unsigned char * fExist( unsigned char * fname )
    fclose( fl );
    return fname;
   }
- for ( i=0;i<10;i++ )
+ for ( i=0;i<2;i++ )
   {
-   strcpy( tmp,fname );
-   strcat( tmp,ext[i] );
+   sprintf( tmp,"%s%s",fname,ext[i] );
    fl=fopen( tmp,"rb" );
    if ( fl != NULL )
     {
@@ -97,80 +89,22 @@ unsigned char * fExist( unsigned char * fname )
  return NULL;
 }
 
-int aComp( unsigned char * b1,unsigned char * b2,int size )
-{
- int i;
- for( i=0;i<size;i++ ) if ( b1[i] != b2[i] ) return 0;
- return 1;
-}
-
-int GetFileType( char * fname )
-{
- FILE * fl;
- unsigned char buffer[10];
- unsigned char  bmp[2] = { 0x42,0x4d };
- unsigned char  tga[7] = { 0x00,0x02,0x00,0x00,0x00,0x00,0x00 };
- unsigned char ptga[7] = { 0x00,0x0a,0x00,0x00,0x00,0x00,0x00 };
- unsigned char  png[8] = { 0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a };
-
- if ( ( fl=fopen( fname,"rb" ) ) == NULL ) return -1;
- fread( buffer,1,10,fl );
- fclose( fl );
-
- if ( aComp( buffer,bmp,2 ) ) return BMP;        // --- bmp
- if ( aComp( &buffer[1],tga,8 ) ) return TGA;        // --- tga
- if ( aComp( &buffer[1],ptga,7 ) ) return TGAPACKED; // --- tga
- if ( aComp( buffer,png,8 ) ) return PNG;        // --- png
- return 0;                                       // --- others
-}
-
 int bpRead( char * fname, txSample * bf )
 {
- int bgr = 0;
- int i;
-
  fname=fExist( fname );
  if ( fname == NULL ) return -2;
- switch ( GetFileType( fname ) )
+ if ( pngRead( fname,bf ) ) 
   {
-   case BMP:
-        i=bmpRead( fname,bf );
-        switch ( i )
-         {
-          case 0:  break;
-          case 3:  return -1;
-          default: return -3;
-         }
-        break;
-   case TGA:
-        i=tgaRead( fname,bf );
-        switch ( i )
-         {
-          case 0:  break;
-          case 3:  return -1;
-          default: return -4;
-         }
-        break;
-   case PNG:
-        if ( pngRead( fname,bf ) ) return -5;
-        bgr=1;
-        break;
-   case TGAPACKED:
-        mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[bitmap] sorry, packed TGA not supported.\n" );
-        return -6;
-   default:
-     {
-      mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[bitmap] Unknown file type ( %s ).\n",fname );
-      return -7;
-     }
+   mp_dbg( MSGT_GPLAYER,MSGL_FATAL,"[bitmap] Unknown file type ( %s ).\n",fname );
+   return -5;
   }
  if ( bf->BPP < 24 )
   {
-    mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[bitmap] sorry, 16 or less bitmaps not supported.\n" );
+   mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[bitmap] sorry, 16 or less bitmaps not supported.\n" );
    return -1;
   }
  if ( conv24to32( bf ) ) return -8;
- if ( bgr ) bgr2rgb( bf );
+ bgr2rgb( bf );
  Normalize( bf );
  return 0;
 }
diff --git a/Gui/bitmap/bitmap.h b/Gui/bitmap/bitmap.h
index 913f2636a2..7ce7f2cdcd 100644
--- a/Gui/bitmap/bitmap.h
+++ b/Gui/bitmap/bitmap.h
@@ -11,8 +11,6 @@ typedef struct _txSample
  char *        Image;
 } txSample;
 
-#include "tga/tga.h"
-#include "bmp/bmp.h"
 #include "png/png.h"
 #include "../../mp_msg.h"
 
diff --git a/Gui/cfg.c b/Gui/cfg.c
index 3bf459d98a..22c4f1e594 100644
--- a/Gui/cfg.c
+++ b/Gui/cfg.c
@@ -199,7 +199,25 @@ int cfg_write( void )
       {
        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 );