From d462fc4317bb04776ea62d29f9020c58260caaaa Mon Sep 17 00:00:00 2001 From: pontscho Date: Thu, 25 Jul 2002 21:31:36 +0000 Subject: upsz, sorry, i forgott this :) (skin name saving:) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6798 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Gui/cfg.c | 3 +++ Gui/interface.c | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Gui/cfg.c b/Gui/cfg.c index f59cefb969..bd5b0e598c 100644 --- a/Gui/cfg.c +++ b/Gui/cfg.c @@ -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 @@ static config_t gui_opts[] = { "sub_pos",>kSubPos,CONF_TYPE_INT,CONF_RANGE,0,200,NULL }, { "font_factor",>kSubFFactor,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",>kEquChannel1,CONF_TYPE_STRING,0,0,0,NULL }, { "equ_channel_2",>kEquChannel2,CONF_TYPE_STRING,0,0,0,NULL }, diff --git a/Gui/interface.c b/Gui/interface.c index 96dc7f121f..20e62c5b84 100644 --- a/Gui/interface.c +++ b/Gui/interface.c @@ -85,6 +85,9 @@ void guiInit( void ) 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 @@ void guiGetEvent( int type,char * arg ) // --- 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 ) { -- cgit v1.2.3