[Mplayer-cvslog] CVS: main/libvo vo_sdl.c,1.9,1.10

[Felix Buenemann]

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

Modified Files:
	vo_sdl.c 
Log Message:
- added code to comply with new fullscreen meaning
- changed fullscreen-mode-cycling from '+' to 'c' (interferred with audiosync
   adjustment)


Index: vo_sdl.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_sdl.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** vo_sdl.c	2001/04/11 19:41:38	1.9
--- vo_sdl.c	2001/04/11 20:00:55	1.10
***************
*** 63,66 ****
--- 63,69 ----
   *    - OSD and subtitle support added
   *    - some minor code-changes
+  *    - added code to comply with new fullscreen meaning
+  *    - changed fullscreen-mode-cycling from '+' to 'c' (interferred with audiosync
+  *       adjustment)
   */
  
***************
*** 349,353 ****
  {
  	struct sdl_priv_s *priv = &sdl_priv;
!         unsigned int sdl_format;
  
  
--- 352,356 ----
  {
  	struct sdl_priv_s *priv = &sdl_priv;
!         unsigned int sdl_format, mode;
  
  
***************
*** 369,373 ****
  
  	/* Set output window title */
! 	SDL_WM_SetCaption (".: MPlayer : F = Fullscreen/Windowed : Keypad + = Cycle Fullscreen Resolutions :.", "SDL Video Out");
  
  	/* Save the original Image size */
--- 372,376 ----
  
  	/* Set output window title */
! 	SDL_WM_SetCaption (".: MPlayer : F = Fullscreen/Windowed : C = Cycle Fullscreen Resolutions :.", "SDL Video Out");
  
  	/* Save the original Image size */
***************
*** 377,389 ****
          priv->format = format;
          
!         if(fullscreen){
! 	    priv->windowsize.w = width;
! 	    priv->windowsize.h = height;
!             priv->surface=NULL;
!             set_fullmode(priv->fullmode);
!         } else {
! 	    priv->windowsize.w = d_width;
! 	    priv->windowsize.h = d_height;
!             priv->surface = SDL_SetVideoMode (d_width, d_height, priv->bpp, priv->sdlflags);
          }
          if(!priv->surface) return -1; // cannot SetVideoMode
--- 380,423 ----
          priv->format = format;
          
! 	/* bit 0 (0x01) means fullscreen (-fs)
! 	 * bit 1 (0x02) means mode switching (-vm)
! 	 * bit 2 (0x04) enables software scaling (-zoom)
! 	 */  
! //      printf("SDL: fullscreenflag is set to: %i\n", fullscreen);
! //	printf("SDL: Width: %i Height: %i D_Width %i D_Height: %i\n", width, height, d_width, d_height);
! 	switch(fullscreen){
! 	  case 0x01:
! 	  case 0x05:
! 	  	printf("SDL: setting zoomed fullscreen without modeswitching\n");
! 		//priv->fullmodes[mode]->w 
! 		/*priv->fullmode++;
! 		if (priv->fullmode > (findArrayEnd(priv->fullmodes) - 1)) priv->fullmode = 0;
! 		set_fullmode(priv->fullmode);*/
! 		priv->windowsize.w = d_width;
! 	  	priv->windowsize.h = d_height;
!           	if(priv->surface = SDL_SetVideoMode (d_width, d_height, priv->bpp, priv->sdlfullflags))
! 			SDL_ShowCursor(0);
! 	  break;	
! 	  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;
!           	priv->surface=NULL;
!           	set_fullmode(priv->fullmode);
! 	  break;  
!           default:
! 	 	printf("SDL: setting windowed mode\n");
! 	  	priv->windowsize.w = d_width;
! 	  	priv->windowsize.h = d_height;
!           	priv->surface = SDL_SetVideoMode (d_width, d_height, priv->bpp, priv->sdlflags);
          }
          if(!priv->surface) return -1; // cannot SetVideoMode
***************
*** 550,555 ****
  				keypressed = event.key.keysym.sym;
  
! 				/* plus key pressed. plus cycles through available fullscreenmodes, if we have some */
! 				if ( ((keypressed == SDLK_PLUS) || (keypressed == SDLK_KP_PLUS)) && (priv->fullmodes) ) {
  					/* select next fullscreen mode */
  					priv->fullmode++;
--- 584,589 ----
  				keypressed = event.key.keysym.sym;
  
! 				/* c key pressed. plus cycles through available fullscreenmodes, if we have some */
! 				if ( ((keypressed == SDLK_c)) && (priv->fullmodes) ) {
  					/* select next fullscreen mode */
  					priv->fullmode++;


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