[Mplayer-cvslog] CVS: main mplayer.c,1.25,1.26

[Michael Graffam]

Update of /cvsroot/mplayer/main
In directory usw-pr-cvs1:/tmp/cvs-serv22564

Modified Files:
	mplayer.c 
Log Message:
Adds code to deal with vidmode selection. -- mgraffam


Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** mplayer.c	2001/03/22 01:57:58	1.25
--- mplayer.c	2001/03/24 21:36:15	1.26
***************
*** 400,403 ****
--- 400,406 ----
  char* video_driver=NULL; //"mga"; // default
  int fullscreen=0;
+ #ifdef HAVE_XF86VM
+ int vidmode=0;
+ #endif
  int screen_size_x=SCREEN_SIZE_X;
  int screen_size_y=SCREEN_SIZE_Y;
***************
*** 471,474 ****
--- 474,483 ----
    }
  
+ #ifdef HAVE_XF86VM
+ if (!video_driver)
+   vidmode=0;
+ else if (strcmp(video_driver,"x11"))
+    vidmode=0;
+ #endif
  
  if(!filename){
***************
*** 1048,1051 ****
--- 1057,1066 ----
  #endif
  
+ #ifdef HAVE_XF86VM
+   if (vidmode) {
+         if ( screen_size_x == SCREEN_SIZE_X ) screen_size_x = 0;
+         if ( screen_size_y == SCREEN_SIZE_Y ) screen_size_y = 0;
+   } else
+ #endif
     if(screen_size_xy>0){
       if(screen_size_xy<=8){
***************
*** 1060,1063 ****
--- 1075,1079 ----
       if(screen_size_y<=8) screen_size_y*=movie_size_y;
     }
+ 
     if(verbose) printf("Destination size: %d x %d  out_fmt=%0X\n",
                        screen_size_x,screen_size_y,out_fmt);


_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog