[Mplayer-cvslog] CVS: main/Gui cfg.c,1.2,1.3 interface.c,1.24,1.25

[Zoltan Ponekker]

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

Modified Files:
	cfg.c interface.c 
Log Message:
upsz, sorry, i forgott this :) (skin name saving:)

Index: cfg.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/cfg.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cfg.c	25 Jul 2002 20:26:29 -0000	1.2
+++ cfg.c	25 Jul 2002 21:31:36 -0000	1.3
@@ -11,6 +11,7 @@
 #include "../../libvo/video_out.h"
 
 #include "cfg.h"
+#include "app.h"
 #include "interface.h"
 #include "mplayer/play.h"
 
@@ -92,6 +93,8 @@
  { "sub_pos",&gtkSubPos,CONF_TYPE_INT,CONF_RANGE,0,200,NULL },
  { "font_factor",&gtkSubFFactor,CONF_TYPE_FLOAT,CONF_RANGE,0.0,10.0,NULL },
  { "font_name",&guiIntfStruct.Fontname,CONF_TYPE_STRING,0,0,0,NULL },
+ 
+ { "gui_skin",&skinName,CONF_TYPE_STRING,0,0,0,NULL },
 
  { "equ_channel_1",&gtkEquChannel1,CONF_TYPE_STRING,0,0,0,NULL },
  { "equ_channel_2",&gtkEquChannel2,CONF_TYPE_STRING,0,0,0,NULL },

Index: interface.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/interface.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- interface.c	25 Jul 2002 20:26:29 -0000	1.24
+++ interface.c	25 Jul 2002 21:31:36 -0000	1.25
@@ -85,6 +85,9 @@
  cfg_read();
  appInit( (void*)mDisplay );
  if ( plCurrent ) mplSetFileName( plCurrent->path,plCurrent->name );
+#if defined( USE_OSD ) || defined( USE_SUB )
+ guiLoadFont();
+#endif
 }
 
 void guiDone( void )
@@ -324,7 +327,7 @@
 // --- video opts	 
        if ( !gtkVODriver )
 	{
-         int i = 0, c = 0;
+         int i = 0;
          while ( video_out_drivers[i++] )
 	  if ( video_out_drivers[i - 1]->control( VOCTRL_GUISUPPORT,NULL ) == VO_TRUE ) 
 	   {