[Mplayer-cvslog] CVS: main/Gui cfg.c,1.33,1.34 interface.c,1.74,1.75 interface.h,1.34,1.35

[Zoltan Ponekker]

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

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


- add subcp 
- fix some 10l in gui
- fix one 10l bug in subreader


Index: cfg.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/cfg.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- cfg.c	21 Jan 2003 13:33:37 -0000	1.33
+++ cfg.c	21 Jan 2003 19:12:45 -0000	1.34
@@ -116,6 +116,7 @@
  { "sub_unicode",&sub_unicode,CONF_TYPE_FLAG,0,0,1,NULL },
  { "sub_pos",&sub_pos,CONF_TYPE_INT,CONF_RANGE,0,200,NULL },
  { "sub_overlap",&suboverlap_enabled,CONF_TYPE_FLAG,0,0,0,NULL },
+ { "sub_cp",&sub_cp,CONF_TYPE_STRING,0,0,0,NULL },
  { "font_factor",&font_factor,CONF_TYPE_FLOAT,CONF_RANGE,0.0,10.0,NULL },
  { "font_name",&font_name,CONF_TYPE_STRING,0,0,0,NULL },
 #ifdef HAVE_FREETYPE 

Index: interface.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/interface.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- interface.c	21 Jan 2003 13:33:37 -0000	1.74
+++ interface.c	21 Jan 2003 19:12:45 -0000	1.75
@@ -386,6 +386,7 @@
    mp_msg( MSGT_GPLAYER,MSGL_INFO,"[gui] Delete Load subtitle: %s\n",name );
    sub_name=gstrdup( name );
    subtitles=sub_read_file( sub_name,guiIntfStruct.FPS );
+   if ( !subtitles ) mp_msg( MSGT_GPLAYER,MSGL_ERR,MSGTR_CantLoadSub,name );
   }
 }
 #endif
@@ -862,7 +863,6 @@
          } else { url_item->next=NULL; URLList=url_item; }
         return NULL;
 // --- subtitle
-#if defined( USE_OSD ) || defined( USE_SUB )
 #ifndef HAVE_FREETYPE
    case gtkSetFontFactor:
         font_factor=fparam;
@@ -886,7 +886,7 @@
 	guiLoadFont();
 	return NULL;
    case gtkSetFontEncoding:
-        if ( subtitle_font_encoding ) free( subtitle_font_encoding );
+	gfree( (void **)&subtitle_font_encoding );
 	subtitle_font_encoding=gstrdup( (char *)vparam );
 	guiLoadFont();
 	return NULL;
@@ -895,6 +895,11 @@
 	guiLoadFont();
 	return NULL;
 #endif
+#ifdef USE_ICONV
+   case gtkSetSubEncoding:
+	gfree( (void **)&sub_cp );
+	sub_cp=gstrdup( (char *)vparam );
+	break;
 #endif
 // --- misc
    case gtkClearStruct:

Index: interface.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/interface.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- interface.h	21 Jan 2003 13:33:37 -0000	1.34
+++ interface.h	21 Jan 2003 19:12:45 -0000	1.35
@@ -195,6 +195,7 @@
 #define gtkSetFontOSDScale  19
 #define gtkSetFontEncoding  20
 #define gtkSetFontAutoScale 21
+#define gtkSetSubEncoding   22
 
 extern float gtkEquChannels[6][10];