- add "start in fullscreen" function

- fix some small bug
- don't quit if the config file is wrong


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

4 files changed, 42 insertions, 3 deletions

diff --git a/Gui/cfg.c b/Gui/cfg.c
index 2c0165f44c..e0be2536ee 100644
--- a/Gui/cfg.c
+++ b/Gui/cfg.c
@@ -39,6 +39,8 @@ char * gtkAOOSSDevice;
 int    gtkSubDumpMPSub = 0;
 int    gtkSubDumpSrt = 0;
 
+int    gtkLoadFullscreen = 0;
+
 // ---
 
 extern char * get_path( char * filename );
@@ -92,7 +94,8 @@ static config_t gui_opts[] =
  { "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 @@ int cfg_read( void )
  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 );
 
diff --git a/Gui/cfg.h b/Gui/cfg.h
index 83d1266e35..b688d8b670 100644
--- a/Gui/cfg.h
+++ b/Gui/cfg.h
@@ -26,6 +26,7 @@ extern char * gtkEquChannel3;
 extern char * gtkEquChannel4;
 extern char * gtkEquChannel5;
 extern char * gtkEquChannel6;
+extern int    gtkLoadFullscreen;
 
 extern int cfg_read( void );
 extern int cfg_write( void );
diff --git a/Gui/interface.c b/Gui/interface.c
index 91f7aab964..e9453eedda 100644
--- a/Gui/interface.c
+++ b/Gui/interface.c
@@ -142,13 +142,14 @@ void guiInit( void )
  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 )
diff --git a/Gui/mplayer/gtk/opts.c b/Gui/mplayer/gtk/opts.c
index 4bd490af8f..7c13cbec55 100644
--- a/Gui/mplayer/gtk/opts.c
+++ b/Gui/mplayer/gtk/opts.c
@@ -63,6 +63,7 @@ static GtkWidget * CBDumpMPSub;
 static GtkWidget * CBDumpSrt;
 static GtkWidget * CBPostprocess;
 static GtkWidget * CBCache;
+static GtkWidget * CBLoadFullscreen;
 
 static GtkWidget * SBCache;
 static GtkAdjustment * SBCacheadj;
@@ -264,6 +265,7 @@ void ShowPreferences( void )
  gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBNonInterlaved ),force_ni );
  gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBIndex ),index_mode );
  gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBPostprocess ),gtkVopPP );
+ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBLoadFullscreen ),gtkLoadFullscreen );
  gtk_adjustment_set_value( HSPPQualityadj,auto_quality );
  {
   int     i;
@@ -462,6 +464,7 @@ void prButton( GtkButton * button,gpointer user_data )
 	force_ni=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBNonInterlaved ) );
 	index_mode=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBIndex ) );
 	gtkVopPP=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBPostprocess ) ); 
+	gtkLoadFullscreen=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBLoadFullscreen ) );
 	gtkSet( gtkSetAutoq,HSPPQualityadj->value,NULL );
 
 	if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBCache ) ) ) gtkSet( gtkSetCacheSize,SBCacheadj->value,NULL );
@@ -1808,6 +1811,37 @@ GtkWidget * create_Preferences( void )
   gtk_widget_show( SBCache );
   gtk_box_pack_start( GTK_BOX( hbox5 ),SBCache,TRUE,TRUE,0 );
 
+  frame11=gtk_frame_new( MSGTR_PREFERENCES_FRAME_Misc );
+  gtk_widget_set_name( frame11,"frame11" );
+  gtk_widget_ref( frame11 );
+  gtk_object_set_data_full( GTK_OBJECT( Preferences ),"frame11",frame11,(GtkDestroyNotify)gtk_widget_unref );
+  gtk_widget_show( frame11 );
+  gtk_box_pack_start( GTK_BOX( vbox601 ),frame11,FALSE,FALSE,0 );
+  gtk_frame_set_shadow_type( GTK_FRAME( frame11 ),GTK_SHADOW_ETCHED_OUT );
+
+  frame=gtk_frame_new( NULL );
+  gtk_widget_set_name( frame,"frame" );
+  gtk_widget_ref( frame );
+  gtk_object_set_data_full( GTK_OBJECT( Preferences ),"frame",frame,(GtkDestroyNotify)gtk_widget_unref );
+  gtk_widget_show( frame );
+  gtk_container_add( GTK_CONTAINER( frame11 ),frame );
+  gtk_container_set_border_width( GTK_CONTAINER( frame ),0 );
+  gtk_frame_set_shadow_type( GTK_FRAME( frame ),GTK_SHADOW_NONE );
+
+  vbox602=gtk_vbox_new( FALSE,0 );
+  gtk_widget_set_name( vbox602,"vbox602" );
+  gtk_widget_ref( vbox602 );
+  gtk_object_set_data_full( GTK_OBJECT( Preferences ),"vbox602",vbox602,(GtkDestroyNotify)gtk_widget_unref );
+  gtk_widget_show( vbox602 );
+  gtk_container_add( GTK_CONTAINER( frame ),vbox602 );
+
+  CBLoadFullscreen=gtk_check_button_new_with_label( MSGTR_PREFERENCES_LoadFullscreen );
+  gtk_widget_set_name( CBLoadFullscreen,"CBLoadFullscreen" );
+  gtk_widget_ref( CBLoadFullscreen );
+  gtk_object_set_data_full( GTK_OBJECT( Preferences ),"CBLoadFullscreen",CBLoadFullscreen,(GtkDestroyNotify)gtk_widget_unref );
+  gtk_widget_show( CBLoadFullscreen );
+  gtk_box_pack_start( GTK_BOX( vbox602 ),CBLoadFullscreen,FALSE,FALSE,0 );
+
   label4=gtk_label_new( "Misc" );
   gtk_widget_set_name( label4,"label4" );
   gtk_widget_ref( label4 );