[Mplayer-cvslog] CVS: main/libvo vo_sdl.c,1.31,1.32

[Felix Buenemann]

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

Modified Files:
	vo_sdl.c 
Log Message:
Got rid of aalib crashing workaround with SDL1.2.1+


Index: vo_sdl.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_sdl.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -r1.31 -r1.32
*** vo_sdl.c	2001/05/05 21:38:33	1.31
--- vo_sdl.c	2001/05/11 17:21:15	1.32
***************
*** 90,95 ****
   *     to update this all the time (CVS info on http://mplayer.sourceforge.net)
   *
-  *    KNOWN BUGS:
-  *    - Crashes with aalib (fixed, but have to find cause!)
   */
  
--- 90,93 ----
***************
*** 338,344 ****
      * we'll force the BPP to 16, and pray that SDL can emulate for us.
      */
- 	//commented out for RGB test reasons
  	priv->bpp = vidInfo->vfmt->BitsPerPixel;
- 	//FIXME: DO NOT ADD ANY CODE BELOW THIS OR SDL WILL CRASH WITH AALIB!
  	if (!priv->mode && priv->bpp < 16) {
  
--- 336,340 ----
***************
*** 354,359 ****
  	 * with keys need to be pressed twice, to be recognized.
  	 */
! 	/*SDL_EventState(SDL_ACTIVEEVENT, SDL_IGNORE);
! 	SDL_EventState(SDL_KEYDOWN, SDL_IGNORE);
  	SDL_EventState(SDL_MOUSEMOTION, SDL_IGNORE);
  	SDL_EventState(SDL_MOUSEBUTTONDOWN, SDL_IGNORE);
--- 350,355 ----
  	 * with keys need to be pressed twice, to be recognized.
  	 */
! #ifndef BUGGY_SDL	
! 	SDL_EventState(SDL_ACTIVEEVENT, SDL_IGNORE);
  	SDL_EventState(SDL_MOUSEMOTION, SDL_IGNORE);
  	SDL_EventState(SDL_MOUSEBUTTONDOWN, SDL_IGNORE);
***************
*** 361,366 ****
  	SDL_EventState(SDL_QUIT, SDL_IGNORE);
  	SDL_EventState(SDL_SYSWMEVENT, SDL_IGNORE);
! 	SDL_EventState(SDL_USEREVENT, SDL_IGNORE);*/
! 	
  	
  	/* Success! */
--- 357,362 ----
  	SDL_EventState(SDL_QUIT, SDL_IGNORE);
  	SDL_EventState(SDL_SYSWMEVENT, SDL_IGNORE);
! 	SDL_EventState(SDL_USEREVENT, SDL_IGNORE);
! #endif	
  	
  	/* Success! */


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