[xine-cvs] CVS: xine-ui/src/xitk main.c,1.47,1.48

[J?rgen K. <jk...@us...>]

Update of /cvsroot/xine/xine-ui/src/xitk
In directory usw-pr-cvs1:/tmp/cvs-serv16542/src/xitk

Modified Files:
	main.c 
Log Message:
Combine "--visual" and "--visualid" into one command line option "--visual".
Parameter is either a visual class name or a visual id.


Index: main.c
===================================================================
RCS file: /cvsroot/xine/xine-ui/src/xitk/main.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- main.c	2001/09/24 09:16:23	1.47
+++ main.c	2001/09/24 15:35:10	1.48
@@ -78,9 +78,8 @@
 int       no_lirc;
 #endif
 
-#define	OPTION_VISUAL_CLASS	1000
-#define	OPTION_VISUAL_ID	1001
-#define	OPTION_INSTALL_COLORMAP	1002
+#define	OPTION_VISUAL		1000
+#define	OPTION_INSTALL_COLORMAP	1001
 
 /* options args */
 static const char *short_options = "?h"
@@ -106,8 +105,7 @@
   {"audio-driver"   , required_argument, 0, 'A' },
   {"deinterlace"    , required_argument, 0, 'D' },
   {"auto-play"      , optional_argument, 0, 'p' },
-  {"visual"	    , required_argument, 0,  OPTION_VISUAL_CLASS },
-  {"visualid"	    , required_argument, 0,  OPTION_VISUAL_ID },
+  {"visual"	    , required_argument, 0,  OPTION_VISUAL },
   {"install"	    , no_argument      , 0,  OPTION_INSTALL_COLORMAP },
   {"version"        , no_argument      , 0, 'v' },
   {0                , no_argument      , 0,  0  }
@@ -186,9 +184,8 @@
   printf("                                 'content': only by content,\n");
   printf("                                 'extension': only by extension.\n");
   printf("                                 -if no option is given, 'revert' is selected\n");
-  printf("      --visual <visual class>  Use a X11 <visual class> window for video output.\n");
-  printf("      --visualid <visualID>    Use the X11 visual <visualID> for the video\n");
-  printf("                               window.\n");
+  printf("      --visual <class-or-id>   Use the specified X11 visual. <class-or-id>\n");
+  printf("                               is either an X11 visual class, or a visual id.\n");
   printf("      --install                Install a private colormap.\n");
 #ifdef DEBUG
   printf("  -d, --debug <flags>          Debug mode for <flags> ('help' for list).\n");
@@ -666,8 +663,10 @@
       }
       break;
 
-    case OPTION_VISUAL_CLASS:
-      if (strcasecmp(optarg, "StaticGray") == 0)
+    case OPTION_VISUAL:
+      if (sscanf(optarg, "%x", &visual) == 1)
+	gGui->prefered_visual_id = visual;
+      else if (strcasecmp(optarg, "StaticGray") == 0)
 	gGui->prefered_visual_class = StaticGray;
       else if (strcasecmp(optarg, "GrayScale") == 0)
 	gGui->prefered_visual_class = GrayScale;
@@ -683,14 +682,6 @@
 	show_usage();
 	exit(1);
       }
-      break;
-
-    case OPTION_VISUAL_ID:
-      if (sscanf(optarg, "%x", &visual) != 1) {
-	show_usage();
-	exit(1);
-      }
-      gGui->prefered_visual_id = visual;
       break;
 
     case OPTION_INSTALL_COLORMAP: