[Mplayer-cvslog] CVS: main/Gui cfg.c,1.15,1.16 cfg.h,1.4,1.5 interface.c,1.49,1.50

[Zoltan Ponekker]

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

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


- add "start in fullscreen" function
- fix some small bug
- don't quit if the config file is wrong


Index: cfg.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/cfg.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- cfg.c	28 Sep 2002 18:03:32 -0000	1.15
+++ cfg.c	28 Sep 2002 19:42:07 -0000	1.16
@@ -39,6 +39,8 @@
 int    gtkSubDumpMPSub = 0;
 int    gtkSubDumpSrt = 0;
 
+int    gtkLoadFullscreen = 0;
+
 // ---
 
 extern char * get_path( char * filename );
@@ -92,7 +94,8 @@
  { "font_autoscale",&subtitle_autoscale,CONF_TYPE_INT,CONF_RANGE,0,3,NULL },
 #endif
 
- { "cache",&stream_cache_size,CONF_TYPE_INT,CONF_RANGE,4,65535,NULL },
+ { "cache",&stream_cache_size,CONF_TYPE_INT,CONF_RANGE,0,65535,NULL },
+ { "load_fullscreen",&gtkLoadFullscreen,CONF_TYPE_FLAG,0,0,1,NULL },
  
  { "gui_skin",&skinName,CONF_TYPE_STRING,0,0,0,NULL },
 
@@ -145,7 +148,7 @@
  if ( m_config_parse_config_file( gui_conf,cfg ) < 0 ) 
   {
    mp_msg( MSGT_GPLAYER,MSGL_FATAL,"[cfg] config file read error ...\n" );
-   exit( 1 );
+//   exit( 1 );
   }
  free( cfg );
 

Index: cfg.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/cfg.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cfg.h	15 Aug 2002 22:52:51 -0000	1.4
+++ cfg.h	28 Sep 2002 19:42:07 -0000	1.5
@@ -26,6 +26,7 @@
 extern char * gtkEquChannel4;
 extern char * gtkEquChannel5;
 extern char * gtkEquChannel6;
+extern int    gtkLoadFullscreen;
 
 extern int cfg_read( void );
 extern int cfg_write( void );

Index: interface.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/interface.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- interface.c	28 Sep 2002 18:03:32 -0000	1.49
+++ interface.c	28 Sep 2002 19:42:07 -0000	1.50
@@ -142,13 +142,14 @@
  memset( &gtkEquChannels,0,sizeof( gtkEquChannels ) );
  gtkAOOSSMixer=strdup( PATH_DEV_MIXER );
  gtkAOOSSDevice=strdup( PATH_DEV_DSP );
+ fullscreen=gtkLoadFullscreen;       
    
  gtkInit();
  wsXInit( (void *)mDisplay );
      
 // cfg_read(); 
  appInit( (void*)mDisplay );
-       
+
  if ( plCurrent && !filename ) mplSetFileName( plCurrent->path,plCurrent->name,STREAMTYPE_FILE );
  if ( sub_name ) guiSetFilename( guiIntfStruct.Subtitlename,sub_name );
 #if defined( USE_OSD ) || defined( USE_SUB )