[Mplayer-cvslog] CVS: main/libvo vo_sdl.c,1.19,1.20

[Felix Buenemann]

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

Modified Files:
	vo_sdl.c 
Log Message:
Changed some code so it only kicks in when XV is disable.
(Later I'll change that stuff to be detected at runtime.)


Index: vo_sdl.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_sdl.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** vo_sdl.c	2001/04/20 09:06:49	1.19
--- vo_sdl.c	2001/04/20 10:27:51	1.20
***************
*** 100,103 ****
--- 100,105 ----
  //#define LOG if(0)printf
  
+ extern int verbose;
+ 
  static vo_info_t vo_info = 
  {
***************
*** 222,230 ****
  	/* other default values */
  	#ifdef SDL_NOHWSURFACE
! 		printf("SDL: using software-surface\n");
  		priv->sdlflags = SDL_SWSURFACE|SDL_RESIZABLE|SDL_ASYNCBLIT;
  		priv->sdlfullflags = SDL_SWSURFACE|SDL_FULLSCREEN|SDL_DOUBLEBUF|SDL_ASYNCBLIT;
  	#else	
! 		printf("SDL: using hardware-surface\n");
  		priv->sdlflags = SDL_HWSURFACE|SDL_RESIZABLE|SDL_ASYNCBLIT; //SDL_HWACCEL
  		priv->sdlfullflags = SDL_HWSURFACE|SDL_FULLSCREEN|SDL_DOUBLEBUF|SDL_ASYNCBLIT; //SDL_HWACCEL
--- 224,232 ----
  	/* other default values */
  	#ifdef SDL_NOHWSURFACE
! 		if(verbose) printf("SDL: using software-surface\n");
  		priv->sdlflags = SDL_SWSURFACE|SDL_RESIZABLE|SDL_ASYNCBLIT;
  		priv->sdlfullflags = SDL_SWSURFACE|SDL_FULLSCREEN|SDL_DOUBLEBUF|SDL_ASYNCBLIT;
  	#else	
! 		if(verbose) printf("SDL: using hardware-surface\n");
  		priv->sdlflags = SDL_HWSURFACE|SDL_RESIZABLE|SDL_ASYNCBLIT; //SDL_HWACCEL
  		priv->sdlfullflags = SDL_HWSURFACE|SDL_FULLSCREEN|SDL_DOUBLEBUF|SDL_ASYNCBLIT; //SDL_HWACCEL
***************
*** 389,403 ****
          switch(format){
  		case IMGFMT_YV12:
! 			printf("SDL: Using 0x%X (YV12) image format\n", format); break;
  		case IMGFMT_IYUV:
! 			printf("SDL: Using 0x%X (IYUV) image format\n", format); break;
  		case IMGFMT_YUY2:
! 			printf("SDL: Using 0x%X (YUY2) image format\n", format); break;
  		case IMGFMT_UYVY:
! 			printf("SDL: Using 0x%X (UYVY) image format\n", format); break;
  		case IMGFMT_YVYU:
! 			printf("SDL: Using 0x%X (YVYU) image format\n", format); break;
  		case IMGFMT_I420:
! 			printf("SDL: Using 0x%X (I420) image format\n", format);
  			printf("SDL: Mapping I420 to IYUV\n");
  			sdl_format = SDL_IYUV_OVERLAY;
--- 391,405 ----
          switch(format){
  		case IMGFMT_YV12:
! 			if(verbose) printf("SDL: Using 0x%X (YV12) image format\n", format); break;
  		case IMGFMT_IYUV:
! 			if(verbose) printf("SDL: Using 0x%X (IYUV) image format\n", format); break;
  		case IMGFMT_YUY2:
! 			if(verbose) printf("SDL: Using 0x%X (YUY2) image format\n", format); break;
  		case IMGFMT_UYVY:
! 			if(verbose) printf("SDL: Using 0x%X (UYVY) image format\n", format); break;
  		case IMGFMT_YVYU:
! 			if(verbose) printf("SDL: Using 0x%X (YVYU) image format\n", format); break;
  		case IMGFMT_I420:
! 			if(verbose) printf("SDL: Using 0x%X (I420) image format\n", format);
  			printf("SDL: Mapping I420 to IYUV\n");
  			sdl_format = SDL_IYUV_OVERLAY;
***************
*** 428,432 ****
  	  case 0x01:
  	  case 0x05:
! 	  	printf("SDL: setting zoomed fullscreen without modeswitching\n");
  		priv->windowsize.w = d_width;
  	  	priv->windowsize.h = d_height;
--- 430,434 ----
  	  case 0x01:
  	  case 0x05:
! 	  	if(verbose) printf("SDL: setting zoomed fullscreen without modeswitching\n");
  		priv->windowsize.w = d_width;
  	  	priv->windowsize.h = d_height;
***************
*** 436,448 ****
  	  case 0x02:
  	  case 0x03:
- 	 	printf("SDL: setting nonzoomed fullscreen with modeswitching\n");
  		priv->windowsize.w = width;
  	  	priv->windowsize.h = height;
            	if(priv->surface = SDL_SetVideoMode (width, height, priv->bpp, priv->sdlfullflags))
  			SDL_ShowCursor(0);
  	  break;		
  	  case 0x06:
  	  case 0x07:
! 	 	printf("SDL: setting zoomed fullscreen with modeswitching\n");
  	  	priv->windowsize.w = width;
  	  	priv->windowsize.h = height;
--- 438,456 ----
  	  case 0x02:
  	  case 0x03:
  		priv->windowsize.w = width;
  	  	priv->windowsize.h = height;
+ #ifdef SDL_NOXV	  
+ 	 	if(verbose) printf("SDL: setting nonzoomed fullscreen with modeswitching\n");
            	if(priv->surface = SDL_SetVideoMode (width, height, priv->bpp, priv->sdlfullflags))
  			SDL_ShowCursor(0);
+ #else
+ 	 	if(verbose) printf("SDL: setting zoomed fullscreen with modeswitching\n");
+           	priv->surface=NULL;
+           	set_fullmode(priv->fullmode);
+ #endif		
  	  break;		
  	  case 0x06:
  	  case 0x07:
! 	 	if(verbose) printf("SDL: setting zoomed fullscreen with modeswitching\n");
  	  	priv->windowsize.w = width;
  	  	priv->windowsize.h = height;
***************
*** 451,455 ****
  	  break;  
            default:
! 	 	printf("SDL: setting windowed mode\n");
  	  	priv->windowsize.w = d_width;
  	  	priv->windowsize.h = d_height;
--- 459,463 ----
  	  break;  
            default:
! 	 	if(verbose) printf("SDL: setting windowed mode\n");
  	  	priv->windowsize.w = d_width;
  	  	priv->windowsize.h = d_height;


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