[xine-cvs] CVS: gnome-xine/src main.c,1.157,1.158

[Darren S. <ds...@us...>]

Update of /cvsroot/xine/gnome-xine/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22301/src

Modified Files:
	main.c 
Log Message:
Config option for showing the splash screen.
-s/--splash to completent -S/--nosplash.

Index: main.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/main.c,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- main.c	3 Mar 2006 18:20:07 -0000	1.157
+++ main.c	8 Mar 2006 19:32:12 -0000	1.158
@@ -233,7 +233,7 @@
 {
   gboolean enqueue, autoplay, fullscreen;
   int optstate;
-  gboolean show_splash = TRUE;
+  int show_splash = 2; /* default */
   const char *cmd = NULL;
 
 #ifndef GLIB_USES_SYSTEM_MALLOC
@@ -320,7 +320,7 @@
   optstate = 0;
   for (;;)
   {
-#define OPTS "hvaefV:A:Sc:"
+#define OPTS "hvaefV:A:sSc:"
 #ifdef HAVE_GETOPT_LONG
     static struct option longopts[] = {
       { "help", no_argument, NULL, 'h' },
@@ -331,6 +331,7 @@
       { "full-screen", no_argument, NULL, 'f' },
       { "video", required_argument, NULL, 'V' },
       { "audio", required_argument, NULL, 'A' },
+      { "splash", no_argument, NULL, 's' },
       { "no-splash", no_argument, NULL, 'S' },
       { "command", required_argument, NULL, 'c' },
       { NULL }
@@ -370,6 +371,9 @@
     case 'A':
       audio_driver_id = optarg;
       break;
+    case 's':
+      show_splash = TRUE;
+      break;
     case 'S':
       show_splash = FALSE;
       break;
@@ -445,25 +449,37 @@
   }
 
   /*
-   * a splash screen for the impatient
+   * init xine, set up script engine
    */
 
-  if (show_splash)
-    splash_show ();
+  engine_init ();
 
   /*
-   * init xine, set up skript engine, main window
+   * a splash screen for the impatient
    */
 
+  if (show_splash == 2)
+  {
+    xine_cfg_entry_t entry;
+    show_splash = !xine_config_lookup_entry (xine, "gui.show_splash", &entry)
+		  || entry.num_value;
+  }
+
+  if (show_splash)
+    splash_show ();
+
   gdk_threads_enter ();
   do_pending_events ();
 
   js_queue = g_async_queue_new ();
   g_async_queue_ref (js_queue);
 
-  engine_init ();
+  /*
+   * set up player and some UI basics
+   */
+
   player_init ();
-  ui_init	   ();
+  ui_init ();
 
   gtk_window_set_default_icon_name (GXINE_LOGO);
 
@@ -474,7 +490,7 @@
   do_pending_events ();
 
   /*
-   * create all dialogs (invisible)
+   * create all dialogue boxes etc.
    */
 
   file_dialog_init ();