[Mplayer-cvslog] CVS: main/libvo vo_sdl.c,1.36,1.37

[Felix Buenemann]

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

Modified Files:
	vo_sdl.c 
Log Message:
Some fixups for SDL/aalib.


Index: vo_sdl.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_sdl.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -r1.36 -r1.37
*** vo_sdl.c	2001/05/24 19:03:31	1.36
--- vo_sdl.c	2001/06/02 22:12:28	1.37
***************
*** 195,198 ****
--- 195,201 ----
  	int fulltype;
  
+ 	/* is X running (0/1) */
+ 	int X;
+ 
  #ifdef HAVE_X11
  	/* X11 Resolution */
***************
*** 639,642 ****
--- 642,646 ----
  		priv->XWidth = DisplayWidth(XDisplay, XScreen);
  		priv->XHeight = DisplayHeight(XDisplay, XScreen);
+ 		priv->X = 1;
  		if(verbose) printf("SDL: X11 Resolution %ix%i\n", priv->XWidth, priv->XHeight);
  		saver_off(XDisplay);
***************
*** 708,712 ****
  	} 
          else {
! 		if((strcmp(priv->driver, "x11") == 0) || (strcmp(priv->driver, "aalib") == 0)) {
  			if(verbose) printf("SDL: setting windowed mode\n");
  #ifdef HAVE_X11		
--- 712,716 ----
  	} 
          else {
! 		if((strcmp(priv->driver, "x11") == 0) || ((strcmp(priv->driver, "aalib") == 0) && priv->X)) {
  			if(verbose) printf("SDL: setting windowed mode\n");
  #ifdef HAVE_X11		
***************
*** 717,725 ****
  		}
  		else {
! 			if(verbose) printf("SDL: setting nonzoomed fullscreen with modeswitching\n");
! 			printf("SDL: Info - please use -zoom switch to scale video\n");
  			
  			priv->surface = NULL;
! 			priv->fulltype = VM;
  			set_fullmode(priv->fullmode);
  		}	
--- 721,729 ----
  		}
  		else {
! 			if(verbose) printf("SDL: setting zoomed fullscreen with modeswitching\n");
! 			printf("SDL: Info - please use -vm switch instead if you don't want scaled video\n");
  			
  			priv->surface = NULL;
! 			priv->fulltype = ZOOM;
  			set_fullmode(priv->fullmode);
  		}	


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